diff --git a/manifest.xml b/manifest.xml
index 5a0dc2a..f142edb 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-<remote name="phh" fetch="https://github.com/phhusson/" />
-<remote name="td" fetch="https://github.com/TrebleDroid/" />
-<remote name="github" fetch="https://github.com/" />
-
-<project path="device/phh/treble" name="device_phh_treble" remote="td" revision="android-13.0" />
-<project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="td" revision="pie" />
-
-<project path="vendor/vndk-tests" name="vendor_vndk-tests" remote="phh" revision="master" />
-<project path="vendor/interfaces" name="vendor_interfaces" remote="td" revision="android-13.0" />
-<project path="vendor/lptools" name="vendor_lptools" remote="phh" revision="master" />
-
-
-<project path="vendor/magisk" name="vendor_magisk" remote="phh" revision="android-10.0" />
-
-<project path="packages/apps/QcRilAm" name="AndyCGYan/android_packages_apps_QcRilAm" remote="github" revision="master" />
+  <project name="phhusson/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
+  <project name="phhusson/device_phh_treble" path="device/phh/treble" remote="github" revision="android-11.0" />
+  <project name="phhusson/vendor_vndk-tests" path="vendor/vndk-tests" remote="github" revision="master" />
+  <project name="phhusson/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-11.0" />
+  <project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />
+  <remote name="gitlab" fetch="https://gitlab.com/" />
+  <project name="00p513-dev/partner_gms" path="vendor/partner_gms" remote="gitlab" revision="11" />
 </manifest>
diff --git a/replace.xml b/replace.xml
deleted file mode 100644
index 2b8d3f6..0000000
--- a/replace.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-<remote name="td" fetch="https://github.com/TrebleDroid/" />
-
-<remove-project name="platform/system/core" />
-<project path="system/core" name="platform_system_core" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/frameworks/native" />
-<project path="frameworks/native" name="platform_frameworks_native" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/system/vold" />
-<project path="system/vold" name="platform_system_vold" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/external/selinux" />
-<project path="external/selinux" name="platform_external_selinux" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/bootable/recovery" />
-<project path="bootable/recovery" name="platform_bootable_recovery" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/frameworks/av" />
-<project path="frameworks/av" name="platform_frameworks_av" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/frameworks/base" />
-<project path="frameworks/base" name="platform_frameworks_base" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/system/extras" />
-<project path="system/extras" name="platform_system_extras" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/frameworks/opt/telephony" />
-<project path="frameworks/opt/telephony" name="platform_frameworks_opt_telephony" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/system/netd" />
-<project path="system/netd" name="platform_system_netd" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/system/nfc" />
-<project path="system/nfc" name="platform_system_nfc" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/packages/apps/Settings" />
-<project path="packages/apps/Settings" name="platform_packages_apps_Settings" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/packages/modules/Bluetooth" />
-<project path="packages/modules/Bluetooth" name="platform_packages_modules_Bluetooth" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/system/bpf" />
-<project path="system/bpf" name="platform_system_bpf" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/bionic" />
-<project path="bionic" name="platform_bionic" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/system/linkerconfig" />
-<project path="system/linkerconfig" name="platform_system_linkerconfig" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/hardware/interfaces" />
-<project path="hardware/interfaces" name="platform_hardware_interfaces" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/build" />
-<project path="build/make" name="platform_build" remote="td" revision="android-13.0.0_r73-td">
-    <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
-    <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
-    <linkfile src="core" dest="build/core" />
-    <linkfile src="envsetup.sh" dest="build/envsetup.sh" />
-    <linkfile src="target" dest="build/target" />
-    <linkfile src="tools" dest="build/tools" />
-</project>
-
-<remove-project name="platform/frameworks/libs/net" />
-<project path="frameworks/libs/net" name="platform_frameworks_libs_net" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/packages/modules/Connectivity" />
-<project path="packages/modules/Connectivity" name="platform_packages_modules_Connectivity" remote="td" revision="android-13.0.0_r73-td" />
-
-<remove-project name="platform/frameworks/opt/net/ims" />
-<project path="frameworks/opt/net/ims" name="platform_frameworks_opt_net_ims" remote="td" revision="android-13.0.0_r73-td" />
-
-</manifest>
diff --git a/wephone.xml b/wephone.xml
index 7a7f9c0..f80ba0b 100644
--- a/wephone.xml
+++ b/wephone.xml
@@ -13,9 +13,11 @@
 	<remove-project name="platform/packages/apps/QuickSearchBox" />
 
 	<!-- Cat S22 Flip device tree -->
+	<!--
 	<project path="device/phh/cats22flip" name="treble/device_phh_cats22flip" remote="mezimmah" revision="master" />
-
+	-->
 	<!-- wePhone packages -->
+	<!--
 	<project path="packages/apps/BromiteSystemWebView" name="wephone/bromite_system_web_view" remote="mezimmah" revision="arm" />
 	<project path="packages/apps/Conversations" name="wephone/conversations" remote="mezimmah" revision="arm" />
 	<project path="packages/apps/Davx5" name="wephone/davx" remote="mezimmah" revision="master" />
@@ -26,5 +28,6 @@
 	<project path="packages/apps/NextcloudNotes" name="wephone/nextcloud_notes" remote="mezimmah" revision="master" />
 	<project path="packages/apps/OpenDocumentReader" name="wephone/open_document_reader" remote="mezimmah" revision="master" />
 	<project path="packages/apps/Wireguard" name="wephone/wireguard" remote="mezimmah" revision="master" />
-	<project path="packages/apps/CatFlipScreen" name="wephone/catflipscreen" remote="mezimmah" revision="master" />
+		<project path="packages/apps/CatFlipScreen" name="wephone/catflipscreen" remote="mezimmah" revision="master" />
+	-->
 </manifest>