diff --git a/Manifests/Manifest_AOSP-8.1.xml b/Manifests/Manifest_AOSP-8.1.xml
deleted file mode 100644
index 964c0726..00000000
--- a/Manifests/Manifest_AOSP-8.1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-<!-- START OF UNNECESSARY REPO REMOVAL -->
-	<remove-project name="platform/developers/demos" />
-	<remove-project name="platform/developers/samples/android" />
-	<remove-project name="device/google/accessory/arduino" />
-	<remove-project name="device/google/accessory/demokit" />
-	<remove-project name="device/sample" />
-	<remove-project name="platform/external/openssh" />
-	<remove-project name="platform/packages/apps/Browser2" />
-	<remove-project name="platform/packages/apps/Gallery" />
-	<remove-project name="platform/packages/apps/Gallery2" />
-	<remove-project name="platform/packages/apps/Music" />
-	<remove-project name="platform/packages/apps/Protips" />
-	<remove-project name="platform/packages/apps/SoundRecorder" />
-	<remove-project name="platform/packages/apps/Stk" />
-	<remove-project name="platform/packages/apps/Terminal" />
-	<remove-project name="platform/packages/screensavers/Basic" />
-	<remove-project name="platform/packages/screensavers/PhotoTable" />
-	<remove-project name="platform/packages/screensavers/WebView" />
-	<remove-project name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
-	<remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" />
-	<remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" />
-	<remove-project name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" />
-	<remove-project name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" />
-	<remove-project name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" />
-	<remove-project name="platform/prebuilts/gdb/darwin-x86" />
-	<remove-project name="platform/prebuilts/go/darwin-x86" />
-<!-- END OF UNNECESSARY REPO REMOVAL -->
-
-</manifest>
diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 3c3cee90..9445e3f3 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -3,6 +3,7 @@
 
 <!-- START OF UNNECESSARY REPO REMOVAL -->
 	<remove-project name="device/generic/goldfish" />
+	<remove-project name="device/generic/goldfish-opengl" />
 	<remove-project name="device/generic/mini-emulator-arm64" />
 	<remove-project name="device/generic/mini-emulator-armv7-a-neon" />
 	<remove-project name="device/generic/mini-emulator-x86" />
diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 988acad0..e39bf065 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -3,6 +3,7 @@
 
 <!-- START OF UNNECESSARY REPO REMOVAL -->
 	<remove-project name="device/generic/goldfish" />
+	<remove-project name="device/generic/goldfish-opengl" />
 	<remove-project name="device/generic/mini-emulator-arm64" />
 	<remove-project name="device/generic/mini-emulator-armv7-a-neon" />
 	<remove-project name="device/generic/mini-emulator-x86" />
diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml
new file mode 100644
index 00000000..4e0a3600
--- /dev/null
+++ b/Manifests/Manifest_LAOS-16.0.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+<!-- START OF UNNECESSARY REPO REMOVAL -->
+	<remove-project name="device/generic/goldfish-opengl" />
+	<remove-project name="device/generic/mini-emulator-arm64" />
+	<remove-project name="device/generic/mini-emulator-armv7-a-neon" />
+	<remove-project name="device/generic/mini-emulator-x86" />
+	<remove-project name="device/generic/mini-emulator-x86_64" />
+	<remove-project name="device/generic/qemu" />
+	<remove-project name="device/sample" />
+	<remove-project name="LineageOS/android_device_generic_goldfish" />
+	<remove-project name="LineageOS/android_external_ant-wireless_ant_native" />
+	<remove-project name="LineageOS/android_external_ant-wireless_ant_service" />
+	<remove-project name="LineageOS/android_external_bash" />
+	<remove-project name="LineageOS/android_external_htop" />
+	<remove-project name="LineageOS/android_external_libncurses" />
+	<remove-project name="LineageOS/android_external_nano" />
+	<remove-project name="LineageOS/android_external_openssh" />
+	<remove-project name="LineageOS/android_external_p7zip" />
+	<remove-project name="LineageOS/android_external_rsync" />
+	<remove-project name="LineageOS/android_external_unrar" />
+	<remove-project name="LineageOS/android_external_vim" />
+	<remove-project name="LineageOS/android_packages_apps_Jelly" />
+	<remove-project name="LineageOS/android_packages_apps_LockClock" />
+	<remove-project name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />
+	<remove-project name="LineageOS/android_packages_apps_Stk" />
+	<remove-project name="LineageOS/android_packages_apps_Terminal" />
+	<remove-project name="LineageOS/android_packages_providers_PartnerBookmarksProvider" />
+	<remove-project name="LineageOS/android_packages_providers_WeatherProvider" />
+	<remove-project name="LineageOS/android_packages_screensavers_Basic" />
+	<remove-project name="LineageOS/android_packages_screensavers_PhotoTable" />
+	<remove-project name="LineageOS/android_packages_screensavers_WebView" />
+	<remove-project name="LineageOS/android_system_extras_su" />
+	<remove-project name="LineageOS/ansible" />
+	<remove-project name="LineageOS/charter" />
+	<remove-project name="LineageOS/cm_crowdin" />
+	<remove-project name="LineageOS/contributors-cloud-generator" />
+	<remove-project name="LineageOS/cve_tracker" />
+	<remove-project name="LineageOS/hudson" />
+	<remove-project name="LineageOS/lineage_wiki" />
+	<remove-project name="LineageOS/mirror" />
+	<remove-project name="LineageOS/scripts" />
+	<remove-project name="LineageOS/slackbot" />
+	<remove-project name="LineageOS/www" />
+	<remove-project name="platform/prebuilts/clang/host/darwin-x86" />
+	<remove-project name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
+	<remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" />
+	<remove-project name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" />
+	<remove-project name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" />
+	<remove-project name="platform/prebuilts/gdb/darwin-x86" />
+	<remove-project name="platform/prebuilts/go/darwin-x86" />
+	<remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
+<!-- END OF UNNECESSARY REPO REMOVAL -->
+
+<!-- START OF BRANCH SWITCHING -->
+	<remove-project name="platform/external/swiftshader" />
+	<project path="external/swiftshader" name="google/swiftshader" remote="github" revision="master" />
+<!-- END OF BRANCH SWITCHING -->
+
+<!-- START OF ADDITIONAL REPOS -->
+	<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
+
+	<!-- F-Droid -->
+	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
+
+	<!-- WireGuard -->
+	<remote name="zx2c4" fetch="https://git.zx2c4.com/" />
+	<project name="android_kernel_wireguard" path="kernel/wireguard" remote="zx2c4" revision="master" sync-s="true" />
+<!-- END OF ADDITIONAL REPOS -->
+
+<!-- START OF DEVICE REPOS -->
+	<!-- Common -->
+	<project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" remote="github" />
+	<project path="external/bson" name="LineageOS/android_external_bson" remote="github" />
+	<project path="external/sony/boringssl-compat" name="LineageOS/android_external_sony_boringssl-compat" remote="github" />
+	<project path="hardware/sony/thermanager" name="LineageOS/android_hardware_sony_thermanager" remote="github" />
+	<project path="hardware/sony/timekeep" name="LineageOS/android_hardware_sony_timekeep" remote="github" />
+	<project path="kernel/google/msm" name="LineageOS/android_kernel_google_msm" remote="github" />
+	<project path="packages/apps/FlipFlap" name="LineageOS/android_packages_apps_FlipFlap" remote="github" />
+
+	<!-- Moto Z (griffin) -->
+	<project path="device/motorola/griffin" name="LineageOS/android_device_motorola_griffin" remote="github" />
+	<project path="kernel/motorola/msm8996" name="LineageOS/android_kernel_motorola_msm8996" remote="github" />
+
+	<!-- Nexus 6 (shamu) -->
+	<project path="device/moto/shamu" name="LineageOS/android_device_moto_shamu" remote="github" />
+	<project path="kernel/moto/shamu" name="LineageOS/android_kernel_moto_shamu" remote="github" />
+
+	<!-- OnePlus One (bacon) -->
+	<project path="device/oppo/common" name="LineageOS/android_device_oppo_common" remote="github" />
+	<project path="device/oneplus/bacon" name="LineageOS/android_device_oneplus_bacon" remote="github" />
+	<project path="device/oppo/msm8974-common" name="LineageOS/android_device_oppo_msm8974-common" remote="github" />
+	<project path="kernel/oppo/msm8974" name="LineageOS/android_kernel_oppo_msm8974" remote="github" />
+
+	<!-- Samsung Common -->
+	<project path="device/samsung/qcom-common" name="LineageOS/android_device_samsung_qcom-common" remote="github" />
+	<project path="hardware/samsung" name="LineageOS/android_hardware_samsung" remote="github" />
+
+	<!-- Samsung Galaxy S5 (klte) -->
+	<project path="device/samsung/klte" name="LineageOS/android_device_samsung_klte" remote="github" />
+	<project path="device/samsung/klte-common" name="LineageOS/android_device_samsung_klte-common" remote="github" />
+	<project path="device/samsung/msm8974-common" name="LineageOS/android_device_samsung_msm8974-common" remote="github" />
+	<project path="kernel/samsung/msm8974" name="LineageOS/android_kernel_samsung_msm8974" remote="github" />
+<!-- END OF DEVICE REPOS -->
+
+</manifest>