diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index d46be85e..49ad5bc1 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -21,7 +21,7 @@
     <fraction name="def_window_animation_scale">50%</fraction>
     <fraction name="def_window_transition_scale">50%</fraction>
 
-    <bool name="def_backup_enabled">false</bool>
-    <!--<string name="def_backup_transport" translatable="false">com.stevesoltys.backup/com.stevesoltys.backup.transport.ConfigurableBackupTransport</string>-->
+    <!--<bool name="def_backup_enabled">false</bool>
+    <string name="def_backup_transport" translatable="false">com.stevesoltys.backup/com.stevesoltys.backup.transport.ConfigurableBackupTransport</string>-->
 
 </resources>
diff --git a/Patches/Linux b/Patches/Linux
index b11b272f..11c6012a 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit b11b272f23077773a11a3d92e222a185cc248356
+Subproject commit 11c6012a2906bf84ee74438d43d0527d970f91d5
diff --git a/PrebuiltApps b/PrebuiltApps
index 7d02900d..4670bac2 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit 7d02900d51925b09f6b086c64c6404fdae998f41
+Subproject commit 4670bac287a78605c825f0926549c1c84fdd202c
diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index 20e2977a..b998c325 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -36,7 +36,7 @@ commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch
 commentPatches android_kernel_cyanogen_msm8974.sh "CVE-2017-7373";
 commentPatches android_kernel_essential_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2017-13218" "CVE-2019-14047/ANY/0002.patch";
 commentPatches android_kernel_fairphone_msm8974.sh "CVE-2018-20169";
-commentPatches android_kernel_fxtec_msm8998.sh "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-0429" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166";
+commentPatches android_kernel_fxtec_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-0429" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166";
 commentPatches android_kernel_google_bonito.sh "CVE-2020-0067";
 commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214";
 commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067";
diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh
index 62b12b9d..d5b5db73 100644
--- a/Scripts/LineageOS-14.1/Rebrand.sh
+++ b/Scripts/LineageOS-14.1/Rebrand.sh
@@ -32,6 +32,11 @@ enter "frameworks/base";
 generateBootAnimationMask "$DOS_BRANDING_NAME" "$DOS_BRANDING_BOOTANIMATION_FONT" core/res/assets/images/android-logo-mask.png;
 generateBootAnimationShine "$DOS_BRANDING_BOOTANIMATION_COLOR" "$DOS_BRANDING_BOOTANIMATION_STYLE" core/res/assets/images/android-logo-shine.png;
 
+enter "packages/apps/CMParts";
+sed -i '/.*egg_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*cmparts_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*privacy_settings_category/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+
 enter "packages/apps/Settings";
 sed -i '/.*cmlicense_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strings.xml;
 sed -i '/.*cmupdate_settings_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strings.xml;
@@ -39,8 +44,9 @@ sed -i '/.*mod_version/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strin
 
 enter "packages/apps/SetupWizard";
 sed -i 's|http://lineageos.org/legal|'"$DOS_BRANDING_LINK_PRIVACY"'|' src/com/cyanogenmod/setupwizard/LineageSettingsActivity.java;
+sed -i '/.*os_name/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*services/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 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;
 
 enter "packages/apps/Updater";
 sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;
diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh
index 83d6abb4..28efc4bc 100644
--- a/Scripts/LineageOS-15.1/Rebrand.sh
+++ b/Scripts/LineageOS-15.1/Rebrand.sh
@@ -44,6 +44,9 @@ sed -i '/.*lineage_updates/s/LineageOS/'"$DOS_BRANDING_NAME"'/' lineage/res/res/
 sed -i '/.*lineageos_system_label/s/LineageOS/'"$DOS_BRANDING_NAME"'/' lineage/res/res/values*/strings.xml;
 
 enter "packages/apps/LineageParts";
+sed -i '/.*egg_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*lineageparts_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*privacy_settings_category/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 sed -i '/.*trust_feature_security_patches_explain/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 
 enter "packages/apps/Settings";
@@ -51,8 +54,9 @@ sed -i '/.*lineagelicense_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*
 
 enter "packages/apps/SetupWizard";
 sed -i 's|http://lineageos.org/legal|'"$DOS_BRANDING_LINK_PRIVACY"'|' src/org/lineageos/setupwizard/LineageSettingsActivity.java;
+sed -i '/.*os_name/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*services/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 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;
 
 enter "packages/apps/Updater";
 sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index c0797e44..87df3d63 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -133,6 +133,7 @@ patchWorkspace() {
 	repopick -it hh-p-sepolicy;
 	repopick -i 232948; #wahoo: liblight: close fd
 	#repopick -it CVE-2019-2306_P;
+	repopick -it p-trust-notif-fix;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh
index 469544d6..dc204bdb 100644
--- a/Scripts/LineageOS-16.0/Rebrand.sh
+++ b/Scripts/LineageOS-16.0/Rebrand.sh
@@ -44,6 +44,9 @@ sed -i '/.*lineage_updates/s/LineageOS/'"$DOS_BRANDING_NAME"'/' lineage/res/res/
 sed -i '/.*lineageos_system_label/s/LineageOS/'"$DOS_BRANDING_NAME"'/' lineage/res/res/values*/strings.xml;
 
 enter "packages/apps/LineageParts";
+sed -i '/.*egg_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*lineageparts_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*privacy_settings_category/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 sed -i '/.*trust_feature_security_patches_explain/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 
 enter "packages/apps/Settings";
@@ -51,8 +54,9 @@ sed -i '/.*lineagelicense_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*
 
 enter "packages/apps/SetupWizard";
 sed -i 's|http://lineageos.org/legal|'"$DOS_BRANDING_LINK_PRIVACY"'|' src/org/lineageos/setupwizard/LineageSettingsActivity.java;
+sed -i '/.*os_name/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*services/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 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;
 
 enter "packages/apps/Updater";
 sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
index 973d9071..8143fb3d 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
@@ -1,37 +1,27 @@
 #!/bin/bash
 cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998"
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0154-0155.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0170-0171.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0181-0182.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0183-0184.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0012.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/^4.6.3/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8394/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10905/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10906/4.4/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.4/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9059/^4.11.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9211/^4.11.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/4.4/0019.patch
@@ -40,252 +30,23 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.7/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/^4.14.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18509/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5953/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/^4.15.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/4.4/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/4.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10938/4.0-^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11506/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12896/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13098/^4.17.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/^4.17.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13100/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14617/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/4.4/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18281/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18690/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19407/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19824/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20836/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20856/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20976/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-21008/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000026/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000026/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0136/4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2024/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3701/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3819/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3846/4.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3882/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3900/4.4/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6133/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6974/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7221/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7222/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9213/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9245/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9453/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/4.4/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/4.4/0017.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/4.4/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10126/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10207/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10503/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10639/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11190/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/4.4/0004.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11599/^4.9/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11815/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12614/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12818/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13272/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13648/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14284/4.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14615/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14814/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14895/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14901/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15211/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15214/4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15215/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15217/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15218/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15219/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15220/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15221/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14763/^4.16.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15292/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15505/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15666/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16234/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16413/4.4/0005.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/4.4/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17053/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17054/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17055/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17056/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17075/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17133/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17351/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17666/4.4/0006.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18282/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18680/4.4-^4.4.195/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18683/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18806/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19049/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19052/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19056/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19057/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19062/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19063/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19227/4.4/0006.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0017.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0018.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0019.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0020.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19332/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19447/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19525/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/4.4/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/4.4/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19530/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19531/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19532/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19533/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19534/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19535/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19536/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19537/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19815/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/4.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0006.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.4/0002.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0007.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0004.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.4/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0019.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0020.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0021.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10720/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10769/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10942/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11609/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11668/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12652/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12653/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12654/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12769/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14305/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch
-editKernelLocalversion "-dos.p287"
+editKernelLocalversion "-dos.p48"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 6d4a4cf3..403249e0 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -90,8 +90,8 @@ buildAll() {
 	buildDevice sailfish verity;
 	#SD835
 	buildDevice cheryl;
-	#buildDevice cheeseburger verity; #still in bringup, see op8998-ten topic
-	#buildDevice dumpling verity;
+	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile + needs 260722 applied in oneplus/msm8998-common
+	buildDevice dumpling verity;
 	buildDevice mata verity;
 	buildDevice taimen avb;
 	buildDevice walleye avb;
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index fa10bd3c..5be5c43e 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -143,6 +143,7 @@ sed -i 's/if (isFullDiskEncrypted()) {/if (false) {/' src/com/android/settings/a
 if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/backup/PrivacySettingsUtils.java; fi; #microG doesn't support Backup, hide the options
 
 enterAndClear "packages/apps/SetupWizard";
+git revert --no-edit fc026fcadc2f02bdb3319644ab91e37e35f5539c; #hold off on Seedvault for now
 patch -p1 < "$DOS_PATCHES/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch"; #Remove analytics
 
 enterAndClear "packages/apps/Trebuchet";
@@ -179,6 +180,7 @@ patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --direct
 awk -i inplace '!/true cannot be used in user builds/' Android.mk; #Allow ignoring neverallows under -user
 
 enterAndClear "vendor/lineage";
+git revert --no-edit f16956ab7a08c4ff79892bc2ce90dd7ac2976a38; #hold off on Seedvault for now
 rm build/target/product/security/lineage.x509.pem;
 rm -rf overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml; #Remove analytics
 rm -rf overlay/common/frameworks/base/core/res/res/drawable-*/default_wallpaper.png;
@@ -206,10 +208,8 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All
 #
 #START OF DEVICE CHANGES
 #
-enterAndClear "device/asus/flo";
+enterAndClear "device/asus/flox";
 rm -rf bdAddrLoader; #duplicate with mako
-sed -i 's/flox/flo/' BoardConfig.mk;
-#smallerSystem;
 
 #enterAndClear "device/cyanogen/msm8916-common";
 #awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools
diff --git a/Scripts/LineageOS-17.1/Rebrand.sh b/Scripts/LineageOS-17.1/Rebrand.sh
index 9c27f77c..01c7c948 100644
--- a/Scripts/LineageOS-17.1/Rebrand.sh
+++ b/Scripts/LineageOS-17.1/Rebrand.sh
@@ -43,6 +43,9 @@ sed -i '/.*lineage_updates/s/LineageOS/'"$DOS_BRANDING_NAME"'/' lineage/res/res/
 sed -i '/.*lineageos_system_label/s/LineageOS/'"$DOS_BRANDING_NAME"'/' lineage/res/res/values*/strings.xml;
 
 enter "packages/apps/LineageParts";
+sed -i '/.*egg_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*lineageparts_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*privacy_settings_category/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 sed -i '/.*trust_feature_security_patches_explain/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 
 enter "packages/apps/Settings";
@@ -50,8 +53,10 @@ sed -i '/.*lineagelicense_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*
 
 enter "packages/apps/SetupWizard";
 sed -i 's|http://lineageos.org/legal|'"$DOS_BRANDING_LINK_PRIVACY"'|' src/org/lineageos/setupwizard/LineageSettingsActivity.java;
+sed -i '/.*intro_restore/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*os_name/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
+sed -i '/.*services/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/strings.xml;
 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;
 
 enter "packages/apps/Updater";
 sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;