diff --git a/Patches/Linux b/Patches/Linux
index 5a5cc8aa..d9aad303 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 5a5cc8aa8edcd973eb33c671996d9cfb9e2d2b9b
+Subproject commit d9aad30345ea2d1911537746d370966a37a4289e
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index e93c78c4..981bbd39 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -117,7 +117,6 @@ patchWorkspace() {
 	source build/envsetup.sh;
 	repopick -it n_asb_09-2018-qcom;
 	repopick -it ibss-mode-nougat;
-	repopick -i 288970; #update webview
 	repopick -it n-asb-2020-10;
 	repopick -it tzdb2020b_N;
 
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 13ee5e36..d37de55b 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -107,9 +107,7 @@ 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;
-	repopick -i 288970; #update webview
-	repopick -it tzdb2020d_O;
+	#source build/envsetup.sh;
 
 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
 
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 47d0bd2d..9d7816ee 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -65,8 +65,6 @@ buildAll() {
 	buildDevice kipper;
 	#SD625
 	buildDevice zenfone3; #broken - ninja: error: 'android.hidl.base@1.0.so', missing and no known rule to make it
-	#SD845
-	buildDevice pro1 avb;
 	#Samsung
 	buildDeviceUserDebug i9100; #broken - many errors in hardware/samsung/exynos4
 	#Intel
@@ -115,6 +113,7 @@ buildAll() {
 		buildDevice blueline avb;
 		buildDevice enchilada avb;
 		buildDevice fajita avb;
+		buildDevice pro1 avb;
 		#SD855
 		buildDevice guacamole avb;
 		#SD660
@@ -134,8 +133,6 @@ patchWorkspace() {
 	source build/envsetup.sh;
 	repopick -it hh-p-sepolicy;
 	repopick -i 232948; #wahoo: liblight: close fd
-	repopick -i 288970; #update webview
-	repopick -it tzdb2020d_P;
 	#repopick -it CVE-2019-2306_P;
 
 	source "$DOS_SCRIPTS/Patch.sh";
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh
index 45dd3604..ff4ad7c0 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh
@@ -89,7 +89,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch
@@ -97,5 +96,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch
-editKernelLocalversion "-dos.p97"
+editKernelLocalversion "-dos.p96"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
index c4511850..0a3e359e 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -150,7 +150,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/^5.6.13/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-14386/3.10-^4.4/0002.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/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
@@ -158,5 +157,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p158"
+editKernelLocalversion "-dos.p157"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index b496c624..abdcbac5 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -56,7 +56,7 @@ buildAll() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
 	if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
 	#SDS4P
-	buildDevice flo; #still in bringup?
+	buildDevice flo; #still in bringup? + /system is too small (908853248 >= 880803840)
 	buildDevice mako;
 	#SD410
 	buildDevice crackling;
@@ -72,7 +72,7 @@ buildAll() {
 	buildDevice FP2;
 	buildDevice klte;
 	buildDevice m8;
-	buildDevice victara; #error: +out/target/product/victara/recovery.img too large (10522624 > 10485760)
+	buildDevice victara; #error: +out/target/product/victara/recovery.img too large (10522624 >= 10485760)
 	#SD805
 	buildDevice shamu verity;
 	#SD808
@@ -101,7 +101,7 @@ buildAll() {
 	buildDevice blueline avb;
 	buildDevice enchilada avb;
 	buildDevice fajita avb;
-	#buildDevice pro1 avb; #still in bringup, see pro1-ten-bringup topic
+	buildDevice pro1 avb;
 	#SD855
 	buildDevice guacamole avb;
 	buildDevice guacamoleb avb;
@@ -124,10 +124,7 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	repopick -i 287339; #releasetools: python3 fix
-	repopick -i 288970; #update webview
 	#repopick -it CVE-2019-2306;
-	repopick -it tzdb2020d_Q;
-	#repopick -i 290459;
 
 	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 2b4c0571..fa10bd3c 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -206,6 +206,11 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All
 #
 #START OF DEVICE CHANGES
 #
+enterAndClear "device/asus/flo";
+rm -rf bdAddrLoader; #duplicate with mako
+sed -i 's/flox/flo/' BoardConfig.mk;
+#smallerSystem;
+
 #enterAndClear "device/cyanogen/msm8916-common";
 #awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools