diff --git a/default.xml b/default.xml
index 1bfdd64..5d49cb1 100644
--- a/default.xml
+++ b/default.xml
@@ -24,9 +24,7 @@
   </project>
   <project path="art" name="platform/art" groups="pdk" />
   <project path="bionic" name="platform/bionic" groups="pdk" />
-<!--
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
--->
   <project path="compatibility/cdd" name="platform/compatibility/cdd" groups="pdk" />
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs" />
   <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs" />
diff --git a/remove-minimal.xml b/remove-minimal.xml
index e3b2d1e..485da13 100644
--- a/remove-minimal.xml
+++ b/remove-minimal.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-    <!-- Remove from default.xml (or the omni-aosp.xml substitutions -->
+    <!-- Remove from default.xml -->
     <remove-project name="platform/art" />
+    <remove-project name="platform/compatibility/cdd" />
     <remove-project name="platform/cts" />
     <remove-project name="platform/dalvik" />
 
+    <remove-project name="device/generic/uml" />
+    <remove-project name="device/google/muskie" />
+    <remove-project name="device/google/taimen" />
+    <remove-project name="device/google/wahoo" />
+    <remove-project name="device/google/wahoo-kernel" />
+
     <remove-project name="platform/external/aac" />
     <remove-project name="platform/external/abi-compliance-checker" />
     <remove-project name="platform/external/abi-dumper" />
@@ -21,10 +28,12 @@
     <remove-project name="platform/external/archive-patcher" />
     <remove-project name="platform/external/arm-neon-tests" />
     <remove-project name="platform/external/autotest" />
+    <remove-project name="platform/external/bart" />
     <remove-project name="platform/external/blktrace" />
+    <remove-project name="platform/external/brotli" />
     <remove-project name="platform/external/bsdiff" />
-    <remove-project name="platform/external/c-ares" />
     <remove-project name="platform/external/caliper" />
+    <remove-project name="platform/external/c-ares" />
     <remove-project name="platform/external/cblas" />
     <remove-project name="platform/external/chromium-libpac" />
     <remove-project name="platform/external/chromium-trace" />
@@ -35,32 +44,32 @@
     <remove-project name="platform/external/curl" />
     <remove-project name="platform/external/dagger2" />
     <remove-project name="platform/external/deqp" />
-    <remove-project name="platform/external/dexmaker" />
     <remove-project name="platform/external/desugar" />
+    <remove-project name="platform/external/devlib" />
+    <remove-project name="platform/external/dexmaker" />
     <remove-project name="platform/external/dhcpcd-6.8.2" />
     <remove-project name="platform/external/dng_sdk" />
     <remove-project name="platform/external/dnsmasq" />
     <remove-project name="platform/external/doclava" />
     <remove-project name="platform/external/donuts" />
-    <remove-project name="platform/external/drm_gralloc" />
     <remove-project name="platform/external/drm_hwcomposer" />
     <remove-project name="platform/external/droiddriver" />
+    <remove-project name="platform/external/drrickorang" />
     <remove-project name="platform/external/dtc" />
     <remove-project name="platform/external/easymock" />
-    <remove-project name="platform/external/eclipse-basebuilder" />
-    <remove-project name="platform/external/eclipse-windowbuilder" />
     <remove-project name="platform/external/emma" />
     <remove-project name="platform/external/esd" />
     <remove-project name="platform/external/eyes-free" />
     <remove-project name="platform/external/fdlibm" />
     <remove-project name="platform/external/fio" />
     <remove-project name="platform/external/flatbuffers" />
-    <remove-project name="platform/external/fonttools" />
     <remove-project name="platform/external/fmtlib" />
+    <remove-project name="platform/external/fonttools" />
     <remove-project name="platform/external/fsck_msdos" />
     <remove-project name="platform/external/gemmlowp" />
     <remove-project name="platform/external/giflib" />
     <remove-project name="platform/external/glide" />
+    <remove-project name="platform/external/google-api-services-storage" />
     <remove-project name="platform/external/google-breakpad" />
     <remove-project name="platform/external/google-fonts/carrois-gothic-sc" />
     <remove-project name="platform/external/google-fonts/coming-soon" />
@@ -97,14 +106,15 @@
     <remove-project name="platform/external/kernel-headers" />
     <remove-project name="platform/external/ksoap2" />
     <remove-project name="platform/external/libavc" />
+    <remove-project name="platform/external/libbackup" />
     <remove-project name="platform/external/libbrillo" />
     <remove-project name="platform/external/libcap-ng" />
     <remove-project name="platform/external/libconstrainedcrypto" />
     <remove-project name="platform/external/libcups" />
+    <remove-project name="platform/external/libdaemon" />
     <remove-project name="platform/external/libdivsufsort" />
     <remove-project name="platform/external/libedit" />
     <remove-project name="platform/external/libese" />
-    <remove-project name="platform/external/libdaemon" />
     <remove-project name="platform/external/libexif" />
     <remove-project name="platform/external/libgsm" />
     <remove-project name="platform/external/libhevc" />
@@ -118,18 +128,19 @@
     <remove-project name="platform/external/libopus" />
     <remove-project name="platform/external/libpcap" />
     <remove-project name="platform/external/libphonenumber" />
+    <remove-project name="platform/external/libtextclassifier" />
     <remove-project name="platform/external/libusb" />
     <remove-project name="platform/external/libusb-compat" />
-    <remove-project name="platform/external/libutf" />
     <remove-project name="platform/external/libvncserver" />
     <remove-project name="platform/external/libvorbis" />
     <remove-project name="platform/external/libvpx" />
     <remove-project name="platform/external/libvterm" />
     <remove-project name="platform/external/libxml2" />
-    <remove-project name="platform/external/libtextclassifier" />
     <remove-project name="platform/external/libyuv" />
     <remove-project name="platform/external/linux-kselftest" />
+    <remove-project name="platform/external/lisa" />
     <remove-project name="platform/external/littlemock" />
+    <remove-project name="platform/external/lmfit" />
     <remove-project name="platform/external/ltp" />
     <remove-project name="platform/external/markdown" />
     <remove-project name="platform/external/mesa3d" />
@@ -159,8 +170,12 @@
     <remove-project name="platform/external/parameter-framework" />
     <remove-project name="platform/external/pdfium" />
     <remove-project name="platform/external/piex" />
+    <remove-project name="platform/external/ply" />
     <remove-project name="platform/external/ppp" />
     <remove-project name="platform/external/proguard" />
+    <remove-project name="platform/external/python/cpython2" />
+    <remove-project name="platform/external/python/cpython3" />
+    <remove-project name="platform/external/r8" />
     <remove-project name="platform/external/regex-re2" />
     <remove-project name="platform/external/replicaisland" />
     <remove-project name="platform/external/rmi4utils" />
@@ -168,37 +183,40 @@
     <remove-project name="platform/external/roboto-fonts" />
     <remove-project name="platform/external/rootdev" />
     <remove-project name="platform/external/seccomp-tests" />
-    <remove-project name="platform/external/shflags" />
     <remove-project name="platform/external/sfntly" />
+    <remove-project name="platform/external/shflags" />
     <remove-project name="platform/external/skia" />
     <remove-project name="platform/external/sl4a" />
     <remove-project name="platform/external/slf4j" />
     <remove-project name="platform/external/smali" />
     <remove-project name="platform/external/snakeyaml" />
     <remove-project name="platform/external/sonic" />
-    <remove-project name="platform/external/spirv-llvm" />
     <remove-project name="platform/external/sonivox" />
+    <remove-project name="platform/external/spirv-llvm" />
     <remove-project name="platform/external/sqlite" />
     <remove-project name="platform/external/stressapptest" />
     <remove-project name="platform/external/svox" />
-    <remove-project name="platform/external/syslinux" />
     <remove-project name="platform/external/swiftshader" />
+    <remove-project name="platform/external/syslinux" />
     <remove-project name="platform/external/tagsoup" />
-    <remove-project name="platform/external/testng" />
     <remove-project name="platform/external/tcpdump" />
+    <remove-project name="platform/external/testng" />
     <remove-project name="platform/external/timezonepicker-support" />
     <remove-project name="platform/external/tinyxml" />
     <remove-project name="platform/external/toolchain-utils" />
     <remove-project name="platform/external/tpm2" />
+    <remove-project name="platform/external/trappy" />
     <remove-project name="platform/external/tremolo" />
     <remove-project name="platform/external/unicode" />
     <remove-project name="platform/external/universal-tween-engine" />
+    <remove-project name="platform/external/v4l2_codec2" />
     <remove-project name="platform/external/v8" />
     <remove-project name="platform/external/vboot_reference" />
     <remove-project name="platform/external/vixl" />
     <remove-project name="platform/external/vogar" />
     <remove-project name="platform/external/volley" />
     <remove-project name="platform/external/vulkan-validation-layers" />
+    <remove-project name="platform/external/walt" />
     <remove-project name="platform/external/webp" />
     <remove-project name="platform/external/webrtc" />
     <remove-project name="platform/external/wpa_supplicant_8" />
@@ -207,11 +225,13 @@
     <remove-project name="platform/external/xmlrpcpp" />
     <remove-project name="platform/external/xmlwriter" />
     <remove-project name="platform/external/xmp_toolkit" />
+    <remove-project name="platform/external/xz-embedded" />
     <remove-project name="platform/external/zopfli" />
     <remove-project name="platform/external/zxing" />
 
     <remove-project name="platform/frameworks/compile/mclinker" />
     <remove-project name="platform/frameworks/ex" />
+    <remove-project name="platform/frameworks/layoutlib" />
     <remove-project name="platform/frameworks/minikin" />
     <remove-project name="platform/frameworks/ml" />
     <remove-project name="platform/frameworks/multidex" />
@@ -224,8 +244,9 @@
     <remove-project name="platform/frameworks/opt/inputconnectioncommon" />
     <remove-project name="platform/frameworks/opt/inputmethodcommon" />
     <remove-project name="platform/frameworks/opt/net/ethernet" />
+    <remove-project name="platform/frameworks/opt/net/ims" />
+    <remove-project name="platform/frameworks/opt/net/lowpan" />
     <remove-project name="platform/frameworks/opt/net/voip" />
-    <remove-project name="platform/frameworks/opt/net/wifi" />
     <remove-project name="platform/frameworks/opt/photoviewer" />
     <remove-project name="platform/frameworks/opt/setupwizard" />
     <remove-project name="platform/frameworks/opt/timezonepicker" />
@@ -239,9 +260,9 @@
     <remove-project name="platform/hardware/broadcom/libbt" />
     <remove-project name="platform/hardware/broadcom/wlan" />
     <remove-project name="platform/hardware/google/apf" />
+    <remove-project name="platform/hardware/google/easel" />
     <remove-project name="platform/hardware/marvell/bt" />
-    <remove-project name="platform/hardware/qcom/bootctrl" />
-    <remove-project name="platform/hardware/qcom/data/ipacfg-mgr" />
+    <remove-project name="platform/hardware/qcom/camera" />
     <remove-project name="platform/hardware/qcom/keymaster" />
     <remove-project name="platform/hardware/qcom/msm8960" />
     <remove-project name="platform/hardware/qcom/msm8994" />
@@ -271,20 +292,19 @@
     <remove-project name="platform/packages/apps/Messaging" />
     <remove-project name="platform/packages/apps/OneTimeInitializer" />
     <remove-project name="platform/packages/apps/PackageInstaller" />
-    <remove-project name="platform/packages/apps/Phone" />
     <remove-project name="platform/packages/apps/Protips" />
     <remove-project name="platform/packages/apps/Provision" />
     <remove-project name="platform/packages/apps/QuickSearchBox" />
-    <remove-project name="platform/packages/apps/RetailDemo" />
     <remove-project name="platform/packages/apps/SafetyRegulatoryInfo" />
     <remove-project name="platform/packages/apps/SoundRecorder" />
     <remove-project name="platform/packages/apps/SpareParts" />
-    <remove-project name="platform/packages/apps/SpeechRecorder" />
     <remove-project name="platform/packages/apps/Stk" />
     <remove-project name="platform/packages/apps/StorageManager" />
     <remove-project name="platform/packages/apps/Tag" />
     <remove-project name="platform/packages/apps/Terminal" />
     <remove-project name="platform/packages/apps/Test/connectivity" />
+    <remove-project name="platform/packages/apps/TimeZoneData" />
+    <remove-project name="platform/packages/apps/TimeZoneUpdater" />
     <remove-project name="platform/packages/apps/TvSettings" />
     <remove-project name="platform/packages/apps/TV" />
     <remove-project name="platform/packages/apps/UnifiedEmail" />
@@ -319,10 +339,12 @@
     <remove-project name="platform/packages/apps/Car/SystemUpdater" />
     <remove-project name="platform/packages/apps/Car/UserManagement" />
     <remove-project name="platform/packages/apps/Car/libs" />
+    <remove-project name="platform/packages/apps/PhoneCommon"  />
     <remove-project name="platform/packages/services/BuiltInPrintService" />
     <remove-project name="platform/packages/services/Car" />
     <remove-project name="platform/packages/services/Mms" />
     <remove-project name="platform/packages/services/NetworkRecommendation" />
+    <remove-project name="platform/packages/services/Telecomm"  />
     <remove-project name="platform/packages/wallpapers/LivePicker" />
 
     <remove-project name="platform/pdk" />
@@ -337,8 +359,6 @@
     <remove-project name="platform/prebuilts/clang/host/darwin-x86" />
     <remove-project name="platform/prebuilts/devtools" />
     <remove-project name="platform/prebuilts/deqp" />
-    <remove-project name="platform/prebuilts/eclipse" />
-    <remove-project name="platform/prebuilts/eclipse-build-deps" />
     <remove-project name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
     <remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" />
     <remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" />
@@ -352,6 +372,7 @@
     <remove-project name="platform/prebuilts/gdb/linux-x86" />
     <remove-project name="platform/prebuilts/go/darwin-x86" />
     <remove-project name="platform/prebuilts/gradle-plugin" />
+    <remove-project name="platform/prebuilts/jdk/jdk8" />
     <remove-project name="platform/prebuilts/libs/libedit" />
     <remove-project name="platform/prebuilts/maven_repo/android" />
     <remove-project name="platform/prebuilts/maven_repo/bumptech" />
@@ -368,6 +389,11 @@
     <remove-project name="platform/system/tpm" />
     <remove-project name="platform/system/update_engine" />
 
+    <remove-project name="platform/test/sts" />
+
+    <!-- Remove platform/test/vts to avoid the test errors and more dependencies -->
+    <remove-project name="platform/test/vts" />
+
     <remove-project name="platform/test/vts-testcase/fuzz" />
     <remove-project name="platform/test/vts-testcase/hal" />
     <remove-project name="platform/test/vts-testcase/hal-trace" />
@@ -396,16 +422,10 @@
     <!-- Remove from omni-aosp.xml (forked AOSP) -->
     <remove-project name="android_development" />
 
-<!-- The following directories are actually needed
-     from android_frameworks_base (for FBE decryption)
-     * frameworks/base/core/java/android/content   (~4MB)
-     * frameworks/base/core/java/android/security  (<1MB)
-     but syncing a 1GB repo for 4 to 5MB is not worth
-     it for me.
--->
+    <!-- refer to twrp-extras.xml why android_frameworks_base is removed here -->
     <remove-project name="android_frameworks_base" />
 
-    <remove-project name="android_frameworks_opt_net_ims" />
+    <remove-project name="android_frameworks_opt_net_wifi" />
     <remove-project name="android_frameworks_opt_telephony" />
 
     <remove-project name="android_hardware_invensense" />
@@ -413,6 +433,7 @@
     <remove-project name="android_hardware_qcom_bt" />
     <remove-project name="android_hardware_qcom_display" />
     <remove-project name="android_hardware_qcom_media" />
+    <remove-project name="android_hardware_qcom_msm8998" />
     <remove-project name="android_hardware_qcom_power" />
     <remove-project name="android_hardware_qcom_wlan" />
 
@@ -422,11 +443,9 @@
     <remove-project name="android_packages_apps_Gallery2" />
     <remove-project name="android_packages_apps_MusicFX" />
     <remove-project name="android_packages_apps_Nfc" />
-    <remove-project name="android_packages_apps_PhoneCommon"  />
     <remove-project name="android_packages_apps_Settings" />
     <remove-project name="android_packages_inputmethods_LatinIME" />
     <remove-project name="android_packages_providers_DownloadProvider" />
-    <remove-project name="android_packages_services_Telecomm"  />
     <remove-project name="android_packages_services_Telephony" />
 
     <remove-project name="android_system_bt" />
diff --git a/twrp-extras.xml b/twrp-extras.xml
index bc84e42..957b9c4 100644
--- a/twrp-extras.xml
+++ b/twrp-extras.xml
@@ -1,31 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-<!-- TWRP lives in omnirom android-8.0 (not AOSP!) -->
-<!--
+<!-- TWRP lives in omnirom android-8.1 (not AOSP!) -->
     <remove-project name="platform/bootable/recovery" />
-    <project path="bootable/recovery" name="android_bootable_recovery" remote="omnirom" revision="android-8.0" />
+    <project path="bootable/recovery" name="android_bootable_recovery" remote="omnirom" revision="android-8.1" />
+
+
+<!-- The following changes are no longer needed in 8.1 (only kept for reference) -->
+<!-- =========================================================================== -->
+    <!-- FBE libs (using AOSP tag android-8.0.0_r34) -->
+        <!-- libkeymaster1.so -> libkeymaster_portable.so and libkeymaster_staging.so -->
+        <!--
+        <remove-project name="platform/system/keymaster" />
+        <remove-project name="platform/system/security" />
+        <project path="system/keymaster" name="platform/system/keymaster" remote="aosp" revision="refs/tags/android-8.0.0_r34" />
+        <project path="system/security" name="platform/system/security" remote="aosp" revision="refs/tags/android-8.0.0_r34" />
+        -->
+
+        <!-- weaver -->
+             <!-- TeamWin/.repo/AOSP is just a staging directory -->
+        <!--
+        <project path="TeamWin/.repo/AOSP/hardware/interfaces" name="platform/hardware/interfaces" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
+            <linkfile src="weaver" dest="hardware/interfaces/weaver" />
+        </project>
+        -->
+
+        <!-- libkeyutils.so -->
+             <!-- TeamWin/.repo/AOSP is just a staging directory -->
+        <!--
+        <project path="TeamWin/.repo/AOSP/system/core" name="platform/system/core" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
+            <linkfile src="libkeyutils" dest="system/core/libkeyutils" />
+        </project>
+        -->
+<!-- =========================================================================== -->
+
+
+<!-- The following directories are actually needed from android_frameworks_base (for FBE decryption)
+     * frameworks/base/core/java/android/content   (~4MB)
+     * frameworks/base/core/java/android/security  (<1MB)
+     not only is it not worth syncing a 1GB repo for 4 to 5MB for me, the added dependencies make
+     the minimal manifest unworkable.
+     So for those that do want to sync frameworks/base but don't want the build to break (eg framworks/support),
+     sync it to the staging are and only link the needed directories.
 -->
-
-
-<!-- FBE libs (using AOSP tag android-8.0.0_r34) -->
-    <!-- libkeymaster1.so -> libkeymaster_portable.so and libkeymaster_staging.so -->
-    <remove-project name="platform/system/keymaster" />
-    <remove-project name="platform/system/security" />
-    <project path="system/keymaster" name="platform/system/keymaster" remote="aosp" revision="refs/tags/android-8.0.0_r34" />
-    <project path="system/security" name="platform/system/security" remote="aosp" revision="refs/tags/android-8.0.0_r34" />
-
-    <!-- weaver -->
-    <project path="TeamWin/.repo/AOSP/hardware/interfaces" name="platform/hardware/interfaces" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
-         <!-- TeamWin/.repo/AOSP is just a staging directory -->
-        <linkfile src="weaver" dest="hardware/interfaces/weaver" />
-    </project>
-
-    <!-- libkeyutils.so -->
-    <project path="TeamWin/.repo/AOSP/system/core" name="platform/system/core" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
-         <!-- TeamWin/.repo/AOSP is just a staging directory -->
-        <linkfile src="libkeyutils" dest="system/core/libkeyutils" />
-    </project>
+    <project path="TeamWin/.repo/frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-8.1" clone-depth="1" >
+        <linkfile src="core/java/android/content" dest="frameworks/base/core/java/android/content" />
+        <linkfile src="core/java/android/security" dest="frameworks/base/core/java/android/security" />
+    </project> />
 
 
 <!-- busybox -->