diff --git a/omni-aosp.xml b/omni-aosp.xml
index a996621..f84f2f9 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -63,15 +63,12 @@
   <project path="hardware/qcom/wlan" name="android_hardware_qcom_wlan" remote="omnirom" revision="android-10" />
 
   <project path="packages/apps/Bluetooth" name="android_packages_apps_Bluetooth" remote="omnirom" revision="android-10" />
-  <project path="packages/apps/Calendar" name="android_packages_apps_Calendar" remote="omnirom" revision="android-10" />
   <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-10" />
   <project path="packages/apps/CellBroadcastReceiver" name="android_packages_apps_CellBroadcastReceiver" remote="omnirom" revision="android-10" />
   <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-10" />
   <project path="packages/apps/DocumentsUI" name="android_packages_apps_DocumentsUI" remote="omnirom" revision="android-10" />
-  <project path="packages/apps/ExactCalculator" name="android_packages_apps_ExactCalculator" remote="omnirom" revision="android-10" />
   <!--<project path="packages/apps/EmergencyInfo" name="android_packages_apps_EmergencyInfo" remote="omnirom" revision="android-9.0" /> -->
   <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-10" />
-  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-10" />
   <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-10" />
   <project path="packages/apps/MusicFX" name="android_packages_apps_MusicFX" remote="omnirom" revision="android-10" />
   <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-10" />
diff --git a/omni-caf.xml b/omni-caf.xml
index c754b79..9b79751 100644
--- a/omni-caf.xml
+++ b/omni-caf.xml
@@ -14,5 +14,4 @@
   <project path="vendor/codeaurora/telephony" name="android_vendor_codeaurora_telephony" remote="omnirom" revision="android-10" />
   <project path="vendor/qcom/opensource/interfaces" name="android_vendor_qcom_opensource_interfaces" remote="omnirom" revision="android-10" />
   <project path="vendor/qcom/opensource/display-commonsys-intf" name="android_vendor_qcom_opensource_display-commonsys-intf" remote="omnirom" revision="android-10" />
-  <project path="packages/apps/DeskClock" name="android_packages_apps_DeskClock" remote="omnirom" revision="android-10" />
 </manifest>
diff --git a/omni-default.xml b/omni-default.xml
index b4c8531..d43a8f6 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -12,6 +12,8 @@
   <!-- include registered repos -->
   <include name="omni-private.xml" />
 
+  <include name="omni-extra.xml" />
+
   <!-- OmniROM Projects -->
   <project path="android" name="android" remote="omnirom" revision="android-10" />
 
@@ -33,7 +35,6 @@
   <project path="external/zip" name="android_external_zip"  remote="omnirom" revision="android-10" />
 
   <project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-10" />
-  <project path="packages/apps/OmniChromium" name="android_packages_apps_OmniChromium" remote="gitlab" revision="android-10" />
   <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-10" />
-  <project path="packages/apps/Phonograph" name="android_packages_apps_Phonograph" remote="omnirom" revision="android-10" />
+
 </manifest>
diff --git a/omni-extra.xml b/omni-extra.xml
new file mode 100644
index 0000000..be8de71
--- /dev/null
+++ b/omni-extra.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Calendar" name="android_packages_apps_Calendar" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/ExactCalculator" name="android_packages_apps_ExactCalculator" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/DeskClock" name="android_packages_apps_DeskClock" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/OmniChromium" name="android_packages_apps_OmniChromium" remote="gitlab" revision="android-10" />
+  <project path="packages/apps/Phonograph" name="android_packages_apps_Phonograph" remote="omnirom" revision="android-10" />
+</manifest>