diff --git a/cupid.xml b/cupid.xml
index 6dec645..3dda1a7 100644
--- a/cupid.xml
+++ b/cupid.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!-- Device trees -->
-  <project name="android_device_xiaomi_cupid" path="device/xiaomi/cupid" remote="j7b3y" revision="cr11" />
-  <project name="android_device_xiaomi_sm8450-common" path="device/xiaomi/sm8450-common" remote="j7b3y" revision="cr11" />
+	<project name="xiaomi-sm8450/android_device_xiaomi_cupid" path="device/xiaomi/cupid" remote="j7b3y" revision="cr11" />
+  <project name="xiaomi-sm8450/android_device_xiaomi_sm8450-common" path="device/xiaomi/sm8450-common" remote="j7b3y" revision="cr11" />
 
   <!-- Xiaomi common hardware -->
   <project path="hardware/xiaomi" name="crdroidandroid/android_hardware_xiaomi" remote="github" revision="15.0" />
@@ -13,10 +13,10 @@
   <project name="cupid-development/android_kernel_xiaomi_sm8450-modules" path="kernel/xiaomi/sm8450-modules" remote="github" revision="lineage-22.1" />
 
   <!-- Vendor -->
-  <project name="proprietary_vendor_xiaomi_cupid" path="vendor/xiaomi/cupid" remote="j7b3y" revision="lineage-22.0" />
-  <project name="proprietary_vendor_xiaomi_sm8450-common" path="vendor/xiaomi/sm8450-common" remote="j7b3y" revision="lineage-22.0" />
+  <project name="xiaomi-sm8450/proprietary_vendor_xiaomi_cupid" path="vendor/xiaomi/cupid" remote="j7b3y" revision="lineage-22.0" />
+  <project name="xiaomi-sm8450/proprietary_vendor_xiaomi_sm8450-common" path="vendor/xiaomi/sm8450-common" remote="j7b3y" revision="lineage-22.0" />
 
   <!-- MiuiCam-->
   <project name="cupid-development/android_device_xiaomi_miuicamera-cupid" path="device/xiaomi/miuicamera-cupid" remote="github" revision="lineage-22.1" />
-  <project name="proprietary_vendor_xiaomi_miuicamera-cupid" path="vendor/xiaomi/miuicamera-cupid" remote="j7b3y" revision="lineage-22.1" />
-</manifest>
\ No newline at end of file
+  <project name="xiaomi-sm8450/proprietary_vendor_xiaomi_miuicamera-cupid" path="vendor/xiaomi/miuicamera-cupid" remote="j7b3y" revision="lineage-22.1" />
+</manifest>
diff --git a/gapps.xml b/gapps.xml
index 8ded52e..005715f 100644
--- a/gapps.xml
+++ b/gapps.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <project name="vendor_gapps" path="vendor/gapps" remote="j7b3y" revision="cr11" />
-</manifest>
\ No newline at end of file
+	<project name="android/vendor_gapps" path="vendor/gapps" remote="j7b3y" revision="cr11" />
+</manifest>
diff --git a/lynx.xml b/lynx.xml
deleted file mode 100644
index 0442bcb..0000000
--- a/lynx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <!-- Device trees -->
-  <project name="android_device_google_lynx" path="device/google/lynx" remote="j7b3y" revision="cr11-5.10" />
-  <project name="LineageOS/android_device_google_gs201" path="device/google/gs201" remote="github" revision="lineage-22.1" />
-  <project name="LineageOS/android_device_google_gs101" path="device/google/gs101" remote="github" revision="lineage-22.1" />
-  <project name="LineageOS/android_device_google_gs-common" path="device/google/gs-common" remote="github" revision="lineage-22.1" />
-
-  <!-- Kernel -->
-  <project name="device/google/lynx-kernels/5.10" path="device/google/lynx-kernels/5.10" remote="aosp" />
-
-  <!-- Parts -->
-  <project name="Evolution-X-Devices/packages_apps_PixelParts" path="packages/apps/PixelParts" remote="github" revision="vic" />
-
-  <!-- Vendor-->
-  <project name="TheMuppets/proprietary_vendor_google_lynx" path="vendor/google/lynx" remote="github" revision="lineage-22.1" />
-</manifest>
diff --git a/remote.xml b/remote.xml
index bf716ac..3ed3d6a 100644
--- a/remote.xml
+++ b/remote.xml
@@ -1,4 +1,4 @@
 <manifest>
     <!-- Remotes -->
-    <remote name="j7b3y" fetch="https://gitea.n4ne.com/android" />
-</manifest>
\ No newline at end of file
+    <remote name="j7b3y" fetch="https://git.n4ne.com" />
+</manifest>