diff --git a/README.md b/README.md
index 2046d2a..ecf2d6a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
     <make edits>
     git add -A
     git commit -m "commit message"
-    git push ssh://<username>@gerrit.omnirom.org:29418/<project> HEAD:refs/for/android-15
+    git push ssh://<username>@gerrit.omnirom.org:29418/<project> HEAD:refs/for/android-16
 
 Register at <gerrit.omnirom.org> and use the username that you registered there in the above command
 
@@ -66,7 +66,7 @@
 
     sudo apt-get install git-lfs
 
-    repo init -u https://github.com/omnirom/android.git -b android-15 --git-lfs
+    repo init -u https://github.com/omnirom/android.git -b android-16 --git-lfs
 
 Add this alias in your `~/.bashrc` for an automatically sync :
 
diff --git a/omni-aosp.xml b/omni-aosp.xml
index 05bc67e..8f96964 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -15,7 +15,7 @@
            fetch="ssh://git@github.com/omnirom"
            review="gerrit.omnirom.org" />
 
-    <project path="build/make" name="android_build" remote="omnirom" revision="android-15" groups="pdk,sysui-studio" >
+    <project path="build/make" name="android_build" remote="omnirom" revision="android-16" groups="pdk,sysui-studio" >
         <copyfile src="core/root.mk" dest="Makefile" />
         <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
         <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
@@ -24,60 +24,52 @@
         <linkfile src="target" dest="build/target" />
         <linkfile src="tools" dest="build/tools" />
     </project>
-    <project path="build/soong" name="android_build_soong" remote="omnirom" revision="android-15" >
+    <project path="build/soong" name="android_build_soong" remote="omnirom" revision="android-16" >
         <linkfile src="root.bp" dest="Android.bp" />
         <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
     </project>
 
-    <project path="bionic" name="android_bionic" remote="omnirom" revision="android-15" />
+    <project path="bionic" name="android_bionic" remote="omnirom" revision="android-16" />
 
-    <project path="device/google/gs101" name="android_device_google_gs101" remote="omnirom" revision="android-15" />
-    <project path="device/google/gs101-sepolicy" name="android_device_google_gs101-sepolicy" remote="omnirom" revision="android-15" />
-    <!--<project path="device/google/gs201" name="android_device_google_gs201" remote="omnirom" revision="android-14.0" />
-    <project path="device/google/gs201-sepolicy" name="android_device_google_gs201-sepolicy" remote="omnirom" revision="android-14.0" />-->
-    <project path="device/google/gs-common" name="android_device_google_gs-common" remote="omnirom" revision="android-15" />
-    <!--<project path="device/google/pantah" name="android_device_google_pantah" remote="omnirom" revision="android-14.0" />-->
-    <project path="device/google/raviole" name="android_device_google_raviole" remote="omnirom" revision="android-15" />
-
-    <project path="external/drm_hwcomposer" name="android_external_drm_hwcomposer" remote="omnirom" revision="android-15" />
+    <project path="external/drm_hwcomposer" name="android_external_drm_hwcomposer" remote="omnirom" revision="android-16" />
     <!--<project path="external/libdrm" name="android_external_libdrm" remote="omnirom" revision="android-13.0" />-->
-    <project path="external/wpa_supplicant_8" name="android_external_wpa_supplicant_8" remote="omnirom" revision="android-15" />
+    <project path="external/wpa_supplicant_8" name="android_external_wpa_supplicant_8" remote="omnirom" revision="android-16" />
 
-    <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-15" />
-    <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-15" />
-    <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-15" />
-    <project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-15" />
+    <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-16" />
+    <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-16" />
+    <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-16" />
+    <project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-16" />
 
-    <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-15" />
-    <project path="hardware/libhardware" name="android_hardware_libhardware" remote="omnirom" revision="android-15" />
-    <project path="hardware/google/pixel-sepolicy" name="android_hardware_google_pixel-sepolicy" remote="omnirom" revision="android-15" />
+    <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-16" />
+    <project path="hardware/libhardware" name="android_hardware_libhardware" remote="omnirom" revision="android-16" />
+    <project path="hardware/google/pixel-sepolicy" name="android_hardware_google_pixel-sepolicy" remote="omnirom" revision="android-16" />
 
-    <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-15" />
-    <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-15" />
-    <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-15" />
-    <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-15" />
-    <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-15" />
-    <project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-15" />
-    <project path="packages/apps/ThemePicker" name="android_packages_apps_ThemePicker" remote="omnirom" revision="android-15" />
-    <project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-15" />
-    <project path="packages/modules/Virtualization" name="android_packages_modules_Virtualization" remote="omnirom" revision="android-15" />
-    <project path="packages/services/Mms" name="android_packages_services_Mms" remote="omnirom" revision="android-15" />
-    <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-15" />
-    <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-15" />
+    <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-16" />
+    <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-16" />
+    <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-16" />
+    <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-16" />
+    <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-16" />
+    <project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-16" />
+    <project path="packages/apps/ThemePicker" name="android_packages_apps_ThemePicker" remote="omnirom" revision="android-16" />
+    <project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-16" />
+    <project path="packages/modules/Virtualization" name="android_packages_modules_Virtualization" remote="omnirom" revision="android-16" />
+    <project path="packages/services/Mms" name="android_packages_services_Mms" remote="omnirom" revision="android-16" />
+    <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-16" />
+    <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-16" />
 
-    <project path="system/bpf" name="android_system_bpf" remote="omnirom" revision="android-15" />
-    <project path="system/core" name="android_system_core" remote="omnirom" revision="android-15" />
-    <project path="system/libhidl" name="android_system_libhidl" remote="omnirom" revision="android-15" />
-    <project path="system/security" name="android_system_security" remote="omnirom" revision="android-15" />
-    <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-15" />
-    <project path="system/update_engine" name="android_system_update_engine" remote="omnirom" revision="android-15" />
-    <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-15" />
+    <project path="system/bpf" name="android_system_bpf" remote="omnirom" revision="android-16" />
+    <project path="system/core" name="android_system_core" remote="omnirom" revision="android-16" />
+    <project path="system/libhidl" name="android_system_libhidl" remote="omnirom" revision="android-16" />
+    <project path="system/security" name="android_system_security" remote="omnirom" revision="android-16" />
+    <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-16" />
+    <project path="system/update_engine" name="android_system_update_engine" remote="omnirom" revision="android-16" />
+    <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-16" />
     <!--<project path="system/timezone" name="android_system_timezone" remote="omnirom" revision="android-13.0" />-->
 
     <project path="prebuilts/gas/linux-x86" name="platform/prebuilts/gas/linux-x86" groups="pdk,linux,x86" clone-depth="1" remote="aosp" revision="592150fc8ae9f48f2e73f390961f32ca6f5f6a9f" />
     <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,linux,x86" clone-depth="1" remote="aosp" revision="794301a14990fa0cab129696d01fa56e3d24d4c6" />
 
-    <project path="packages/modules/Connectivity" name="android_packages_modules_Connectivity" remote="omnirom" revision="android-15" />
+    <project path="packages/modules/Connectivity" name="android_packages_modules_Connectivity" remote="omnirom" revision="android-16" />
     <!--<project path="packages/modules/Bluetooth" name="android_packages_modules_Bluetooth" remote="omnirom" revision="android-13.0" />
     <project path="packages/modules/Wifi" name="android_packages_modules_Wifi" remote="omnirom" revision="android-13.0" />-->
 </manifest>
diff --git a/omni-default.xml b/omni-default.xml
index 3c8c6da..3ca1a4b 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -17,16 +17,16 @@
   <!-- OmniROM Projects -->
   <project path="android" name="android" remote="omnirom" revision="android-15" />
 
-  <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-15" />
+  <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-16" />
 
-  <project path="external/libncurses" name="android_external_libncurses" remote="omnirom" revision="android-14.0" />
-  <project path="external/tigervnc" name="android_external_tigervnc" remote="omnirom" revision="android-14.0" />
-  <project path="external/vncflinger" name="android_external_vncflinger" remote="omnirom" revision="android-15" />
-  <project path="external/vim" name="android_external_vim" remote="omnirom" revision="android-14.0" />
+  <project path="external/libncurses" name="android_external_libncurses" remote="omnirom" revision="android-16" />
+  <project path="external/tigervnc" name="android_external_tigervnc" remote="omnirom" revision="android-16" />
+  <project path="external/vncflinger" name="android_external_vncflinger" remote="omnirom" revision="android-16" />
+  <project path="external/vim" name="android_external_vim" remote="omnirom" revision="android-16" />
   <project path="hardware/omni/interfaces" name="android_hardware_omni_interfaces" remote="omnirom" revision="android-15" />
 
   <project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-14.0" />
-  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-15" />
+  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-16" />
   <project path="packages/apps/OmniChromium" name="android_packages_apps_OmniChromium" remote="gitlab" revision="android-15" />
   <project path="packages/apps/SimpleDeviceConfig" name="android_packages_apps_SimpleDeviceConfig" remote="omnirom" revision="android-13.0" />
 
diff --git a/remove.xml b/remove.xml
index 6b67794..b6df562 100644
--- a/remove.xml
+++ b/remove.xml
@@ -4,13 +4,6 @@
 
     <remove-project name="device/amlogic/yukawa" />
     <remove-project name="device/amlogic/yukawa-kernel" />
-    <remove-project name="device/google/gs101" />
-    <remove-project name="device/google/gs101-sepolicy" />
-    <!--<remove-project name="device/google/gs201" />
-    <remove-project name="device/google/gs201-sepolicy" />-->
-    <remove-project name="device/google/gs-common" />
-    <!--<remove-project name="device/google/pantah" />-->
-    <remove-project name="device/google/raviole" />
 
     <remove-project name="platform/build" />
     <remove-project name="platform/build/soong" />