diff --git a/wephone.xml b/wephone.xml
index 2f643b6..09e7356 100644
--- a/wephone.xml
+++ b/wephone.xml
@@ -2,10 +2,10 @@
 <manifest>
 	<remote name="github" fetch="https://github.com/" />
 	<remote name="lineage" fetch="https://github.com/LineageOS/" />
-	<remote name="aosp13" fetch="https://git.mezimmah.net/aosp13/" />
-	<remote name="aosp12" fetch="https://git.mezimmah.net/aosp12/" />
+	<remote name="wephone" fetch="https://git.mezimmah.net/wephone/" />
 	<remote name="phh" fetch="https://github.com/phhusson/" />
 	<remote name="td" fetch="https://github.com/TrebleDroid/" />
+	<remote name="relan" fetch="https://github.com/relan/" />
 
 	<remove-project name="platform/external/chromium-webview" />
 
@@ -17,19 +17,24 @@
 	<remove-project name="platform/packages/apps/Gallery2" />
 	<remove-project name="platform/packages/apps/QuickSearchBox" />
 
-	<project path="device/nehemiah/wephone" name="device_nehemiah_wephone" remote="aosp12" revision="master" />
+	<project path="device/nehemiah/wephone" name="device_nehemiah_wephone" remote="wephone" revision="aosp12" />
 
-	<project path="packages/apps/BromiteSystemWebView" name="bromite_system_web_view" remote="aosp12" revision="master" />
-	<project path="packages/apps/Camera2" name="android_packages_apps_Camera2" remote="lineage" revision="lineage-19.1" />
-	<project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="lineage" revision="lineage-19.1" />
-	<project path="packages/apps/Etar" name="android_packages_apps_Etar" remote="lineage" revision="lineage-19.1" />
-	<project path="packages/apps/ExactCalculator" name="android_packages_apps_ExactCalculator" remote="lineage" revision="lineage-19.1" />
-	<project path="packages/apps/DeskClock" name="android_packages_apps_DeskClock" remote="lineage" revision="lineage-19.1" />
-	<project path="packages/apps/FDroid" name="f_droid" remote="aosp12" revision="master" />
-	<project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="lineage" revision="lineage-19.1" />
-	<project path="packages/apps/Lawnchair" name="Lawnchair" remote="aosp13" revision="master" />
-	<project path="packages/inputmethods/WKT9" name="WKT9" remote="aosp13" revision="master" />
+	<project path="external/exfat" name="exfat" remote="relan" revision="master" />
 
-	<project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="pie" />
-	<project path="vendor/interfaces" name="vendor_interfaces" remote="phh" revision="android-11.0" />
+	<project path="packages/apps/BromiteSystemWebView" name="bromite_system_web_view" remote="wephone" revision="aosp11" />
+	<project path="packages/apps/Camera2" name="android_packages_apps_Camera2" remote="lineage" revision="lineage-18.1" />
+	<project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="lineage" revision="lineage-18.1" />
+	<project path="packages/apps/Conversations" name="conversations" remote="wephone" revision="aosp11" />
+	<project path="packages/apps/Davx5" name="davx" remote="wephone" revision="aosp11" />
+	<project path="packages/apps/Etar" name="android_packages_apps_Etar" remote="lineage" revision="lineage-18.1" />
+	<project path="packages/apps/ExactCalculator" name="android_packages_apps_ExactCalculator" remote="lineage" revision="lineage-18.1" />
+	<project path="packages/apps/DeskClock" name="android_packages_apps_DeskClock" remote="lineage" revision="lineage-18.1" />
+	<project path="packages/apps/FDroid" name="f_droid" remote="wephone" revision="aosp11" />
+	<project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="lineage" revision="lineage-18.1" />
+	<project path="packages/apps/Lawnchair" name="Lawnchair" remote="wephone" revision="aosp11" />
+	<!-- <project path="packages/apps/Lawnicons" name="lawnchair" remote="wephone" revision="aosp11" /> -->
+	<project path="packages/apps/Linphone" name="linphone" remote="wephone" revision="aosp11" />
+	<project path="packages/apps/Nextcloud" name="nextcloud" remote="wephone" revision="aosp11" />
+	<project path="packages/apps/Wireguard" name="wireguard" remote="wephone" revision="aosp11" />
+	<!-- <project path="packages/inputmethods/WKT9" name="wkt9" remote="wephone" revision="aosp11" /> -->
 </manifest>