diff --git a/Patches/Common/android_vendor_divested/divested.mk b/Patches/Common/android_vendor_divested/divestos.mk
similarity index 100%
rename from Patches/Common/android_vendor_divested/divested.mk
rename to Patches/Common/android_vendor_divested/divestos.mk
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 3a9fa256..d7d50f43 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
@@ -139,7 +139,9 @@
     <string-array name="config_locationProviderPackageNames" translatable="false">
         <!-- The standard AOSP fused location provider -->
         <item>com.android.location.fused</item>
+	<!-- UnifiedNLP -->
         <item>org.microg.nlp</item>
+	<!-- microG (in this case) -->
         <item>com.google.android.gms</item>
     </string-array>
 
diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index bf4ca916..5ff0d265 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -11,7 +11,7 @@
     <bool name="config_recents_use_hardware_layers">true</bool>
 
     <!-- Whether to use cheap, less good looking shadows for recents -->
-    <bool name="config_recents_fake_shadows">false</bool>
+    <bool name="config_recents_fake_shadows">true</bool>
 
     <!-- Whether to clip notification contents with a rounded rectangle. Might be expensive on
          certain GPU's and thus can be turned off with only minimal visual impact. -->
diff --git a/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
index e4eea367..c4602f37 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Default for LineageSettings.Secure.STATS_COLLECTION -->
+    <bool name="def_stats_collection">false</bool>
+
     <!-- Default value of LineageSettings.System.ENABLE_FORWARD_LOOKUP -->
     <integer name="def_forward_lookup">0</integer>
 
diff --git a/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
index e4eea367..f9b38e2e 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Default for CMSettings.Secure.STATS_COLLECTION -->
+    <bool name="def_stats_collection">false</bool>
+
     <!-- Default value of LineageSettings.System.ENABLE_FORWARD_LOOKUP -->
     <integer name="def_forward_lookup">0</integer>
 
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index bb3aa437..15a4e91d 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -165,14 +165,14 @@ if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
 fi;
 sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype
 if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/CM_BUILDTYPE := dos/CM_BUILDTYPE := dosNC/' config/common.mk; fi;
-echo 'include vendor/divested/divested.mk' >> config/common.mk; #Include our customizations
+echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 
 enterAndClear "vendor/cmsdk";
 awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather
 if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/CMAudioService/' cm/res/res/values/config.xml; fi;
 sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java; #Per app performance profiles fix
 
-enterAndClear "vendor/divested";
+enter "vendor/divested";
 if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += microG" >> packages.mk;
 if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> packages.mk;
 #
diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh
index dce10bce..af5a88bd 100644
--- a/Scripts/LineageOS-15.1/Defaults.sh
+++ b/Scripts/LineageOS-15.1/Defaults.sh
@@ -58,8 +58,5 @@ sed -i 's/"pref_predictive_apps", true/"pref_predictive_apps", false/' src/com/a
 enter "packages/inputmethods/LatinIME";
 #sed -i 's/PREF_KEY_USE_PERSONALIZED_DICTS, true/PREF_KEY_USE_PERSONALIZED_DICTS, false/' java/src/com/android/inputmethod/latin/settings/SettingsValues.java; #FIXME
 
-enter "vendor/lineage";
-sed -i 's/def_stats_collection">true/def_stats_collection">false/' overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml;
-
 cd "$DOS_BUILD_BASE";
 echo "Default settings changed!";
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index f3295d74..d59c0642 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -163,9 +163,9 @@ awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys
 if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/AudioFX/' config/common.mk; fi;
 sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/common.mk; #Change buildtype
 if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYPE := dos/LINEAGE_BUILDTYPE := dosNC/' config/common.mk; fi;
-echo 'include vendor/divested/divested.mk' >> config/common.mk; #Include our customizations
+echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 
-enterAndClear "vendor/divested";
+enter "vendor/divested";
 if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += microG" >> packages.mk;
 if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> packages.mk;
 #