diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh
index 9a260ec9..041d89b2 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh
@@ -46,11 +46,10 @@ git apply $cvePatches/CVE-2017-11059/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-13080/ANY/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
index 11d5b17f..b3b3862e 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
@@ -7,14 +7,14 @@ git apply $cvePatches/CVE-2016-8394/ANY/0001.patch
 git apply $cvePatches/CVE-2016-8481/ANY/0003.patch
 git apply $cvePatches/CVE-2017-0648/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh
index 1555ccf7..311274bb 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh
@@ -4,12 +4,11 @@ git apply $cvePatches/CVE-2016-0801/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0430/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0786/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16525/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16525/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh
index 1a48e326..1fac4c83 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh
@@ -64,16 +64,16 @@ git apply $cvePatches/CVE-2017-11057/ANY/0001.patch
 git apply $cvePatches/CVE-2017-11067/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12146/3.16+/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16525/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16530/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16525/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16530/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16646/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh
index e6aa6761..70799007 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh
@@ -16,11 +16,10 @@ git apply $cvePatches/CVE-2017-0786/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-13080/ANY/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh
index b2cdf1fd..24c202e0 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh
@@ -21,14 +21,14 @@ git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch
 git apply $cvePatches/CVE-2017-10996/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh
index 29d171eb..f6548325 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh
@@ -11,11 +11,10 @@ git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0786/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
index 03b45c47..b3dc6253 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
@@ -97,14 +97,14 @@ git apply $cvePatches/CVE-2017-11056/ANY/0001.patch
 git apply $cvePatches/CVE-2017-11059/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh
index 3c00f027..087bd6e4 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh
@@ -58,14 +58,14 @@ git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch
 git apply $cvePatches/CVE-2017-11024/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh
index 82d04db2..d04cb552 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh
@@ -52,14 +52,14 @@ git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch
 git apply $cvePatches/CVE-2017-11024/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh
index 537e63a5..e0f34a09 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh
@@ -13,11 +13,10 @@ git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0751/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0786/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh
index 7fd994a6..44de9a08 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh
@@ -4,11 +4,10 @@ git apply $cvePatches/CVE-2013-4738/ANY/0002.patch
 git apply $cvePatches/CVE-2016-3857/ANY/0001.patch
 git apply $cvePatches/CVE-2016-3894/ANY/0001.patch
 git apply $cvePatches/CVE-2016-9793/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh
index 9b6090d8..619b5dc9 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -53,14 +53,14 @@ git apply $cvePatches/CVE-2017-1000365/3.10/0001.patch
 git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch
 git apply $cvePatches/CVE-2017-11024/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
index dfcaab59..f57bd4b4 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
@@ -32,14 +32,14 @@ git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatches/CVE-2017-11024/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index a52ca09b..400c6d2d 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
@@ -70,14 +70,14 @@ git apply $cvePatches/CVE-2017-11056/ANY/0001.patch
 git apply $cvePatches/CVE-2017-11059/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
index 566d4662..93bcc989 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
@@ -7,14 +7,14 @@ git apply $cvePatches/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0648/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh
index 7ff12e36..f5bbbad2 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh
@@ -21,11 +21,11 @@ git apply $cvePatches/CVE-2017-11059/ANY/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-13080/ANY/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16525/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16525/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh
index e5483fd2..3a66564d 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh
@@ -26,12 +26,11 @@ git apply $cvePatches/CVE-2017-0791/ANY/0001.patch
 git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch
 git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16525/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16525/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh
index bef8a9e0..61274f72 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh
@@ -4,12 +4,11 @@ git apply $cvePatches/CVE-2016-2475/ANY/0001.patch
 git apply $cvePatches/CVE-2016-4578/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0611/3.4/0001.patch
 git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16525/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16525/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
index 47d9dff2..11605556 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
@@ -25,10 +25,9 @@ git apply $cvePatches/CVE-2017-0706/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0786/ANY/0001.patch
 git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch
 git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch
 git apply $cvePatches/CVE-2017-6074/^4.9/0001.patch
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 0d2b0082..522c11d9 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
@@ -59,17 +59,17 @@ git apply $cvePatches/CVE-2017-0749/ANY/0001.patch
 git apply $cvePatches/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch
 git apply $cvePatches/CVE-2017-10996/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16525/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16526/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16529/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16530/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16531/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16532/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16533/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16535/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0001.patch
-git apply $cvePatches/CVE-2017-16538/ANY/0002.patch
-git apply $cvePatches/CVE-2017-16643/ANY/0001.patch
+git apply $cvePatches/CVE-2017-16525/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16529/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16530/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16531/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16535/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0001.patch
+git apply $cvePatches/CVE-2017-16538/^4.13/0002.patch
+git apply $cvePatches/CVE-2017-16643/3.5+/0001.patch
 git apply $cvePatches/CVE-2017-16645/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16646/ANY/0001.patch
 git apply $cvePatches/CVE-2017-16650/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index d137d0e6..6bd07c65 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -92,14 +92,18 @@ enhanceLocation() {
 export -f enhanceLocation;
 
 enableZram() {
-	sed -i 's|#/dev/block/zram0|/dev/block/zram0|' fstab.* rootdir/fstab.* rootdir/etc/fstab.* || true;
-	echo "Enabled zram";
+	cd $base$1;
+	sed -i 's|#/dev/block/zram0|/dev/block/zram0|' fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true;
+	echo "Enabled zram for $1";
+	cd $base;
 }
 
 enabledForcedEncryption() {
 	cd $base$1;
-	sed -i 's|encryptable=/|forceencrypt=/|' fstab.* rootdir/fstab.* rootdir/etc/fstab.* || true;
-	echo "Enabled forceencrypt for $1";
+	if [[ $1 != *"mako"* ]]; then
+		sed -i 's|encryptable=/|forceencrypt=/|' fstab.* rootdir/fstab.* rootdir/etc/fstab.* &>/dev/null || true;
+		echo "Enabled forceencrypt for $1";
+	fi;
 	cd $base;
 }
 export -f enabledForcedEncryption;
@@ -111,7 +115,7 @@ export -f enabledForcedEncryption;
 #START OF ROM CHANGES
 #
 enter "build"
-patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing
+patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing. Disclaimer: From CopperheadOS 13.0
 sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence
 
 enter "device/qcom/sepolicy"
@@ -198,14 +202,14 @@ enter "packages/inputmethods/LatinIME"
 patch -p1 < $patches"android_packages_inputmethods_LatinIME/0001-Voice.patch" #Remove voice input key
 
 enter "packages/services/Telephony"
-patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #LTE only preferred network mode choice Disclaimer: From Copperhead before their LICENSE was added
+patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #LTE only preferred network mode choice. Disclaimer: From CopperheadOS before their LICENSE was added
 
 enter "system/core"
 cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file
-patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid
+patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid. Disclaimer: From CopperheadOS 13.0
 
 enter "system/vold"
-#THESE OPTIONS MUST *NOT* BE CHANGED AFTER RELEASE!
+#XXX: THESE VALUES MUST *NOT* EVER BE CHANGED AFTER RELEASE!
 #sed -i 's|define HASH_COUNT 2000|define HASH_COUNT 6000|' cryptfs.c; #Increase pbkdf iterations
 #sed -i 's|define KEY_LEN_BYTES 16|define KEY_LEN_BYTES 32|' cryptfs.c; #128-bit -> 256-bit
 #sed -i 's|define IV_LEN_BYTES 16|define IV_LEN_BYTES 32|' cryptfs.c;
@@ -258,7 +262,7 @@ patch -p1 < $patches"android_kernel_motorola_msm8916/0001-Overclock.patch" #1.36
 #Make changes to all devices
 cd $base
 find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
-#find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enabledForcedEncryption "$0"' {} \;
+find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enabledForcedEncryption "$0"' {} \;
 cd $base
 #
 #END OF DEVICE CHANGES