diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index 94d93668..2a3618af 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -63,6 +63,7 @@ commentPatches android_kernel_nextbit_msm8992.sh "CVE-2018-3585/3.10/0001.patch"
 commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch" "CVE-2018-9514";
 commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166";
 commentPatches android_kernel_oneplus_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-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166";
+commentPatches android_kernel_oneplus_sm7250.sh "CVE-2018-5873" "CVE-2020-1749";
 commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992";
 commentPatches android_kernel_razer_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-14070/ANY/0005.patch" "CVE-2020-16166";
 commentPatches android_kernel_samsung_smdk4412.sh "CVE-2012-2127" "CVE-2016-8463/ANY/0001.patch";
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
index f05adaa0..1f8d718f 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
@@ -11,7 +11,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.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-2018-5873/ANY/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5873/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20669/4.19/0003.patch
@@ -128,7 +128,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0432/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.19/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.19/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.19/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-7053/4.19/0003.patch
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index f2ab9932..aff8b3e8 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -68,7 +68,6 @@ buildAll() {
 	buildDevice d802;
 	#SD801
 	buildDevice bacon;
-	buildDevice d855;
 	buildDevice klte;
 	buildDevice m8;
 	#SD805
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index cd7b14c2..fa559070 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -225,8 +225,8 @@ enterAndClear "device/asus/flox";
 compressRamdisks;
 rm -rf bdAddrLoader; #duplicate with mako
 
-#enterAndClear "device/essential/mata";
-#git revert --no-edit 3928b30a97fe7f6b6020bbd9d83a56a32de4ba16 #e91f0fece65d32ca407be532e2c4456056b1a968; #Unbreak the earpiece speaker, breaking the loud speaker volume control on calls #XXX 18REBASE
+enterAndClear "device/essential/mata";
+git revert --no-edit 3928b30a97fe7f6b6020bbd9d83a56a32de4ba16 e91f0fece65d32ca407be532e2c4456056b1a968; #Unbreak the earpiece speaker, breaking the loud speaker volume control on calls
 
 enterAndClear "device/fxtec/pro1";
 enableVerity; #Resurrect dm-verity
diff --git a/Scripts/LineageOS-18.1/Rebrand.sh b/Scripts/LineageOS-18.1/Rebrand.sh
index 5f2b14f6..83045dae 100644
--- a/Scripts/LineageOS-18.1/Rebrand.sh
+++ b/Scripts/LineageOS-18.1/Rebrand.sh
@@ -69,6 +69,7 @@ enter "packages/apps/Updater";
 sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;
 sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineageos/updater/misc/Utils.java;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
+sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml;
 
 enter "vendor/lineage";
 sed -i 's|https://lineageos.org/legal|'"$DOS_BRANDING_LINK_ABOUT"'|' build/core/main_version.mk