diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/FDroid/app/src/main/res/values/default_repos.xml b/Patches/Common/android_packages_apps_FDroid/default_repos.xml
similarity index 100%
rename from Patches/Common/android_vendor_divested/overlay/common/packages/apps/FDroid/app/src/main/res/values/default_repos.xml
rename to Patches/Common/android_packages_apps_FDroid/default_repos.xml
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 8af5b817..c101222f 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
@@ -242,10 +242,6 @@
     <!-- Integer indicating wpa_supplicant scan interval in milliseconds -->
     <integer translatable="false" name="config_wifi_supplicant_scan_interval">30000</integer>
 
-    <!-- Boolean indicating whether the HWC setColorTransform function can be performed efficiently
-         in hardware. -->
-    <bool name="config_setColorTransformAccelerated">false</bool>
-
     <!-- Enables the TimeZoneRuleManager service. This is the master switch for the updateable time
          zone update mechanism. -->
     <bool name="config_enableUpdateableTimeZoneRules">false</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/DocumentsUI/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/DocumentsUI/res/values/config.xml
index 2075f429..14023c3a 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/DocumentsUI/res/values/config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/DocumentsUI/res/values/config.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources>
 
     <!-- Flags setup as productivity oriented in which case Downloads app will be presented
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_4x4.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
similarity index 100%
rename from Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_4x4.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_4x4.xml
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x5.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml
similarity index 100%
rename from Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x5.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x5.xml
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x6.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml
similarity index 100%
rename from Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace/default_workspace_5x6.xml
rename to Patches/Common/android_vendor_divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_5x6.xml
diff --git a/Scripts/LineageOS-14.1/Defaults.sh b/Scripts/LineageOS-14.1/Defaults.sh
index b1b5f518..8f4071d1 100644
--- a/Scripts/LineageOS-14.1/Defaults.sh
+++ b/Scripts/LineageOS-14.1/Defaults.sh
@@ -50,5 +50,9 @@ enter "packages/apps/Settings";
 sed -i 's/WEB_ACTION_ENABLED, 1/WEB_ACTION_ENABLED, 0/' src/com/android/settings/applications/ManageDomainUrls.java; #Disable "Instant Apps"
 sed -i 's/Float.parseFloat(newValue.toString()) : 1;/Float.parseFloat(newValue.toString()) : 0.5f;/' src/com/android/settings/DevelopmentSettings.java; #Always reset animation scales to 0.5
 
+enter "vendor/cm";
+sed -i 's/ro.config.notification_sound=Argon.ogg/ro.config.notification_sound=Pong.ogg/' config/common.mk;
+sed -i 's/ro.config.alarm_alert=Hassium.ogg/ro.config.alarm_alert=Alarm_Buzzer.ogg/' config/common.mk;
+
 cd "$DOS_BUILD_BASE";
 echo "Default settings changed!";
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index e8b5eb14..c83716be 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -105,6 +105,7 @@ patch -p1 < "$DOS_PATCHES/android_packages_apps_CMParts/0001-Remove_Analytics.pa
 patch -p1 < "$DOS_PATCHES/android_packages_apps_CMParts/0002-Reduced_Resolution.patch"; #Allow reducing resolution to save power
 
 enterAndClear "packages/apps/FDroid";
+cp "$DOS_PATCHES_COMMON/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos
 sed -i 's|outputs/apk/|outputs/apk/full/release/|' Android.mk;
 sed -i 's|-release-unsigned|-full-release-unsigned|' Android.mk;
 sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix
@@ -164,6 +165,7 @@ if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
 	awk -i inplace '!/AudioFX/' config/common.mk;
 	awk -i inplace '!/AudioService/' config/common.mk;
 fi;
+if [ "$DOS_MICROG_INCLUDED" = "NLP" ]; then sed -i '/Google provider/!b;n;s/com.google.android.gms/org.microg.nlp/' overlay/common/frameworks/base/core/res/res/values/config.xml; 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/divestos.mk' >> config/common.mk; #Include our customizations
diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh
index f42b5741..6ee8f929 100644
--- a/Scripts/LineageOS-14.1/Rebrand.sh
+++ b/Scripts/LineageOS-14.1/Rebrand.sh
@@ -41,7 +41,6 @@ enter "packages/apps/SetupWizard";
 sed -i 's|http://lineageos.org/legal|'"$DOS_BRANDING_LINK_PRIVACY"'|' src/com/cyanogenmod/setupwizard/LineageSettingsActivity.java;
 sed -i '/.*setup_services/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 sed -i '/.*services_explanation/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
-cp "$DOS_PATCHES_COMMON/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours
 
 enter "packages/apps/Updater";
 sed -i 's|0OTASERVER0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;
diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh
index af5a88bd..6a58330b 100644
--- a/Scripts/LineageOS-15.1/Defaults.sh
+++ b/Scripts/LineageOS-15.1/Defaults.sh
@@ -58,5 +58,9 @@ 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/ro.config.notification_sound=Argon.ogg/ro.config.notification_sound=Pong.ogg/' config/common.mk;
+sed -i 's/ro.config.alarm_alert=Hassium.ogg/ro.config.alarm_alert=Alarm_Buzzer.ogg/' config/common.mk;
+
 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 52bcaeb3..51dfffdd 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -105,6 +105,7 @@ awk -i inplace '!/WeatherManagerServiceBroker/' lineage/res/res/values/config.xm
 if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi;
 
 enterAndClear "packages/apps/FDroid";
+cp "$DOS_PATCHES_COMMON/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos
 sed -i 's|outputs/apk/|outputs/apk/full/release/|' Android.mk;
 sed -i 's|-release-unsigned|-full-release-unsigned|' Android.mk;
 sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix
@@ -162,6 +163,7 @@ if [ "$DOS_HOSTS_BLOCKING" = true ]; then awk -i inplace '!/50-lineage.sh/' conf
 awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys
 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;
+if [ "$DOS_MICROG_INCLUDED" = "NLP" ]; then sed -i '/Google provider/!b;n;s/com.google.android.gms/org.microg.nlp/' overlay/common/frameworks/base/core/res/res/values/config.xml; 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/divestos.mk' >> config/common.mk; #Include our customizations
diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh
index 012b6197..81c6d2b5 100644
--- a/Scripts/LineageOS-15.1/Rebrand.sh
+++ b/Scripts/LineageOS-15.1/Rebrand.sh
@@ -53,7 +53,6 @@ enter "packages/apps/SetupWizard";
 sed -i 's|http://lineageos.org/legal|'"$DOS_BRANDING_LINK_PRIVACY"'|' src/org/lineageos/setupwizard/LineageSettingsActivity.java;
 sed -i '/.*setup_services/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 sed -i '/.*services_explanation/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
-cp "$DOS_PATCHES_COMMON/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours
 
 enter "packages/apps/Updater";
 sed -i 's|0OTASERVER0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;