diff --git a/Patches/Linux b/Patches/Linux
index d9fa5dc6..16ec8d20 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit d9fa5dc6bdf3b2f579fc23f6a215b6e0b7f630df
+Subproject commit 16ec8d20797637ccca01001fe907b8a168102368
diff --git a/Scripts/LineageOS-14.1/Optimize.sh b/Scripts/LineageOS-14.1/Optimize.sh
index d4386375..8b8cae3c 100644
--- a/Scripts/LineageOS-14.1/Optimize.sh
+++ b/Scripts/LineageOS-14.1/Optimize.sh
@@ -26,8 +26,8 @@ sed -i 's|config_useVolumeKeySounds">true|config_useVolumeKeySounds">false|' cor
 sed -i 's|config_radioScanningTimeout">0|config_radioScanningTimeout">300000|' core/res/res/values/config.xml;
 sed -i 's|config_wifi_fast_bss_transition_enabled">false|config_wifi_fast_bss_transition_enabled">true|' core/res/res/values/config.xml;
 sed -i 's|config_wifi_enable_wifi_firmware_debugging">true|config_wifi_enable_wifi_firmware_debugging">false|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_supplicant_scan_interval">15000|config_wifi_supplicant_scan_interval">120000|' core/res/res/values/config.xml;
-sed -i 's|config_autoBrightnessLightSensorRate">250|config_autoBrightnessLightSensorRate">1000|' core/res/res/values/config.xml;
+sed -i 's|config_wifi_supplicant_scan_interval">15000|config_wifi_supplicant_scan_interval">30000|' core/res/res/values/config.xml;
+#sed -i 's|config_autoBrightnessLightSensorRate">250|config_autoBrightnessLightSensorRate">1000|' core/res/res/values/config.xml;
 sed -i 's|config_recents_use_hardware_layers">false|config_recents_use_hardware_layers">true|' packages/SystemUI/res/values/config.xml;
 #sed -i 's|config_recents_fake_shadows">false|config_recents_fake_shadows">true|' packages/SystemUI/res/values/config.xml;
 sed -i 's|config_notifications_round_rect_clipping">true|config_notifications_round_rect_clipping">false|' packages/SystemUI/res/values/config.xml;
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index 4c8060cc..fe311de6 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
@@ -65,7 +65,7 @@ git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2018-3585/3.10/0001.patch
+#git apply $cvePatchesLinux/CVE-2018-3585/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index fcb12c73..43386dde 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -53,7 +53,7 @@ buildAll() {
 	brunch lineage_d852-user;
 	brunch lineage_bacon-user;
 	brunch lineage_mako-user;
-	#brunch lineage_clark-user; #requires blobs from https://androidfilehost.com/?w=files&flid=244563 and also broken
+	#brunch lineage_clark-user; #requires blobs from https://androidfilehost.com/?w=files&flid=244563 and permissive and broken
 	brunch lineage_angler-user;
 	brunch lineage_bullhead-user;
 	brunch lineage_d802-user;
@@ -77,9 +77,10 @@ patchWorkspace() {
 	source build/envsetup.sh;
 	repopick -f 206123; #bionic: Sort and cache hosts file data for fast lookup
 	repopick -f 215174; #CallLogDatabase: Bump the version and try to re-run the version 5 upgrade path
-	repopick -f 214824 215010; #g3-common
+	repopick -f 214824 209584 209585 215010 214300; #g3-common
 	repopick -f 211404 211405 211406 211407 211408 211409; #d852
 	repopick -f 211396 214817; #d855
+	repopick -f 216410; #Revert "lineage-sdk: Switch back to AOSP TwilightService"
 	#repopick -t trust_interface;
 
 	source $scripts/Patch.sh;
diff --git a/Scripts/LineageOS-15.1/Optimize.sh b/Scripts/LineageOS-15.1/Optimize.sh
index 90b3bb26..dce9bf2b 100644
--- a/Scripts/LineageOS-15.1/Optimize.sh
+++ b/Scripts/LineageOS-15.1/Optimize.sh
@@ -26,8 +26,8 @@ sed -i 's|config_useVolumeKeySounds">true|config_useVolumeKeySounds">false|' cor
 sed -i 's|config_radioScanningTimeout">0|config_radioScanningTimeout">300000|' core/res/res/values/config.xml;
 sed -i 's|config_wifi_fast_bss_transition_enabled">false|config_wifi_fast_bss_transition_enabled">true|' core/res/res/values/config.xml;
 sed -i 's|config_wifi_enable_wifi_firmware_debugging">true|config_wifi_enable_wifi_firmware_debugging">false|' core/res/res/values/config.xml;
-sed -i 's|config_wifi_supplicant_scan_interval">15000|config_wifi_supplicant_scan_interval">120000|' core/res/res/values/config.xml;
-sed -i 's|config_autoBrightnessLightSensorRate">250|config_autoBrightnessLightSensorRate">1000|' core/res/res/values/config.xml;
+sed -i 's|config_wifi_supplicant_scan_interval">15000|config_wifi_supplicant_scan_interval">30000|' core/res/res/values/config.xml;
+#sed -i 's|config_autoBrightnessLightSensorRate">250|config_autoBrightnessLightSensorRate">1000|' core/res/res/values/config.xml;
 sed -i 's|config_recents_use_hardware_layers">false|config_recents_use_hardware_layers">true|' packages/SystemUI/res/values/config.xml;
 #sed -i 's|config_recents_fake_shadows">false|config_recents_fake_shadows">true|' packages/SystemUI/res/values/config.xml;
 sed -i 's|config_notifications_round_rect_clipping">true|config_notifications_round_rect_clipping">false|' packages/SystemUI/res/values/config.xml;
diff --git a/TODO b/TODO
index 5c20ef7b..389702ed 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-Last updated: 2018-05-23
+Last updated: 2018-05-24
 
 High Priority (Release blockers)
 	Build
@@ -15,6 +15,7 @@ High Priority (Release blockers)
 		- 2x Mirror slaves on an OVH VPS (SSD2: 2x$7.80 = $15.60/mo)
 		- 1x Mirror slave on a 1/10Gbps server for high-speed incrementals
 	Website
+		- mod_removeip for GDPR and update Privacy Policy
 		- Update cryptocurrency addresses
 
 Medium Priority
@@ -28,7 +29,6 @@ Medium Priority
 		- Various other branding (bootanimation, setupwizard, etc.)
 	Project
 		- Create various XMPP conference rooms
-		- Investigate GDPR compliance
 	Servers
 		- Dedicated build servers
 		- Ejabberd on an OVH VPS (SSD1: $4.50/mo)