diff --git a/default.xml b/default.xml
index e839be8..bba1285 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com"
-           revision="refs/tags/android-6.0.1_r79" />
+           revision="refs/tags/android-6.0.1_r81" />
 
   <remote  name="lineage-mirror"
            fetch=".." />
@@ -14,7 +14,7 @@
 
   <remote name="fdroid"
 	  fetch="https://gitlab.com/fdroid/"
-	  revision="refs/tags/0.2.6" />
+	  revision="refs/tags/0.2.7" />
 
   <remote  name="private"
            fetch="ssh://git@github.com" />
@@ -72,11 +72,9 @@
   <project path="external/f2fs-tools" name="LineageOS-mirror/android_external_f2fs-tools.git" groups="pdk" />
   <project path="external/ffmpeg" name="LineageOS-mirror/android_external_ffmpeg.git" />
   <project path="external/flac" name="LineageOS-mirror/android_external_flac.git" groups="pdk" />
-  <project path="external/freetype" name="LineageOS-mirror/android_external_freetype" groups="pdk" />
   <project path="external/fsck_msdos" name="LineageOS-mirror/android_external_fsck_msdos.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/fuse" name="LineageOS-mirror/android_external_fuse.git" />
   <project path="external/gello-build" name="LineageOS-mirror/android_external_gello_build.git" />
-  <project path="external/giflib" name="LineageOS-mirror/android_external_giflib.git" groups="pdk,qcom_msm8x26" />
   <project path="external/gmock" name="LineageOS-mirror/android_external_gmock.git"/>
   <project path="external/gptfdisk" name="LineageOS-mirror/android_external_gptfdisk.git" groups="pdk-fs" />
   <project path="external/gson" name="LineageOS-mirror/android_external_gson.git" />
@@ -129,12 +127,10 @@
   <project path="external/protobuf-c" name="LineageOS-mirror/android_external_protobuf-c.git" />
   <project path="external/rsync" name="LineageOS-mirror/android_external_rsync.git" />
   <project path="external/sepolicy" name="LineageOS-mirror/android_external_sepolicy.git" groups="pdk" />
-  <project path="external/sfntly" name="LineageOS-mirror/android_external_sfntly.git" groups="pdk,qcom_msm8x26" />
   <project path="external/skia" name="LineageOS-mirror/android_external_skia.git" groups="pdk,qcom_msm8x26" />
   <project path="external/sonivox" name="LineageOS-mirror/android_external_sonivox.git" groups="pdk" />
   <project path="external/speex" name="LineageOS-mirror/android_external_speex.git" groups="pdk" />
   <project path="external/spongycastle" name="LineageOS-mirror/android_external_spongycastle.git" groups="pdk" />
-  <project path="external/sqlite" name="LineageOS-mirror/android_external_sqlite.git" groups="pdk" />
   <project path="external/stagefright-plugins" name="LineageOS-mirror/android_external_stagefright-plugins.git" />
   <project path="external/strace" name="LineageOS-mirror/android_external_strace.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/tcpdump" name="LineageOS-mirror/android_external_tcpdump.git" groups="pdk,pdk-cw-fs,pdk-fs" />
@@ -142,10 +138,8 @@
   <project path="external/tinycompress" name="LineageOS-mirror/android_external_tinycompress.git" groups="pdk" />
   <project path="external/tinyxml2" name="LineageOS-mirror/android_external_tinyxml2.git" groups="pdk" />
   <project path="external/toybox" name="LineageOS-mirror/android_external_toybox.git" groups="pdk" />
-  <project path="external/tremolo" name="LineageOS-mirror/android_external_tremolo.git" groups="pdk" />
   <project path="external/uicommon" name="LineageOS-mirror/android_external_cyanogen_UICommon.git" />
   <project path="external/unzip" name="LineageOS-mirror/android_external_unzip.git" />
-  <project path="external/v8" name="LineageOS-mirror/android_external_v8.git" groups="pdk" />
   <project path="external/vim" name="LineageOS-mirror/android_external_vim.git" />
   <project path="external/vogar" name="LineageOS-mirror/android_external_vogar.git" groups="pdk" />
   <project path="external/wpa_supplicant_8" name="LineageOS-mirror/android_external_wpa_supplicant_8.git" groups="pdk" />
@@ -360,6 +354,8 @@
   <project path="external/fdlibm" name="platform/external/fdlibm" groups="pdk" remote="aosp" />
   <project path="external/fio" name="platform/external/fio" groups="pdk-fs" remote="aosp" />
   <project path="external/fonttools" name="platform/external/fonttools" groups="pdk-fs" remote="aosp" />
+  <project path="external/freetype" name="platform/external/freetype" groups="pdk" remote="aosp" />
+  <project path="external/giflib" name="platform/external/giflib" groups="pdk,qcom_msm8x26" remote="aosp" />
   <project path="external/glide" name="platform/external/glide" groups="pdk-fs" remote="aosp" />
   <project path="external/google-breakpad" name="platform/external/google-breakpad" groups="dragon" remote="aosp" />
   <project path="external/google-fonts/carrois-gothic-sc" name="platform/external/google-fonts/carrois-gothic-sc" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -448,15 +444,19 @@
   <project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk" remote="aosp" />
   <project path="external/scrypt" name="platform/external/scrypt" groups="pdk" remote="aosp" />
   <project path="external/selinux" name="platform/external/selinux" groups="pdk" remote="aosp" />
+  <project path="external/sfntly" name="platform/external/sfntly" groups="pdk,qcom_msm8x26" remote="aosp" />
   <project path="external/slf4j" name="platform/external/slf4j" groups="pdk-fs" remote="aosp" />
   <project path="external/smali" name="platform/external/smali" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/sonic" name="platform/external/sonic" groups="pdk" remote="aosp" />
+  <project path="external/sqlite" name="platform/external/sqlite" groups="pdk" remote="aosp" />
   <project path="external/squashfs-tools" name="platform/external/squashfs-tools" groups="pdk" remote="aosp" />
   <project path="external/srtp" name="platform/external/srtp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/svox" name="platform/external/svox" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/tagsoup" name="platform/external/tagsoup" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/timezonepicker-support" name="platform/external/timezonepicker-support" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk" remote="aosp" />
+  <project path="external/tremolo" name="platform/external/tremolo" groups="pdk" remote="aosp" />
+  <project path="external/v8" name="platform/external/v8" groups="pdk" remote="aosp" />
   <project path="external/valgrind" name="platform/external/valgrind" groups="pdk" remote="aosp" />
   <project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot" remote="aosp" />
   <project path="external/vixl" name="platform/external/vixl" groups="pdk" remote="aosp" />