diff --git a/Manifests/Manifest_LAOS-18.1.xml b/Manifests/Manifest_LAOS-18.1.xml
index 3b837e18..a4510d47 100644
--- a/Manifests/Manifest_LAOS-18.1.xml
+++ b/Manifests/Manifest_LAOS-18.1.xml
@@ -67,7 +67,7 @@
 	<project path="system/qcom" name="LineageOS/android_system_qcom" remote="github" />
 	<project path="external/bson" name="LineageOS/android_external_bson" remote="github" />
 	<project path="external/sony/boringssl-compat" name="LineageOS/android_external_sony_boringssl-compat" remote="github" />
-	<!--<project path="hardware/sony/thermanager" name="LineageOS/android_hardware_sony_thermanager" remote="github" />-->
+	<project path="hardware/sony/thermanager" name="LineageOS/android_hardware_sony_thermanager" remote="github" />
 	<project path="hardware/sony/timekeep" name="LineageOS/android_hardware_sony_timekeep" remote="github" />
 
 	<!-- Essential PH-1 (mata) -->
@@ -164,6 +164,21 @@
 	<!-- OnePlus 5T (dumpling) -->
 	<project path="device/oneplus/dumpling" name="LineageOS/android_device_oneplus_dumpling" 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 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="kernel/oneplus/sm8150" name="LineageOS/android_kernel_oneplus_sm8150" remote="github" />
+
+
 	<!-- Razer Phone (cheryl) -->
 	<project path="device/razer/cheryl" name="LineageOS/android_device_razer_cheryl" remote="github" />
 	<project path="kernel/razer/msm8998" name="LineageOS/android_kernel_razer_msm8998" remote="github" />
diff --git a/Misc/aosp-cves/gen_cve_list-qc.sh b/Misc/aosp-cves/gen_cve_list-qc.sh
index d2c88bd9..b738b6fc 100644
--- a/Misc/aosp-cves/gen_cve_list-qc.sh
+++ b/Misc/aosp-cves/gen_cve_list-qc.sh
@@ -1,3 +1,4 @@
+java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/may-2021-bulletin" >> cve_list-qc.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/april-2021-bulletin" >> cve_list-qc.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/march-2021-bulletin" >> cve_list-qc.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://www.qualcomm.com/company/product-security/bulletins/february-2021-bulletin" >> cve_list-qc.txt
diff --git a/Misc/aosp-cves/gen_cve_list.sh b/Misc/aosp-cves/gen_cve_list.sh
index b13f439a..f0bf796d 100644
--- a/Misc/aosp-cves/gen_cve_list.sh
+++ b/Misc/aosp-cves/gen_cve_list.sh
@@ -1,8 +1,10 @@
+java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2021-05-01" >> cve_list.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2021-04-01" >> cve_list.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2021-03-01" >> cve_list.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2021-02-01" >> cve_list.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2021-01-01" >> cve_list.txt
 
+java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/pixel/2021-05-01" >> cve_list.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/pixel/2021-04-01" >> cve_list.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/pixel/2021-03-01" >> cve_list.txt
 java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/pixel/2021-02-01" >> cve_list.txt
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 7ceb6860..37682e1f 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -97,6 +97,7 @@ patchWorkspace() {
 	source build/envsetup.sh;
 	repopick -ift n_asb_09-2018-qcom; #TODO: move in tree
 	#repopick -it bt-sbc-hd-dualchannel-nougat;
+	repopick -it n-asb-2021-05;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index b360b2c7..8ab658d2 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -82,7 +82,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 O_asb_2021-05;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index e38d8429..e25c2a48 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -72,8 +72,9 @@ 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 pie-firewall;
+	repopick -it P_asb_2021-05;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 04654054..87658a30 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -98,8 +98,9 @@ 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";
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
new file mode 100644
index 00000000..014e2669
--- /dev/null
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
@@ -0,0 +1,193 @@
+#!/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-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-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-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.p189"
+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
new file mode 100644
index 00000000..8e13122c
--- /dev/null
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@@ -0,0 +1,167 @@
+#!/bin/bash
+cd "$DOS_BUILD_BASE""kernel/oneplus/sm8150"
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0201-0202.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0205-0206.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0207-0208.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0210-0211.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0059.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0060.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0061.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0062.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0063.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0064.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0065.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0066.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0067.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0068.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0069.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0070.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0071.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0072.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0073.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0074.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0075.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0076.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0077.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0078.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0079.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0080.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0081.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0083.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0085.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0086.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0087.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0088.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0089.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-0627/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18232/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.14/0004.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.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0148/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3874/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9444/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11191/^5.0.7/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-14034/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14099/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14104/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16921/^4.17/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18808/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19060/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.14/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.14/0004.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-14314/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15780/^5.7.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25220/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25641/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25670/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25704/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25705/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27170/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27171/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27777/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28374/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28941/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1927/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3348/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.14/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.14/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.14/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28688/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28971/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/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-27830/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
+editKernelLocalversion "-dos.p163"
+cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index a61c977b..26838db0 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2021-03-22
 
 patchAllKernels() {
-	startPatcher "kernel_essential_msm8998 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_xiaomi_sdm845";
+	startPatcher "kernel_essential_msm8998 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_xiaomi_sdm845";
 }
 export -f patchAllKernels;
 
@@ -86,7 +86,10 @@ buildAll() {
 	#SD845
 	buildDevice beryllium; #needs manual patching in vendor
 	buildDevice pro1 avb;
+	buildDevice enchilada avb;
+	buildDevice fajita avb;
 	#SD855
+	buildDevice guacamole avb;
 	buildDevice coral avb;
 	buildDevice flame avb;
 	#SD670
@@ -100,6 +103,7 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	repopick -i 300595; #system/netd: add missing override keyword
+	#repopick -it android-11.0.0_r37;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index ddc13026..1d2342dc 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -258,6 +258,9 @@ git revert --no-edit 0ba2cb240e8483fa85fcc831328f70f65eeb7180 2be3c88c331387f039
 enterAndClear "device/oneplus/msm8998-common";
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation
 
+enterAndClear "device/oneplus/sm8150-common";
+enableVerity; #Resurrect dm-verity
+
 enterAndClear "device/oppo/common";
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation