diff --git a/Scripts/Common/Defaults.sh b/Scripts/Common/Defaults.sh
new file mode 100644
index 00000000..ff25d248
--- /dev/null
+++ b/Scripts/Common/Defaults.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+#DivestOS: A privacy focused mobile distribution
+#Copyright (c) 2017-2023 Divested Computing Group
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program.  If not, see <https://www.gnu.org/licenses/>.
+umask 0022;
+set -euo pipefail;
+source "$DOS_SCRIPTS_COMMON/Shell.sh";
+
+#Changes various default settings
+#Last verified: 2022-10-15
+
+#Useful commands
+#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
+#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
+
+echo "Changing default settings...";
+
+#if enter "frameworks/base"; then
+#14.1
+#sed -i 's/CMPRIVACY_GUARD_NOTIFICATION, 1/CMPRIVACY_GUARD_NOTIFICATION, 0/' services/core/java/com/android/server/am/ActivityStack.java &>/dev/null || true;
+#sed -i 's/VOLBTN_MUSIC_CONTROLS, 1/VOLBTN_MUSIC_CONTROLS, 0/' services/core/java/com/android/server/policy/PhoneWindowManager.java &>/dev/null || true; #FIXME
+#sed -i 's/VOLUME_KEYS_CONTROL_RING_STREAM, 1/VOLUME_KEYS_CONTROL_RING_STREAM, 0/' services/core/java/com/android/server/audio/AudioService.java &>/dev/null || true; #FIXME
+#sed -i 's/TORCH_LONG_PRESS_POWER_GESTURE, 0/TORCH_LONG_PRESS_POWER_GESTURE, 1/' services/core/java/com/android/server/policy/PhoneWindowManager.java &>/dev/null || true; #FIXME
+#sed -i 's/TORCH_LONG_PRESS_POWER_TIMEOUT, 0/TORCH_LONG_PRESS_POWER_TIMEOUT, 120/' services/core/java/com/android/server/policy/PhoneWindowManager.java &>/dev/null || true; #FIXME
+#sed -i 's/CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0/CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 1/' services/core/java/com/android/server/GestureLauncherService.java &>/dev/null || true; #FIXME
+#sed -i 's/NAVIGATION_BAR_MENU_ARROW_KEYS, 0/NAVIGATION_BAR_MENU_ARROW_KEYS, 1/' packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java &>/dev/null || true; #FIXME
+#fi;
+
+if enter "packages/apps/Dialer"; then
+#14.1
+sed -i 's/ENABLE_FORWARD_LOOKUP, 1)/ENABLE_FORWARD_LOOKUP, 0)/' src/com/android/dialer//LookupSettings*.java &>/dev/null || true; #Disable FLP
+sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java &>/dev/null || true; #Disable PLP
+sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java &>/dev/null || true; #Disable RLP
+#15.1+16.0+17.1
+sed -i 's/ENABLE_FORWARD_LOOKUP, 1)/ENABLE_FORWARD_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java &>/dev/null || true; #Disable FLP
+sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java &>/dev/null || true; #Disable PLP
+sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java &>/dev/null || true; #Disable RLP
+#18.1+
+sed -i 's/ENABLE_FORWARD_LOOKUP, true)/ENABLE_FORWARD_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java &>/dev/null || true; #Disable FLP
+sed -i 's/ENABLE_PEOPLE_LOOKUP, true)/ENABLE_PEOPLE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java &>/dev/null || true; #Disable PLP
+sed -i 's/ENABLE_REVERSE_LOOKUP, true)/ENABLE_REVERSE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java &>/dev/null || true; #Disable RLP
+fi;
+
+if enter "packages/apps/Nfc"; then
+sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java &>/dev/null || true; #Disable NFC
+sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java &>/dev/null || true; #Disable NDEF Push
+fi;
+
+if enter "packages/apps/Settings"; then
+#Disable "Instant Apps"
+sed -i 's/WEB_ACTION_ENABLED, 1/WEB_ACTION_ENABLED, 0/' src/com/android/settings/applications/ManageDomainUrls.java &>/dev/null || true; #14.1
+sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_ENABLED, 0/' src/com/android/settings/applications/ManageDomainUrls.java &>/dev/null || true; #15.1+16.0
+sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_ENABLED, 0/' src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java &>/dev/null || true; #17.1+
+#Always reset animation scales to 0.5
+sed -i 's/Float.parseFloat(newValue.toString()) : 1;/Float.parseFloat(newValue.toString()) : 0.5f;/' src/com/android/settings/DevelopmentSettings.java &>/dev/null || true; #14.1
+sed -i 's/Float.parseFloat(newValue.toString()) : 1;/Float.parseFloat(newValue.toString()) : 0.5f;/' src/com/android/settings/development/DevelopmentSettings.java &>/dev/null || true; #15.1
+sed -i 's/DEFAULT_VALUE = 1;/DEFAULT_VALUE = 0.5f;/' src/com/android/settings/development/*ScalePreferenceController.java &>/dev/null || true; #16.0+
+fi;
+
+if enter "packages/apps/SetupWizard"; then
+sed -i 's/UPDATE_RECOVERY_PROP, false)/UPDATE_RECOVERY_PROP, true)/' src/org/lineageos/setupwizard/UpdateRecoveryActivity.java &>/dev/null || true; #Always update recovery by default 18.1+
+fi;
+
+if enter "packages/apps/Trebuchet"; then
+sed -i 's/"pref_predictive_apps", true/"pref_predictive_apps", false/' src/com/android/launcher3/Launcher.java &>/dev/null || true; #15.1
+fi;
+
+if enter "packages/apps/Updater"; then
+sed -i 's/Constants.UPDATE_RECOVERY_PROPERTY, false)/Constants.UPDATE_RECOVERY_PROPERTY, true)/' src/org/lineageos/updater/UpdatesActivity.java &>/dev/null || true; #Always update recovery by default 18.1+
+fi;
+
+fi [[ "$DOS_VERSION" == "LineageOS-14.1" ]]; then
+if enter "vendor/cm"; then #14.1
+sed -i 's/ro.config.notification_sound=Argon.ogg/ro.config.notification_sound=Pong.ogg/' config/common*.mk &>/dev/null || true;
+sed -i 's/ro.config.alarm_alert=Hassium.ogg/ro.config.alarm_alert=Alarm_Buzzer.ogg/' config/common*.mk &>/dev/null || true;
+fi;
+fi;
+
+fi [[ "$DOS_VERSION" != "LineageOS-14.1" ]]; then
+if enter "vendor/lineage"; then #15.1+
+sed -i 's/ro.config.notification_sound=Argon.ogg/ro.config.notification_sound=Pong.ogg/' config/common*.mk &>/dev/null || true;
+sed -i 's/ro.config.alarm_alert=Hassium.ogg/ro.config.alarm_alert=Alarm_Buzzer.ogg/' config/common*.mk &>/dev/null || true;
+fi;
+fi;
+
+cd "$DOS_BUILD_BASE";
+echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-14.1/Defaults.sh b/Scripts/LineageOS-14.1/Defaults.sh
deleted file mode 100644
index 7ccc594c..00000000
--- a/Scripts/LineageOS-14.1/Defaults.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy focused mobile distribution
-#Copyright (c) 2017-2021 Divested Computing Group
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-umask 0022;
-set -euo pipefail;
-source "$DOS_SCRIPTS_COMMON/Shell.sh";
-
-#Changes various default settings
-#Last verified: 2021-10-16
-
-#Useful commands
-#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
-#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
-
-echo "Changing default settings...";
-
-#if enter "frameworks/base"; then
-#sed -i 's/CMPRIVACY_GUARD_NOTIFICATION, 1/CMPRIVACY_GUARD_NOTIFICATION, 0/' services/core/java/com/android/server/am/ActivityStack.java;
-#sed -i 's/VOLBTN_MUSIC_CONTROLS, 1/VOLBTN_MUSIC_CONTROLS, 0/' services/core/java/com/android/server/policy/PhoneWindowManager.java; #FIXME
-#sed -i 's/VOLUME_KEYS_CONTROL_RING_STREAM, 1/VOLUME_KEYS_CONTROL_RING_STREAM, 0/' services/core/java/com/android/server/audio/AudioService.java; #FIXME
-#sed -i 's/TORCH_LONG_PRESS_POWER_GESTURE, 0/TORCH_LONG_PRESS_POWER_GESTURE, 1/' services/core/java/com/android/server/policy/PhoneWindowManager.java; #FIXME
-#sed -i 's/TORCH_LONG_PRESS_POWER_TIMEOUT, 0/TORCH_LONG_PRESS_POWER_TIMEOUT, 120/' services/core/java/com/android/server/policy/PhoneWindowManager.java; #FIXME
-#sed -i 's/CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0/CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 1/' services/core/java/com/android/server/GestureLauncherService.java; #FIXME
-#sed -i 's/NAVIGATION_BAR_MENU_ARROW_KEYS, 0/NAVIGATION_BAR_MENU_ARROW_KEYS, 1/' packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java; #FIXME
-#fi;
-
-if enter "packages/apps/Dialer"; then
-sed -i 's/ENABLE_FORWARD_LOOKUP, 1)/ENABLE_FORWARD_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable FLP
-sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable PLP
-sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable RLP
-fi;
-
-if enter "packages/apps/Nfc"; then
-sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
-sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
-fi;
-
-if enter "packages/apps/Settings"; then
-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
-fi;
-
-if enter "vendor/cm"; then
-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;
-fi;
-
-cd "$DOS_BUILD_BASE";
-echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 5578f878..39d23ee1 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -109,7 +109,7 @@ patchWorkspace() {
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
 	sh "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
-	sh "$DOS_SCRIPTS/Defaults.sh";
+	sh "$DOS_SCRIPTS_COMMON/Defaults.sh";
 	sh "$DOS_SCRIPTS/Rebrand.sh";
 	sh "$DOS_SCRIPTS/Theme.sh";
 	sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh
deleted file mode 100644
index 37243063..00000000
--- a/Scripts/LineageOS-15.1/Defaults.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy focused mobile distribution
-#Copyright (c) 2017-2021 Divested Computing Group
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-umask 0022;
-set -euo pipefail;
-source "$DOS_SCRIPTS_COMMON/Shell.sh";
-
-#Changes various default settings
-#Last verified: 2021-10-16
-
-#Useful commands
-#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
-#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
-
-echo "Changing default settings...";
-
-if enter "packages/apps/Dialer"; then
-sed -i 's/ENABLE_FORWARD_LOOKUP, 1)/ENABLE_FORWARD_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable FLP
-sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable PLP
-sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP
-fi;
-
-if enter "packages/apps/Nfc"; then
-sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
-sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
-fi;
-
-if enter "packages/apps/Settings"; then
-sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_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/development/DevelopmentSettings.java; #Always reset animation scales to 0.5
-fi;
-
-if enter "packages/apps/Trebuchet"; then
-sed -i 's/"pref_predictive_apps", true/"pref_predictive_apps", false/' src/com/android/launcher3/Launcher.java;
-fi;
-
-if enter "vendor/lineage"; then
-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;
-fi;
-
-cd "$DOS_BUILD_BASE";
-echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index af0f03dc..fc1a150b 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -87,7 +87,7 @@ patchWorkspace() {
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
 	sh "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
-	sh "$DOS_SCRIPTS/Defaults.sh";
+	sh "$DOS_SCRIPTS_COMMON/Defaults.sh";
 	sh "$DOS_SCRIPTS/Rebrand.sh";
 	sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
 	sh "$DOS_SCRIPTS_COMMON/Deblob.sh";
diff --git a/Scripts/LineageOS-16.0/Defaults.sh b/Scripts/LineageOS-16.0/Defaults.sh
deleted file mode 100644
index 3b6bad76..00000000
--- a/Scripts/LineageOS-16.0/Defaults.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy focused mobile distribution
-#Copyright (c) 2017-2021 Divested Computing Group
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-umask 0022;
-set -euo pipefail;
-source "$DOS_SCRIPTS_COMMON/Shell.sh";
-
-#Changes various default settings
-#Last verified: 2021-10-16
-
-#Useful commands
-#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
-#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
-
-echo "Changing default settings...";
-
-if enter "packages/apps/Dialer"; then
-sed -i 's/ENABLE_FORWARD_LOOKUP, 1)/ENABLE_FORWARD_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable FLP
-sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable PLP
-sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP
-fi;
-
-if enter "packages/apps/Nfc"; then
-sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
-sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
-fi;
-
-if enter "packages/apps/Settings"; then
-sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_ENABLED, 0/' src/com/android/settings/applications/ManageDomainUrls.java; #Disable "Instant Apps"
-sed -i 's/DEFAULT_VALUE = 1;/DEFAULT_VALUE = 0.5f;/' src/com/android/settings/development/*ScalePreferenceController.java; #Always reset animation scales to 0.5
-fi;
-
-if enter "vendor/lineage"; then
-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;
-fi;
-
-cd "$DOS_BUILD_BASE";
-echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 7cfe64cb..09371776 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -91,7 +91,7 @@ patchWorkspace() {
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
 	sh "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
-	sh "$DOS_SCRIPTS/Defaults.sh";
+	sh "$DOS_SCRIPTS_COMMON/Defaults.sh";
 	sh "$DOS_SCRIPTS/Rebrand.sh";
 	sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
 	sh "$DOS_SCRIPTS_COMMON/Deblob.sh";
diff --git a/Scripts/LineageOS-17.1/Defaults.sh b/Scripts/LineageOS-17.1/Defaults.sh
deleted file mode 100644
index 47a9d640..00000000
--- a/Scripts/LineageOS-17.1/Defaults.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy focused mobile distribution
-#Copyright (c) 2017-2021 Divested Computing Group
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-umask 0022;
-set -euo pipefail;
-source "$DOS_SCRIPTS_COMMON/Shell.sh";
-
-#Changes various default settings
-#Last verified: 2021-10-16
-
-#Useful commands
-#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
-#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
-
-echo "Changing default settings...";
-
-if enter "packages/apps/Dialer"; then
-sed -i 's/ENABLE_FORWARD_LOOKUP, 1)/ENABLE_FORWARD_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable FLP
-sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable PLP
-sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP
-fi;
-
-if enter "packages/apps/Nfc"; then
-sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
-sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
-fi;
-
-if enter "packages/apps/Settings"; then
-sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_ENABLED, 0/' src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java; #Disable "Instant Apps"
-sed -i 's/DEFAULT_VALUE = 1;/DEFAULT_VALUE = 0.5f;/' src/com/android/settings/development/*ScalePreferenceController.java; #Always reset animation scales to 0.5
-fi;
-
-if enter "vendor/lineage"; then
-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;
-fi;
-
-cd "$DOS_BUILD_BASE";
-echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 1f402f03..12148bf1 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -86,7 +86,7 @@ patchWorkspace() {
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
 	sh "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
-	sh "$DOS_SCRIPTS/Defaults.sh";
+	sh "$DOS_SCRIPTS_COMMON/Defaults.sh";
 	sh "$DOS_SCRIPTS/Rebrand.sh";
 	sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
 	sh "$DOS_SCRIPTS_COMMON/Deblob.sh";
diff --git a/Scripts/LineageOS-18.1/Defaults.sh b/Scripts/LineageOS-18.1/Defaults.sh
deleted file mode 100644
index 39ebdc36..00000000
--- a/Scripts/LineageOS-18.1/Defaults.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy focused mobile distribution
-#Copyright (c) 2017-2021 Divested Computing Group
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-umask 0022;
-set -euo pipefail;
-source "$DOS_SCRIPTS_COMMON/Shell.sh";
-
-#Changes various default settings
-#Last verified: 2021-10-16
-
-#Useful commands
-#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
-#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
-
-echo "Changing default settings...";
-
-if enter "packages/apps/Dialer"; then
-sed -i 's/ENABLE_FORWARD_LOOKUP, true)/ENABLE_FORWARD_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable FLP
-sed -i 's/ENABLE_PEOPLE_LOOKUP, true)/ENABLE_PEOPLE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable PLP
-sed -i 's/ENABLE_REVERSE_LOOKUP, true)/ENABLE_REVERSE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP
-fi;
-
-if enter "packages/apps/Nfc"; then
-sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
-sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
-fi;
-
-if enter "packages/apps/Settings"; then
-sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_ENABLED, 0/' src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java; #Disable "Instant Apps"
-sed -i 's/DEFAULT_VALUE = 1;/DEFAULT_VALUE = 0.5f;/' src/com/android/settings/development/*ScalePreferenceController.java; #Always reset animation scales to 0.5
-fi;
-
-if enter "packages/apps/SetupWizard"; then
-sed -i 's/UPDATE_RECOVERY_PROP, false)/UPDATE_RECOVERY_PROP, true)/' src/org/lineageos/setupwizard/UpdateRecoveryActivity.java; #Always update recovery by default
-fi;
-
-if enter "packages/apps/Updater"; then
-sed -i 's/Constants.UPDATE_RECOVERY_PROPERTY, false)/Constants.UPDATE_RECOVERY_PROPERTY, true)/' src/org/lineageos/updater/UpdatesActivity.java; #Always update recovery by default
-fi;
-
-if enter "vendor/lineage"; then
-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;
-fi;
-
-cd "$DOS_BUILD_BASE";
-echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index eea8a113..d943151d 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -117,7 +117,7 @@ patchWorkspace() {
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
 	sh "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
-	sh "$DOS_SCRIPTS/Defaults.sh";
+	sh "$DOS_SCRIPTS_COMMON/Defaults.sh";
 	sh "$DOS_SCRIPTS/Rebrand.sh";
 	sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
 	sh "$DOS_SCRIPTS_COMMON/Deblob.sh";
diff --git a/Scripts/LineageOS-19.1/Defaults.sh b/Scripts/LineageOS-19.1/Defaults.sh
deleted file mode 100644
index 26d85ea8..00000000
--- a/Scripts/LineageOS-19.1/Defaults.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy focused mobile distribution
-#Copyright (c) 2017-2022 Divested Computing Group
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-umask 0022;
-set -euo pipefail;
-source "$DOS_SCRIPTS_COMMON/Shell.sh";
-
-#Changes various default settings
-#Last verified: 2022-04-04
-
-#Useful commands
-#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
-#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
-
-echo "Changing default settings...";
-
-if enter "packages/apps/Dialer"; then
-sed -i 's/ENABLE_FORWARD_LOOKUP, true)/ENABLE_FORWARD_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable FLP
-sed -i 's/ENABLE_PEOPLE_LOOKUP, true)/ENABLE_PEOPLE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable PLP
-sed -i 's/ENABLE_REVERSE_LOOKUP, true)/ENABLE_REVERSE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP
-fi;
-
-if enter "packages/apps/Nfc"; then
-sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
-sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
-fi;
-
-if enter "packages/apps/Settings"; then
-sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_ENABLED, 0/' src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java; #Disable "Instant Apps"
-sed -i 's/DEFAULT_VALUE = 1;/DEFAULT_VALUE = 0.5f;/' src/com/android/settings/development/*ScalePreferenceController.java; #Always reset animation scales to 0.5
-fi;
-
-if enter "packages/apps/SetupWizard"; then
-sed -i 's/UPDATE_RECOVERY_PROP, false)/UPDATE_RECOVERY_PROP, true)/' src/org/lineageos/setupwizard/UpdateRecoveryActivity.java; #Always update recovery by default
-fi;
-
-if enter "packages/apps/Updater"; then
-sed -i 's/Constants.UPDATE_RECOVERY_PROPERTY, false)/Constants.UPDATE_RECOVERY_PROPERTY, true)/' src/org/lineageos/updater/UpdatesActivity.java; #Always update recovery by default
-fi;
-
-if enter "vendor/lineage"; then
-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;
-fi;
-
-cd "$DOS_BUILD_BASE";
-echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index 62f2bb07..913ef58c 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -81,7 +81,7 @@ patchWorkspace() {
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
 	sh "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
-	sh "$DOS_SCRIPTS/Defaults.sh";
+	sh "$DOS_SCRIPTS_COMMON/Defaults.sh";
 	sh "$DOS_SCRIPTS/Rebrand.sh";
 	sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
 	sh "$DOS_SCRIPTS_COMMON/Deblob.sh";
diff --git a/Scripts/LineageOS-20.0/Defaults.sh b/Scripts/LineageOS-20.0/Defaults.sh
deleted file mode 100644
index 249c950a..00000000
--- a/Scripts/LineageOS-20.0/Defaults.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-#DivestOS: A privacy focused mobile distribution
-#Copyright (c) 2017-2022 Divested Computing Group
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see <https://www.gnu.org/licenses/>.
-umask 0022;
-set -euo pipefail;
-source "$DOS_SCRIPTS_COMMON/Shell.sh";
-
-#Changes various default settings
-#Last verified: 2022-10-15
-
-#Useful commands
-#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
-#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
-
-echo "Changing default settings...";
-
-if enter "packages/apps/Dialer"; then
-sed -i 's/ENABLE_FORWARD_LOOKUP, true)/ENABLE_FORWARD_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable FLP
-sed -i 's/ENABLE_PEOPLE_LOOKUP, true)/ENABLE_PEOPLE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable PLP
-sed -i 's/ENABLE_REVERSE_LOOKUP, true)/ENABLE_REVERSE_LOOKUP, false)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP
-fi;
-
-if enter "packages/apps/Nfc"; then
-sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
-sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
-fi;
-
-if enter "packages/apps/Settings"; then
-sed -i 's/INSTANT_APPS_ENABLED, 1/INSTANT_APPS_ENABLED, 0/' src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java; #Disable "Instant Apps"
-sed -i 's/DEFAULT_VALUE = 1;/DEFAULT_VALUE = 0.5f;/' src/com/android/settings/development/*ScalePreferenceController.java; #Always reset animation scales to 0.5
-fi;
-
-if enter "packages/apps/SetupWizard"; then
-sed -i 's/UPDATE_RECOVERY_PROP, false)/UPDATE_RECOVERY_PROP, true)/' src/org/lineageos/setupwizard/UpdateRecoveryActivity.java; #Always update recovery by default
-fi;
-
-if enter "packages/apps/Updater"; then
-sed -i 's/Constants.UPDATE_RECOVERY_PROPERTY, false)/Constants.UPDATE_RECOVERY_PROPERTY, true)/' src/org/lineageos/updater/UpdatesActivity.java; #Always update recovery by default
-fi;
-
-if enter "vendor/lineage"; then
-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;
-fi;
-
-cd "$DOS_BUILD_BASE";
-echo -e "\e[0;32m[SCRIPT COMPLETE] Default settings changed\e[0m";
diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh
index 77a9b97a..d7f17fab 100644
--- a/Scripts/LineageOS-20.0/Functions.sh
+++ b/Scripts/LineageOS-20.0/Functions.sh
@@ -112,7 +112,7 @@ patchWorkspace() {
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
 	sh "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
-	sh "$DOS_SCRIPTS/Defaults.sh";
+	sh "$DOS_SCRIPTS_COMMON/Defaults.sh";
 	sh "$DOS_SCRIPTS/Rebrand.sh";
 	sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
 	sh "$DOS_SCRIPTS_COMMON/Deblob.sh";