diff --git a/Patches/Common/android_vendor_divested/blob_blocker.mk b/Patches/Common/android_vendor_divested/blob_blocker.mk
deleted file mode 100644
index 7467e5fc..00000000
--- a/Patches/Common/android_vendor_divested/blob_blocker.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-include $(CLEAR_VARS)
-
-# vendor makefiles often end up with these not being removed from Android.mk
-# which causes build failures since their files were deleted
-# override here to prevent breakage
-
-LOCAL_MODULE := BlobBlocker
-
-LOCAL_OVERRIDES_PACKAGES := \
-    a4wpservice \
-    appdirectedsmspermission \
-    AppDirectedSMSProxy \
-    ApplicationBar \
-    aptxui \
-    Asdiv \
-    atfwd \
-    AtvRemoteService \
-    BuaContactAdapter \
-    CABLService \
-    CanvasPackageInstaller \
-    CarrierServices \
-    CarrierSetup \
-    CNEService \
-    colorservice \
-    ConnMO \
-    CQATest \
-    DCMO \
-    DiagMon \
-    DMConfigUpdate \
-    DMService \
-    DolbyVisionService \
-    dpmserviceapp \
-    DragonKeyboardFirmwareUpdater \
-    DTVPlayer \
-    DTVService \
-    EasyAccessService \
-    embms \
-    FMRadioGooogle \
-    FmRadioTrampoline2 \
-    GamepadPairingService \
-    GCS \
-    GeminiInputDevices \
-    Gemini_Keyboard \
-    GlobalkeyInteceptor \
-    HiddenMenu \
-    HotwordEnrollment \
-    HWSarControlService \
-    imssettings \
-    LeanbackIme \
-    LeanbackLauncher \
-    LifetimeData \
-    LifeTimerService \
-    ModFmwkProxyService \
-    ModService \
-    MotCameraMod \
-    MotoDisplayFWProxy \
-    MotoSignatureApp \
-    MyVerizonServices \
-    OBDM_Permissions \
-    obdm_stub \
-    OemDmTrigger \
-    Overscan \
-    Perfdump \
-    PowerOffAlarm \
-    PPPreference \
-    ProjecterApp \
-    QtiTetherService \
-    QuickBoot \
-    RCSBootstraputil \
-    RcsImsBootstraputil \
-    RemoteControlService \
-    SDM \
-    SecPhone \
-    SecProtect \
-    SprintDM \
-    SprintHM \
-    SprintMenu \
-    SyncMLSvc \
-    SystemUpdateUI \
-    TriggerEnroll \
-    TriggerTrainingService \
-    Tycho \
-    uceShimService \
-    VerizonAuthDialog \
-    VerizonSSOEngine \
-    VerizonUnifiedSettings \
-    VZWAPNLib \
-    vzwapnpermission \
-    VZWAPNService \
-    VZWAVS \
-    VzwLcSilent \
-    vzw_msdc_api \
-    VzwOmaTrigger \
-    WfcActivation \
-    WfdService
-
-include $(BUILD_PREBUILT)
diff --git a/Patches/Common/android_vendor_divested/module_blocker.mk b/Patches/Common/android_vendor_divested/module_blocker.mk
deleted file mode 100644
index 1816c3bb..00000000
--- a/Patches/Common/android_vendor_divested/module_blocker.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := ModuleBlocker
-
-LOCAL_OVERRIDES_PACKAGES := \
-    bootanimation.zip \
-    FlipFlap \
-    PhotoTable \
-    Terminal \
-    LockClock \
-    WeatherProvider \
-    bash \
-    curl \
-    htop \
-    powertop \
-    strace \
-    vim \
-    wget \
-    scp \
-    sftp \
-    ssh \
-    sshd \
-    sshd_config \
-    ssh-keygen \
-    start-ssh \
-    rsync \
-    su \
-    Stk \
-    libdrmclearkeyplugin \
-    libclearkeycasplugin \
-    CtsShimPrebuilt \
-    CtsShimPrivPrebuilt \
-    Traceur \
-    PrintRecommendationService \
-    CompanionDeviceManager \
-    MusicFX
-#    drmserver \
-#    libfwdlockengine \
-
-include $(BUILD_PREBUILT)
diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
index 3a12168f..ed8ff669 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -76,19 +76,6 @@
     <!-- Remote server that can provide NTP responses. -->
     <string translatable="false" name="config_ntpServer">1.android.pool.ntp.org</string>
 
-    <!-- MMS user agent string -->
-    <string name="config_mms_user_agent" translatable="false">Android-Mms/2.0</string>
-
-    <!-- MMS user agent prolfile url -->
-    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-
-    <!-- The URL that should be sent in an x-wap-profile header with an HTTP request,
-         as defined in the Open Mobile Alliance User Agent Profile specification
-         OMA-TS-UAProf-V2_0-20060206-A Section 8.1.1.1. If the URL contains a '%s'
-         format string then that substring will be replaced with the value of
-         Build.MODEL. The format string shall not be escaped. -->
-    <string name="config_useragentprofile_url" translatable="false"></string>
-
     <!-- The default journal mode to use use when Write-Ahead Logging is not active.
          Choices are: OFF, DELETE, TRUNCATE, PERSIST and MEMORY.
          PERSIST may improve performance by reducing how often journal blocks are
diff --git a/Patches/Linux b/Patches/Linux
index 067de1d6..ce03dc73 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 067de1d6487c0b30d8a674d859c0257ba8b5b03b
+Subproject commit ce03dc73659c833b8d950584b83ab39560e31015
diff --git a/Patches/Wallpapers b/Patches/Wallpapers
index ee0af5b2..3d2c2de9 160000
--- a/Patches/Wallpapers
+++ b/Patches/Wallpapers
@@ -1 +1 @@
-Subproject commit ee0af5b27afc4bf0d79c55ad4aa8697bb460a1f2
+Subproject commit 3d2c2de937d986c55b0a24eade1b64d9f2bff509
diff --git a/PrebuiltApps b/PrebuiltApps
index d971e0d8..977f3daf 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit d971e0d81b487086d5e9cdc8d251eba751fab48f
+Subproject commit 977f3daf93d9e30746578fb362af92023995a570
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 39abe9e2..b37b256d 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -74,6 +74,7 @@ buildAll() {
 	buildDevice osprey;
 	buildDevice himaul;
 	buildDevice Z00T;
+	buildDevice clark; #Last version with working IMS
 	buildDeviceUserDebug i9100;
 	if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
 		buildDevice flo;
@@ -94,7 +95,6 @@ buildAll() {
 		buildDevice shamu verity;
 		buildDevice bullhead verity;
 		buildDevice oneplus2;
-		buildDevice clark;
 		buildDevice ether;
 		buildDevice angler verity;
 		buildDevice kipper;
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 16352d74..0ca85a0a 100644
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -295,7 +295,7 @@ if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2
 find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationFWB "{}"';
-find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"';
+#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenBootArgs "{}"';
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index cede14bb..4ae63844 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -66,10 +66,13 @@ buildAll() {
 	buildDevice dragon verity;
 
 	#The following are all superseded, and should only be enabled if the newer version is broken (not building/booting/etc.)
+	buildDevice flo; #Last version without repartitioning required
+	buildDevice shamu verity; #Last version with working IMS
+	buildDevice oneplus2; #Last version with working IMS
+	buildDevice ether; #Last version with working IMS
 	buildDevice fugu;
 	if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
 		buildDevice mako;
-		buildDevice flo;
 		buildDevice crackling;
 		buildDevice d802;
 		buildDevice bacon;
@@ -81,9 +84,6 @@ buildAll() {
 		buildDevice klte;
 		buildDevice m8;
 		buildDevice victara;
-		buildDevice shamu verity;
-		buildDevice oneplus2;
-		buildDevice ether;
 		buildDevice kipper;
 		buildDevice oneplus3;
 		buildDevice h990;
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 9ddf2d55..c616e6d6 100644
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -246,7 +246,7 @@ if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2
 find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationFWB "{}"';
-find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"';
+#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenBootArgs "{}"';
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index cacd4281..bf8987a2 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -70,14 +70,13 @@ buildAll() {
 	#Intel
 	buildDevice fugu; #broken - ninja: error: 'libpcre2.so' missing and no known rule to make it
 
-	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
+	buildDevice mako; #Last version without repartitioning required
+	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile #17.1 isn't booting
 	buildDevice dumpling verity;
 	buildDevice yellowstone; #broken sepolicy?
 	if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
 		#SD410
 		buildDevice crackling;
-		#SDS4P
-		buildDevice mako;
 		#SD600
 		buildDevice jfltexx;
 		#SD800
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index 29a39eea..ad3874ca 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -284,7 +284,7 @@ if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2
 find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationFWB "{}"';
-find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"';
+#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenBootArgs "{}"';
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index ab34b731..da033dde 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -126,7 +126,7 @@ patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
 	source build/envsetup.sh;
-	repopick -i 287339; #releasetools: python3 fix
+	repopick -i 271361; #releasetools: python3 fix, 287339 (alt)
 	#repopick -it ten-firewall;
 	#repopick -it CVE-2019-2306;
 
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 3723342f..e0e3f6d3 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -311,7 +311,7 @@ if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2
 find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationFWB "{}"';
-find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"';
+#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenBootArgs "{}"';
diff --git a/Scripts/init.sh b/Scripts/init.sh
index a64cadc0..b0ed92d4 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -39,7 +39,7 @@ export DOS_MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick,
 #Deblobber
 export DOS_DEBLOBBER_REMOVE_ACCESSORIES=true; #Set false to allow use of external accessories that depend on blobs
 export DOS_DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX
-export DOS_DEBLOBBER_REMOVE_CNE=true; #Set true to remove all CNE blobs
+export DOS_DEBLOBBER_REMOVE_CNE=true; #Set true to remove all CNE blobs #XXX: Breaks Wi-Fi calling
 export DOS_DEBLOBBER_REMOVE_GRAPHICS=false; #Set true to remove all graphics blobs and use SwiftShader CPU renderer #TODO: Needs work
 export DOS_DEBLOBBER_REMOVE_RENDERSCRIPT=false; #Set true to remove RenderScript blobs
 export DOS_DEBLOBBER_REMOVE_FP=false; #Set true to remove all fingerprint reader blobs
@@ -52,12 +52,12 @@ export DOS_DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Serv
 #Features
 export DOS_GPS_GLONASS_FORCED=false; #Enables GLONASS on all devices
 export DOS_GRAPHENE_MALLOC=true; #Enables use of GrapheneOS' hardened memory allocator on 64-bit platforms
-export DOS_GRAPHENE_EXEC=true; #Enables use of GrapheneOS' exec spawning feature
+export DOS_GRAPHENE_EXEC=false; #Enables use of GrapheneOS' exec spawning feature XXX: broken (just on 17.1?)
 export DOS_HOSTS_BLOCKING=true; #Set false to prevent inclusion of a HOSTS file
 export DOS_HOSTS_BLOCKING_APP="DNS66"; #App installed when built-in blocking is disabled. Options: DNS66
 export DOS_HOSTS_BLOCKING_LIST="https://divestos.org/hosts"; #Must be in the format "127.0.0.1 bad.domain.tld"
 export DOS_LOWRAM_ENABLED=false; #Set true to enable low_ram on all devices
-export DOS_MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NONE, NLP, FULL
+export DOS_MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NLP, FULL
 export DOS_NON_COMMERCIAL_USE_PATCHES=false; #Set true to allow inclusion of non-commercial use patches XXX: Unused, see 1dc9247
 export DOS_OPTIMIZE_IMAGES=false; #Set true to apply lossless optimizations to image resources
 export DOS_OVERCLOCKS_ENABLED=false; #Set true to enable overclocks #XXX: Most devices have their processors directly under their RAM, heatsinking is mostly into the ground plane, potentially inflicting damage to RAM and the processor itself
@@ -101,6 +101,8 @@ export DOS_THEME_700="E64A19"; #Deep Orange 700
 #END OF USER CONFIGURABLE OPTIONS
 #
 
+umask 0022;
+
 gpgVerifyGitHead() {
 	if [ -r "$HOME/.gnupg" ]; then
 		git -C $1 verify-commit HEAD;