diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index d7b251a5..0f5f5320 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -21,7 +21,6 @@
 	<remove-project name="LineageOS/android_hardware_intel_img_psb_headers" />
 	<remove-project name="LineageOS/android_hardware_intel_img_psb_video" />
 	<remove-project name="LineageOS/android_hardware_ti_omap4xxx" />
-	<remove-project name="LineageOS/android_packages_apps_CMBugreport" />
 	<remove-project name="LineageOS/android_packages_apps_LockClock" />
 	<remove-project name="LineageOS/android_packages_apps_ManagedProvisioning" />
 	<remove-project name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />
@@ -39,7 +38,6 @@
 	<remove-project name="LineageOS/android_packages_screensavers_WebView" />
 	<remove-project name="LineageOS/android_packages_services_Car" />
 	<remove-project name="LineageOS/android_packages_services_WeatherService" />
-	<remove-project name="LineageOS/android_packages_themes_HexoLibre" />
 	<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />
 	<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" />
 	<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_x86_x86_64-linux-android-4.9" />
@@ -93,6 +91,10 @@
 	<!-- 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..0f30be22 100644
--- a/Scripts/LAOS-14.1_Optimize.sh
+++ b/Scripts/LAOS-14.1_Optimize.sh
@@ -3,6 +3,8 @@
 
 #Attempts to increase performance and battery life
 
+#TODO: Aggressive Doze (Easy), Lower screen resolutions (Hard)
+
 base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/"
 
 echo "Optimizing..."
diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh
index cf61a7b1..be23b4cd 100755
--- a/Scripts/LAOS-14.1_Patches.sh
+++ b/Scripts/LAOS-14.1_Patches.sh
@@ -21,7 +21,7 @@ base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/"
 patches="/mnt/Drive-1/Development/Other/Android_ROMs/Patches/LineageOS-14.1/"
 ANDROID_HOME="/home/$USER/Android/Sdk"
 
-#Download some out-of-tree files for use later on
+#Download some (non-executable) out-of-tree files for use later on
 mkdir /tmp/ar
 cd /tmp/ar
 wget https://spotco.us/hosts -N #XXX: /hosts is built from non-commercial use files, switch to /hsc for release