diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index ee853e55..fb30ca6d 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -79,6 +79,9 @@
 	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
 	<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />
 	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
+
+	<remove-project name="platform/external/svox" />
+	<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
 <!-- END OF ADDITIONAL REPOS -->
 
 
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 3fafa6f7..41c16c8f 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -56,6 +56,7 @@ export -f buildAll;
 
 patchWorkspace() {
 	source build/envsetup.sh;
+	repopick -t n_asb_04-2018;
 
 	source $scripts/Patch.sh;
 	source $scripts/Defaults.sh;
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 68a4dcca..191ac3d7 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -96,7 +96,6 @@ awk -i inplace '!/\|\| context.getResources\(\).getBoolean\(/' service/java/com/
 awk -i inplace '!/com.android.internal.R.bool.config_permissionReviewRequired/' service/java/com/android/server/wifi/WifiServiceImpl.java;
 
 enterAndClear "packages/apps/CMParts"
-git revert 6b2ddeda7e3038011c4134dfd2eb791113833d3f #LOSCoins malware
 rm -rf src/org/cyanogenmod/cmparts/cmstats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml #Nuke part of CMStats
 sed -i 's|config_showWeatherMenu">true|config_showWeatherMenu">false|' res/values/config.xml; #Disable Weather
 patch -p1 < $patches"android_packages_apps_CMParts/0001-Remove_Analytics.patch" #Remove the rest of CMStats
@@ -170,7 +169,6 @@ enterAndClear "system/vold"
 patch -p1 < $patches"android_system_vold/0001-AES256.patch" #Add a variable for enabling AES-256 bit encryption
 
 enterAndClear "vendor/cm"
-git revert 3ef0d88b5d1688d80564c6592ba0d1980a1cd9ae #LOSCoins malware
 rm -rf overlay/common/vendor/cmsdk/packages #Remove analytics
 awk -i inplace '!/50-cm.sh/' config/common.mk; #Make sure our hosts is always used
 patch -p1 < $patches"android_vendor_cm/0001-SCE.patch" #Include our extras such as MicroG and F-Droid
@@ -198,6 +196,10 @@ sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod
 #XXX: If not used with a supported recovery, it'll be thrown into a bootloop, don't worry just 'fastboot erase misc' and reboot
 #echo "/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults" >> rootdir/etc/fstab.qcom; #Add the misc (mmcblk0p5) partition for recovery flags
 
+enterAndClear "device/motorola/clark"
+sed -i 's/0xA04D/0xA04D|0xA052/' board-info.txt; #Allow installing on Nougat bootloader, assume the user is running the correct modem
+rm board-info.txt; #Never restrict installation
+
 #Make changes to all devices
 cd $base
 find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index d7e7b49f..dcda4e51 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -33,9 +33,9 @@ export -f buildDevice;
 buildAll() {
 #Select devices are userdebug due to SELinux policy issues
 #TODO: Add victara, griffin, athene, us997, us996, pme, t0lte, hlte
-	brunch lineage_mako-user;
 	brunch lineage_d852-userdebug;
 	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_angler-user;
 	brunch lineage_bullhead-user;
@@ -54,7 +54,8 @@ export -f buildAll;
 
 patchWorkspace() {
 	source build/envsetup.sh;
-	repopick 205021 206123 209030 211232 211095; #Cherry picks
+	repopick 205021 206123 209030 211095; #Cherry picks
+	repopick 211404 211405 211406 211407 211408 211409; #d852 cherry picks
 	#repopick -t calendar-o;
 
 	source $scripts/Patch.sh;
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index a53d90d7..9054a41a 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -69,6 +69,9 @@ sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app w
 enterAndClear "device/qcom/sepolicy"
 patch -p1 < $patches"android_device_qcom_sepolicy/0001-Camera_Fix.patch" #Fix camera on -user builds
 
+enterAndClear "external/svox"
+git revert 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back makefiles
+
 enterAndClear "frameworks/base"
 #git revert https://review.lineageos.org/#/c/202875/ #re-enable doze on devices without gms
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox