diff --git a/Patches/Linux b/Patches/Linux
index f527078f..8085436b 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit f527078fb1ff757c8d2c6b9d4fdf99e534c69cb9
+Subproject commit 8085436b31948308b0edb88d4a30dfd76c36a4e0
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
index eb2d884b..5e22270e 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
@@ -612,8 +612,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -627,6 +627,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
@@ -636,5 +637,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
-editKernelLocalversion "-dos.p636"
+editKernelLocalversion "-dos.p637"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh
index 55bc695f..33649fad 100644
--- a/Scripts/LineageOS-14.1/Rebrand.sh
+++ b/Scripts/LineageOS-14.1/Rebrand.sh
@@ -63,6 +63,7 @@ fi;
 if enter "vendor/cm"; then
 sed -i 's|https://lineageos.org/legal|'"$DOS_BRANDING_LINK_ABOUT"'|' config/common.mk;
 sed -i '/.*ZIPPATH=/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/envsetup.sh;
+sed -i '/.*config_mms_user_agent/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' overlay/common/frameworks/base/core/res/res/values*/config.xml
 rm -rf bootanimation;
 fi;
 
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
index d8da9c00..855e966a 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
@@ -568,8 +568,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
index 1ef4b45e..d0b53e8c 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@@ -461,8 +461,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -479,9 +479,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
-editKernelLocalversion "-dos.p483"
+editKernelLocalversion "-dos.p484"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
index 7c544f24..7de9b3e2 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
@@ -555,8 +555,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -570,11 +570,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
-editKernelLocalversion "-dos.p576"
+editKernelLocalversion "-dos.p577"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh
index 10d3565d..2769bfaf 100644
--- a/Scripts/LineageOS-15.1/Rebrand.sh
+++ b/Scripts/LineageOS-15.1/Rebrand.sh
@@ -75,6 +75,7 @@ if enter "vendor/lineage"; then
 sed -i 's|https://lineageos.org/legal|'"$DOS_BRANDING_LINK_ABOUT"'|' build/core/main_version.mk
 sed -i '/.*ZIPPATH=/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/envsetup.sh;
 sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/tasks/bacon.mk;
+sed -i '/.*config_mms_user_agent/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' overlay/common/frameworks/base/core/res/res/values*/config.xml
 rm -rf bootanimation;
 fi;
 
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh
index 1e883b59..17ebd531 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh
@@ -307,8 +307,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -326,10 +326,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
-editKernelLocalversion "-dos.p331"
+editKernelLocalversion "-dos.p332"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
index b2d62f64..c311777a 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
@@ -318,9 +318,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.9/0005.patch
-editKernelLocalversion "-dos.p322"
+editKernelLocalversion "-dos.p323"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh
index 3185a4e8..b1273d7d 100644
--- a/Scripts/LineageOS-16.0/Rebrand.sh
+++ b/Scripts/LineageOS-16.0/Rebrand.sh
@@ -75,6 +75,7 @@ if enter "vendor/lineage"; then
 sed -i 's|https://lineageos.org/legal|'"$DOS_BRANDING_LINK_ABOUT"'|' build/core/main_version.mk
 sed -i '/.*ZIPPATH=/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/envsetup.sh;
 sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/tasks/bacon.mk;
+sed -i '/.*config_mms_user_agent/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' overlay/common/frameworks/base/core/res/res/values*/config.xml
 rm -rf bootanimation;
 fi;
 
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh
index be1ecc4a..da961dcb 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh
@@ -377,8 +377,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -396,6 +396,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
@@ -403,5 +404,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
-editKernelLocalversion "-dos.p403"
+editKernelLocalversion "-dos.p404"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
index 18083161..684973fa 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
@@ -289,9 +289,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.9/0005.patch
-editKernelLocalversion "-dos.p293"
+editKernelLocalversion "-dos.p294"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
index ca826f14..1c3079de 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
@@ -469,8 +469,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -488,10 +488,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15815/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
-editKernelLocalversion "-dos.p493"
+editKernelLocalversion "-dos.p494"
 cd "$DOS_BUILD_BASE"
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 70c9d8f3..839b7d50 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
@@ -328,6 +328,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.19/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35039/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch
@@ -338,6 +340,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.19/0003.patch
-editKernelLocalversion "-dos.p339"
+editKernelLocalversion "-dos.p340"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
index 974ba5a9..9947d50a 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@@ -393,10 +393,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
-editKernelLocalversion "-dos.p398"
+editKernelLocalversion "-dos.p399"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
index dc08a74b..9d023d57 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
@@ -264,9 +264,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.4/0004.patch
 editKernelLocalversion "-dos.p268"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
index 2eb2ad8e..14c35a36 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
@@ -269,10 +269,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.4/0004.patch
 editKernelLocalversion "-dos.p274"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 4434d570..13a651a9 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -89,9 +89,8 @@ patchWorkspace() {
 	umask 0022;
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
-	source build/envsetup.sh;
+	#source build/envsetup.sh;
 	#repopick -it ten-firewall;
-	repopick -it Q_asb_2021-08;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 1dded6c2..7f12b9cc 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -85,10 +85,6 @@ DOS_WEBVIEW_CHERRYPICK; #Update the WebView to latest if available
 fi;
 fi;
 
-if enterAndClear "external/sqlite"; then
-git pull "https://github.com/LineageOS/android_external_sqlite" refs/changes/13/314513/1; #Q_asb_2021-08
-fi;
-
 if enterAndClear "external/svox"; then
 git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
 sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie
@@ -236,10 +232,6 @@ if enterAndClear "system/extras"; then
 patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)
 fi;
 
-if enterAndClear "system/libhwbinder"; then
-git pull "https://github.com/LineageOS/android_system_libhwbinder" refs/changes/20/314520/1; #Q_asb_2021-08
-fi;
-
 if enterAndClear "system/sepolicy"; then
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/29.0";
diff --git a/Scripts/LineageOS-17.1/Rebrand.sh b/Scripts/LineageOS-17.1/Rebrand.sh
index 2de68f71..810aa6d6 100644
--- a/Scripts/LineageOS-17.1/Rebrand.sh
+++ b/Scripts/LineageOS-17.1/Rebrand.sh
@@ -82,6 +82,7 @@ if enter "vendor/lineage"; then
 sed -i 's|https://lineageos.org/legal|'"$DOS_BRANDING_LINK_ABOUT"'|' build/core/main_version.mk
 sed -i '/.*ZIPPATH=/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/envsetup.sh;
 sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/tasks/bacon.mk;
+sed -i '/.*config_mms_user_agent/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' overlay/common/frameworks/base/core/res/res/values*/config.xml
 rm -rf bootanimation;
 fi;
 
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
index e3f29339..b4bc5dce 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
@@ -249,9 +249,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.9/0005.patch
-editKernelLocalversion "-dos.p253"
+editKernelLocalversion "-dos.p254"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
index 5ac1f91f..78be2dce 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
@@ -140,7 +140,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.14/0002.patch
-editKernelLocalversion "-dos.p142"
+editKernelLocalversion "-dos.p143"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
index baef6ef3..978938be 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
@@ -96,7 +96,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1939/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0036.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0037.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0038.patch
@@ -151,7 +150,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.9/0005.patch
 editKernelLocalversion "-dos.p153"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
index 782be1de..5647b204 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
@@ -197,7 +197,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.4/0004.patch
 editKernelLocalversion "-dos.p199"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh
index 0ea78a24..02277eba 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@@ -449,8 +449,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -467,9 +467,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
-editKernelLocalversion "-dos.p471"
+editKernelLocalversion "-dos.p472"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
index 7eb76461..b5b1cd78 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
@@ -369,8 +369,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/qcacld-2.0/0003.patch --director
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch
@@ -388,10 +388,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
-editKernelLocalversion "-dos.p393"
+editKernelLocalversion "-dos.p394"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
index cac483c6..666dca09 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
@@ -209,8 +209,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.9/0005.patch
-editKernelLocalversion "-dos.p212"
+editKernelLocalversion "-dos.p213"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
index 9162617f..509e1b2f 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@@ -195,10 +195,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.14/0002.patch
-editKernelLocalversion "-dos.p200"
+editKernelLocalversion "-dos.p201"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
index 5e1d0c3a..937350b8 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
@@ -2,6 +2,7 @@
 cd "$DOS_BUILD_BASE""kernel/razer/sdm845"
 git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0276-0277.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0277-0278.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0278-0279.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.9/0025.patch
@@ -69,5 +70,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
-editKernelLocalversion "-dos.p69"
+editKernelLocalversion "-dos.p70"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
index d84e74bf..381a2293 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
@@ -2,6 +2,7 @@
 cd "$DOS_BUILD_BASE""kernel/xiaomi/sdm845"
 git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0276-0277.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0277-0278.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0278-0279.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.9/0025.patch
@@ -69,5 +70,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
-editKernelLocalversion "-dos.p69"
+editKernelLocalversion "-dos.p70"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index 870e9a24..49c44949 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -116,7 +116,7 @@ patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
 	#source build/envsetup.sh;
-	#repopick -it android-11.0.0_r40;
+	#repopick -i 314020; #systemui crash fix
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-18.1/Rebrand.sh b/Scripts/LineageOS-18.1/Rebrand.sh
index ed4aa56f..fa644982 100644
--- a/Scripts/LineageOS-18.1/Rebrand.sh
+++ b/Scripts/LineageOS-18.1/Rebrand.sh
@@ -83,6 +83,7 @@ if enter "vendor/lineage"; then
 sed -i 's|https://lineageos.org/legal|'"$DOS_BRANDING_LINK_ABOUT"'|' build/core/main_version.mk
 sed -i '/.*ZIPPATH=/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/envsetup.sh;
 sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' build/tasks/bacon.mk;
+sed -i '/.*config_mms_user_agent/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' overlay/common/frameworks/base/core/res/res/values*/config.xml
 rm -rf bootanimation;
 fi;