diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 0f5f5320..23e42e41 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -80,7 +80,12 @@
 	<project path="packages/apps/GmsCore" name="microg/android_packages_apps_GmsCore" remote="github" revision="master" />
 	<project path="packages/apps/GsfProxy" name="microg/android_packages_apps_GsfProxy" remote="github" revision="master" />
 	<project path="packages/apps/FakeStore" name="microg/android_packages_apps_FakeStore" remote="github" revision="master" />
+
+	<!-- UnifiedNLP Backends -->
+	<project path="packages/apps/AppleWifiNlpBackend" name="microg/AppleWifiNlpBackend" remote="github" revision="master" />
 	<project path="packages/apps/IchnaeaNlpBackend" name="microg/IchnaeaNlpBackend" remote="github" revision="master" />
+	<project path="packages/apps/LocalGsmNlpBackend" name="n76/Local-GSM-Backend" remote="github" revision="master" />
+	<project path="packages/apps/LocalWifiNlpBackend" name="n76/wifi_backend" remote="github" revision="master" />
 	<project path="packages/apps/NominatimGeocoderBackend" name="microg/NominatimGeocoderBackend" remote="github" revision="master" />
 
 	<!-- F-Droid -->
@@ -91,10 +96,6 @@
 	<!-- Misc -->
 	<project path="packages/apps/offline-calendar" name="SufficientlySecure/offline-calendar" remote="github" revision="master" />
 	<project path="packages/apps/Silence" name="SilenceIM/Silence" remote="github" revision="master" />
-
-	<!-- Mesa3D -->
-	<remove-project name="platform/external/mesa3d" />
-	<project path="external/mesa3d" name="mesa3d/mesa" remote="github" revision="17.2" />
 <!-- END OF ADDITIONAL REPOS -->
 
 
diff --git a/Scripts/LAOS-14.1_Optimize.sh b/Scripts/LAOS-14.1_Optimize.sh
index a4c73202..579dea8e 100644
--- a/Scripts/LAOS-14.1_Optimize.sh
+++ b/Scripts/LAOS-14.1_Optimize.sh
@@ -15,11 +15,11 @@ sed -i 's|config_wifi_fast_bss_transition_enabled">false|config_wifi_fast_bss_tr
 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_buttonLightOnKeypressOnly">false|config_buttonLightOnKeypressOnly">true|' core/res/res/values/config.xml;
+#sed -i 's|config_buttonLightOnKeypressOnly">false|config_buttonLightOnKeypressOnly">true|' 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;
-sed -i 's|config_showTemperatureWarning">0|config_showTemperatureWarning">1|' packages/SystemUI/res/values/config.xml;
+sed -i 's|config_showTemperatureWarning">0|config_showTemperatureWarning">1|' packages/SystemUI/res/values/config.xml; #XXX: Doesn't seem to work?
 #sed -i 's|||' 
 
 cd $base
diff --git a/Scripts/LAOS-14.1_Rebrand.sh b/Scripts/LAOS-14.1_Rebrand.sh
index d501c898..4a952bf4 100644
--- a/Scripts/LAOS-14.1_Rebrand.sh
+++ b/Scripts/LAOS-14.1_Rebrand.sh
@@ -25,7 +25,7 @@ cd $base"packages/apps/Updater"
 sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml
 
 cd $base"vendor/cm"
-sed -i 's|http://lineageos.org/legal|https://divestos.xyz/pages/about.html|' config/common.mk;
+sed -i 's|https://lineageos.org/legal|https://divestos.xyz/pages/about.html|' config/common.mk;
 #sed -i '/.*ZIPFILE=/s/lineage/divestos/' build/envsetup.sh
 rm -rf bootanimation #TODO: Create a boot animation
 
diff --git a/Scripts/LAOS-14.1_Theme.sh b/Scripts/LAOS-14.1_Theme.sh
index 4ae84677..b6cd5eb3 100644
--- a/Scripts/LAOS-14.1_Theme.sh
+++ b/Scripts/LAOS-14.1_Theme.sh
@@ -7,12 +7,19 @@ base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/"
 
 echo "Applying theme..."
 
-export themeOverride50="FFCA28"
-export themeOverride100="FFC107"
-export themeOverride200="FFA726"
-export themeOverride300="FF9800"
-export themeOverride500="FF5722"
-export themeOverride700="E64A19"
+export themeOverride50="FFCA28" #Amber 400
+export themeOverride100="FFC107" #Amber 500
+export themeOverride200="FFA726" #Orange 400
+export themeOverride300="FF9800" #Orange 500
+export themeOverride500="FF5722" #Deep Orange 500
+export themeOverride700="E64A19" #Deep Orange 700
+
+#export themeOverride50="26C6DA" #Cyan 400
+#export themeOverride100="00BCD4" #Cyan 500
+#export themeOverride200="29B6F6" #Light Blue 400
+#export themeOverride300="03A9F4" #Light Blue 500
+#export themeOverride500="2196F3" #Blue 500
+#export themeOverride700="1976D2" #Blue 700
 
 cd $base"frameworks/base"
 sed -i "s/#ffe0f2f1/#ff$themeOverride50/" core/res/res/values/colors_material.xml
@@ -21,6 +28,7 @@ sed -i "s/#ff80cbc4/#ff$themeOverride200/" core/res/res/values/colors_material.x
 sed -i "s/#ff4db6ac/#ff$themeOverride300/" core/res/res/values/colors_material.xml
 sed -i "s/#ff009688/#ff$themeOverride500/" core/res/res/values/colors_material.xml
 sed -i "s/#ff00796b/#ff$themeOverride700/" core/res/res/values/colors_material.xml
+sed -i "s/#fff4511e/#ffe53935/" core/res/res/values/colors.xml
 
 cd $base"packages/apps/CMParts"
 sed -i "s/#ff009688/#ff$themeOverride500/" res/values/colors.xml