diff --git a/omni-aosp.xml b/omni-aosp.xml
index d63ae60..5f241aa 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -39,18 +39,18 @@
   <!--<project path="external/skia" name="android_external_skia" remote="omnirom" revision="android-9.0" /> -->
   <project path="external/toybox" name="android_external_toybox" remote="omnirom" revision="android-11" />
 
-  <!--<project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-10" />-->
+  <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-11" />
   <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-11" />
-  <!--<project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-10" />-->
-  <project path="frameworks/opt/chips" name="android_frameworks_opt_chips" remote="omnirom" revision="android-10" />
-  <!--<project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-10" />-->
-  <!--<project path="frameworks/opt/net/wifi" name="android_frameworks_opt_net_wifi" remote="omnirom" revision="android-10" /> -->
-  <!--<project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-10" />-->
+  <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-11" />
+  <project path="frameworks/opt/chips" name="android_frameworks_opt_chips" remote="omnirom" revision="android-11" />
+  <project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-11" />
+  <project path="frameworks/opt/net/wifi" name="android_frameworks_opt_net_wifi" remote="omnirom" revision="android-11" />
+  <project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-11" />
 
   <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-11" />
   <!--<project path="hardware/invensense" name="android_hardware_invensense" remote="omnirom" revision="android-9.0" /> -->
   <project path="hardware/libhardware" name="android_hardware_libhardware" remote="omnirom" revision="android-11" />
-  <project path="hardware/libhardware_legacy" name="android_hardware_libhardware_legacy" remote="omnirom" revision="android-11" groups="pdk" />
+  <!--<project path="hardware/libhardware_legacy" name="android_hardware_libhardware_legacy" remote="omnirom" revision="android-11" groups="pdk" /> -->
 
   <!--<project path="hardware/nxp/nfc" name="android_hardware_nxp_nfc" remote="omnirom" revision="android-10" />-->
 
@@ -88,18 +88,18 @@
   <!--<project path="packages/providers/MediaProvider" name="android_packages_providers_MediaProvider" remote="omnirom" revision="android-11" />-->
 
   <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-11" />
-  <!--<project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-10" />-->
+  <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-11" />
 
   <!--<project path="prebuilts/build-tools" name="android_prebuilts_build-tools" remote="omnirom" revision="android-9.0" /> -->
 
-  <!--<project path="system/bpf" name="android_system_bpf" remote="omnirom" revision="android-10" /> -->
-  <!--<project path="system/bt" name="android_system_bt" remote="omnirom" revision="android-10" />-->
+  <project path="system/bpf" name="android_system_bpf" remote="omnirom" revision="android-10" />
+  <project path="system/bt" name="android_system_bt" remote="omnirom" revision="android-11" />
   <project path="system/core" name="android_system_core" remote="omnirom" revision="android-11" />
   <project path="system/extras" name="android_system_extras" remote="omnirom" revision="android-11" />
   <project path="system/libhidl" name="android_system_libhidl" remote="omnirom" revision="android-11" />
   <project path="system/media" name="android_system_media" remote="omnirom" revision="android-11" />
   <project path="system/nfc" name="android_system_nfc" remote="omnirom" revision="android-11" />
-  <!--<project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-10" />-->
+  <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-11" />
   <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-11" />
   <!--<project path="system/hardware/interfaces" name="android_system_hardware_interfaces" remote="omnirom" revision="android-11" />-->
   <!--<project path="system/update_engine" name="android_system_update_engine" remote="omnirom" revision="android-10" />-->
diff --git a/omni-caf.xml b/omni-caf.xml
index 0a32829..934ba41 100644
--- a/omni-caf.xml
+++ b/omni-caf.xml
@@ -8,10 +8,9 @@
            fetch="https://github.com/omnirom"
            review="gerrit.omnirom.org" />
 
-  <project path="external/libnetfilter_conntrack" name="android_external_libnetfilter_conntrack" remote="omnirom" revision="android-9.0" />
-  <project path="external/libnfnetlink" name="android_external_libnfnetlink" remote="omnirom" revision="android-9.0" />
   <!--<project path="hardware/ril" name="android_hardware_ril" remote="omnirom" revision="android-10" />-->
-  <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="vendor/codeaurora/telephony" name="android_vendor_codeaurora_telephony" remote="omnirom" revision="android-11" />
+  <project path="vendor/qcom/opensource/interfaces" name="android_vendor_qcom_opensource_interfaces" remote="omnirom" revision="android-11" />
+  <project path="vendor/qcom/opensource/display-commonsys-intf" name="android_vendor_qcom_opensource_display-commonsys-intf" remote="omnirom" revision="android-11" />
+  <project path="vendor/qcom/opensource/commonsys" name="android_vendor_qcom_opensource_commonsys" remote="omnirom" revision="android-11" />
 </manifest>
diff --git a/omni-default.xml b/omni-default.xml
index 95a6518..2bfdd32 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -18,7 +18,7 @@
   <project path="android" name="android" remote="omnirom" revision="android-11" />
 
   <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-11" />
-  <project path="vendor/interfaces" name="android_vendor_interfaces" remote="omnirom" revision="android-10" />
+  <project path="vendor/interfaces" name="android_vendor_interfaces" remote="omnirom" revision="android-11" />
 
   <project path="external/bash" name="android_external_bash" remote="omnirom" revision="android-10" />
   <project path="external/exfat" name="android_external_exfat" remote="omnirom" revision="android-10" />-->
diff --git a/remove.xml b/remove.xml
index 37d4140..f1f31ef 100644
--- a/remove.xml
+++ b/remove.xml
@@ -70,18 +70,18 @@
   <!--<remove-project name="platform/external/skia" />-->
   <remove-project name="platform/external/toybox" />
 
-  <!-- <remove-project name="platform/frameworks/av" /> -->
+  <remove-project name="platform/frameworks/av" />
   <remove-project name="platform/frameworks/base" />
-  <!-- <remove-project name="platform/frameworks/native" /> -->
+  <remove-project name="platform/frameworks/native" />
   <remove-project name="platform/frameworks/opt/chips" />
-  <!--<remove-project name="platform/frameworks/opt/telephony" />-->
-  <!--<remove-project name="platform/frameworks/opt/net/ims" />-->
-  <!--<remove-project name="platform/frameworks/opt/net/wifi" />-->
+  <remove-project name="platform/frameworks/opt/telephony" />
+  <remove-project name="platform/frameworks/opt/net/ims" />
+  <remove-project name="platform/frameworks/opt/net/wifi" />
 
   <!--<remove-project name="platform/hardware/invensense" /> -->
   <remove-project name="platform/hardware/interfaces" />
   <remove-project name="platform/hardware/libhardware" />
-  <remove-project name="platform/hardware/libhardware_legacy" />
+  <!--<remove-project name="platform/hardware/libhardware_legacy" /> -->
 
   <!--<remove-project name="platform/hardware/nxp/nfc" />-->
 
@@ -145,18 +145,18 @@
   <!--<remove-project name="platform/packages/providers/MediaProvider" /> -->
 
   <remove-project name="platform/packages/services/Telephony" />
-  <!--<remove-project name="platform/packages/services/Telecomm" />-->
+  <remove-project name="platform/packages/services/Telecomm" />
 
   <!--<remove-project name="platform/prebuilts/build-tools" /> -->
 
   <!--<remove-project name="platform/system/bpf" />-->
-  <!--<remove-project name="platform/system/bt" />-->
+  <remove-project name="platform/system/bt" />
   <remove-project name="platform/system/core" />
   <remove-project name="platform/system/extras" />
   <remove-project name="platform/system/libhidl" />
   <remove-project name="platform/system/media" />
   <remove-project name="platform/system/nfc" />
-  <!--<remove-project name="platform/system/sepolicy" />-->
+  <remove-project name="platform/system/sepolicy" />
   <remove-project name="platform/system/vold" />
   <!--<remove-project name="platform/system/hardware/interfaces" />-->
   <!--<remove-project name="platform/system/update_engine" />-->