diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index dd72d7f8..55c2e7b0 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -103,12 +103,6 @@
 	<project path="device/google/sargo" name="LineageOS/android_device_google_sargo" remote="github" />
 	<!-- uses google/msm-4.9 kernel -->
 
-	<!-- HTC One (m8) -->
-	<project path="device/htc/m8" name="LineageOS/android_device_htc_m8" remote="github" />
-	<project path="device/htc/m8-common" name="LineageOS/android_device_htc_m8-common" remote="github" />
-	<project path="device/htc/msm8974-common" name="LineageOS/android_device_htc_msm8974-common" remote="github" />
-	<project path="kernel/htc/msm8974" name="LineageOS/android_kernel_htc_msm8974" remote="github" />
-
 	<!-- Moto G 3rd Gen (osprey)
 	<project path="device/motorola/msm8916-common" name="LineageOS/android_device_motorola_msm8916-common" remote="github" />
 	<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" />
@@ -139,21 +133,9 @@
 	<project path="device/oneplus/oneplus3" name="LineageOS/android_device_oneplus_oneplus3" remote="github" />
 	<project path="kernel/oneplus/msm8996" name="LineageOS/android_kernel_oneplus_msm8996" remote="github" />
 
-	<!-- OnePlus 6 (enchilada) -->
-	<project path="device/oneplus/common" name="LineageOS/android_device_oneplus_common" remote="github" />
-	<project path="device/oneplus/sdm845-common" name="LineageOS/android_device_oneplus_sdm845-common" remote="github" />
-	<project path="device/oneplus/enchilada" name="LineageOS/android_device_oneplus_enchilada" remote="github" />
-	<project path="kernel/oneplus/sdm845" name="LineageOS/android_kernel_oneplus_sdm845" remote="github" />
-
-	<!-- OnePlus 6T (fajita) -->
-	<project path="device/oneplus/fajita" name="LineageOS/android_device_oneplus_fajita" remote="github" />
-
 	<!-- OnePlus 7 (guacamoleb) -->
-	<project path="device/oneplus/guacamoleb" name="LineageOS/android_device_oneplus_guacamoleb" remote="github" />
-
-	<!-- OnePlus 7 Pro (guacamole) -->
 	<project path="device/oneplus/sm8150-common" name="LineageOS/android_device_oneplus_sm8150-common" remote="github" />
-	<project path="device/oneplus/guacamole" name="LineageOS/android_device_oneplus_guacamole" remote="github" />
+	<project path="device/oneplus/guacamoleb" name="LineageOS/android_device_oneplus_guacamoleb" remote="github" />
 	<project path="kernel/oneplus/sm8150" name="LineageOS/android_kernel_oneplus_sm8150" remote="github" />
 
 	<!-- OnePlus Nord (avicii) -->
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index 74495812..6c10818e 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -335,6 +335,7 @@ export -f addVerity;
 
 enableVerity() {
 	sed -i 's/--set_hashtree_disabled_flag//' *.mk;
+	sed -i 's/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2/' *.mk;
 	sed -i '/\/system/{/verify/!s|wait|wait,verify|}' fstab.* root/fstab.* rootdir/fstab.* rootdir/*/fstab.* &>/dev/null || true;
 }
 export -f enableVerity;
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh
deleted file mode 100644
index 8166b34f..00000000
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/htc/msm8974"
-git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/0005-AndroidHardening-Deny_USB/3.4/3.4-Backport.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3076/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3222/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3225/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3227/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3228/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4580/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4913/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5.2/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10318/^4.7.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0452/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0861/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7645/^4.10.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8266/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/^4.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/^4.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11039/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/^4.11.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/^4.12.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/^4.13.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12762/^4.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/^4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13215/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13216/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13245/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13305/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13695/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14106/^4.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14489/^4.13.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15115/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15649/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15850/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16529/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16531/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16534/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16535/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17769/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17807/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/^4.12.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18203/^4.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/^4.11.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000363/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/^4.16/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3561/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3564/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3586/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5332/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5344/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5803/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5896/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-6927/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/^4.15.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7757/^4.15.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/3.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9422/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9439/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9568/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12011/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13405/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13900/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13917/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13919/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14614/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/^4.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000204/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/^3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/^5.0.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10491/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10497/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10527/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10607/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10626/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10638/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15117/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15118/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15214/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/^5.0.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15239/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15505/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/^5.1.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17133/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18806/^5.3.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.4/0004.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-19532/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19537/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p267"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
deleted file mode 100644
index 1c8935d4..00000000
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/oneplus/sdm845"
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0239-0240.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch
-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
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0027.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0028.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0029.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0030.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0031.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0032.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0033.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0034.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0035.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0036.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0037.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0038.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0039.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0040.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0041.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0043.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0044.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0045.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0046.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0047.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0048.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0049.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0050.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0051.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0053.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0054.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0055.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0056.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0057.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch
-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-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7477/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch
-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-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-8043/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0145/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0148/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12455/^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-14104/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16921/^4.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18808/4.9/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.9/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19060/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.9/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.9/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3674/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0017.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0019.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0020.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0021.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.9/0022.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10766/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.9/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14305/4.9/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14356/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15436/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15437/4.9/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.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25220/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25641/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25670/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25705/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0017.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0018.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch
-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-29661/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35519/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1905/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1906/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.9/0005.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
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0039.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0040.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0041.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0042.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0043.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0044.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0017.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0021.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0022.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0023.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0024.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.9/0025.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.9/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.9/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.9/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28688/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28971/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-editKernelLocalversion "-dos.p193"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 87658a30..bc9ef800 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2020-04-14
 
 patchAllKernels() {
-	startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_sdm845 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996";
+	startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996";
 }
 export -f patchAllKernels;
 
@@ -59,7 +59,6 @@ buildAll() {
 	#buildDevice osprey; #needs manual patching + more - mkdir proprietary/priv-app && cp -r proprietary/system/priv-app/qcrilmsgtunnel proprietary/priv-app/
 	#SD801
 	buildDevice FP2;
-	buildDevice m8; #18.1 not ready
 	#SD808
 	buildDevice clark;
 	#SD810
@@ -76,10 +75,7 @@ buildAll() {
 	#SD845
 	buildDevice crosshatch avb;
 	buildDevice blueline avb;
-	buildDevice enchilada avb;
-	buildDevice fajita avb;
 	#SD855
-	buildDevice guacamole avb;
 	buildDevice guacamoleb avb;
 	#SD660
 	buildDevice Amber verity;
@@ -98,9 +94,8 @@ export -f buildAll;
 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;
+	#source build/envsetup.sh;
 	#repopick -it ten-firewall;
-	repopick -it Q_asb_2021-05;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
@@ -123,8 +118,7 @@ enableDexPreOpt() {
 	if [ -f BoardConfig.mk ]; then
 		echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
 		echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
-		#m8: /system partition too small
-		if [ "$1" != "device/htc/m8" ]; then
+		if true; then
 			echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk;
 			echo "Enabled full dexpreopt for $1";
 		else
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 57525f54..c22f50a9 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -243,9 +243,6 @@ enableVerity; #Resurrect dm-verity
 enterAndClear "device/google/marlin";
 git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carrier blobs
 
-enterAndClear "device/htc/m8-common";
-awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools
-
 enterAndClear "device/lge/mako";
 echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #broken releasetools
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index d51247ac..36d7a9c3 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -64,7 +64,7 @@ buildAll() {
 	buildDevice d852;
 	buildDevice d855;
 	buildDevice klte;
-	#buildDevice m8; #unb18
+	buildDevice m8; #unb18
 	buildDevice victara;
 	#SD805
 	buildDevice shamu verity;