diff --git a/default.xml b/default.xml
index f1cda01..81994f1 100644
--- a/default.xml
+++ b/default.xml
@@ -1,29 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
+  <!-- Repository definitions -->
   <remote name="github" fetch="https://github.com"               review="review.lineageos.org" />
   <remote name="gitlab" fetch="https://gitlab.com" />
-  <remote name="i5" fetch="https://git.i5.wtf" />
+  <!-- TEMP --> <remote name="i5" fetch="https://git.i5.wtf" />
   <remote name="aosp"   fetch="https://android.googlesource.com" review="android-review.googlesource.com" revision="refs/tags/android-16.0.0_r1" />
   <default revision="refs/heads/lineage-23.0" remote="github" sync-c="true" sync-j="4" />
 
-  <project path="meta"                                                      name="kitty/los-kernel-dodge-sukisu-susfs"                                       remote="i5" revision="master" >
+  <!-- This repository -->
+  <!-- MOVE TO GITHUB BEFORE RELEASE --> <project path="meta" name="kitty/los-kernel-dodge-sukisu-susfs" remote="i5" revision="master" >
     <linkfile src="build.sh" dest="build.sh" />
   </project>
-  <project path="prebuilts/clang/host/linux-x86/clang-r547379"              name="KiTTYsh/clang-r547379"                                                       clone-depth="1" revision="main" />
-  <project path="prebuilts/kernel-build-tools"                              name="kernel/prebuilts/build-tools"                                                clone-depth="1" remote="aosp" revision="main-kernel-build-2024" />
+
+  <!-- Build tools -->
+  <project path="prebuilts/clang/host/linux-x86/clang-r547379" name="KiTTYsh/android_prebuilts_clang_host_linux-x86_clang-r547379" clone-depth="1" revision="main" />
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9" clone-depth="1" revision="lineage-19.1" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9"     name="LineageOS/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9"     clone-depth="1" revision="lineage-19.1" />
-  <project path="kernel/oneplus/sm8750"                                     name="LineageOS/android_kernel_oneplus_sm8750"                                     clone-depth="1" />
-  <project path="kernel/oneplus/sm8750-modules"                             name="LineageOS/android_kernel_oneplus_sm8750-modules"                             clone-depth="1" >
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9" clone-depth="1" revision="lineage-19.1" />
+  <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" remote="aosp" revision="main-kernel-build-2024" />
+  <project path="prebuilts/magisk" name="KiTTYsh/magisk-unpacked" clone-depth="1" revision="main" />
+  <project path="external/AnyKernel3" name="osm0sis/AnyKernel3" clone-depth="1" revision="master" />
+
+  <!-- Kernel sources -->
+  <project path="kernel/oneplus/sm8750" name="LineageOS/android_kernel_oneplus_sm8750" clone-depth="1" />
+  <project path="kernel/oneplus/sm8750-modules" name="LineageOS/android_kernel_oneplus_sm8750-modules" clone-depth="1" >
     <linkfile src="oplus/kernel/touchpanel/kernelFwUpdate" dest="kernel/oneplus/sm8750/drivers/base" />
   </project>
-  <project path="kernel/oneplus/sm8750-devicetrees"                         name="LineageOS/android_kernel_oneplus_sm8750-devicetrees"                         clone-depth="1" >
+  <project path="kernel/oneplus/sm8750-devicetrees" name="LineageOS/android_kernel_oneplus_sm8750-devicetrees" clone-depth="1" >
     <linkfile src="." dest="kernel/oneplus/sm8750/arch/arm64/boot/dts/vendor" />
     <linkfile src="bindings" dest="kernel/oneplus/sm8750/Documentation/devicetree/bindings" />
   </project>
-  <project path="external/AnyKernel3"                                       name="osm0sis/AnyKernel3"                                                          clone-depth="1" revision="master" />
-  <project path="prebuilts/magisk"                                          name="KiTTYsh/magisk-unpacked"                                                     clone-depth="1" revision="main" />
-  <project path="external/SukiSU-Ultra"                                     name="SukiSU-Ultra/SukiSU-Ultra"                                                   clone-depth="1" revision="susfs-main" />
-  <project path="external/susfs4ksu"                                        name="simonpunk/susfs4ksu"                                                         clone-depth="1" remote="gitlab" revision="56b73631a064ed5c52f5b6da5872740765d0a307" />
+
+  <!-- Kernel modifications -->
+  <project path="external/SukiSU-Ultra" name="SukiSU-Ultra/SukiSU-Ultra" revision="c61d6fb6654dc12fa87c60c6f1eb57a4392995c2" /> <!-- v4.0.0 susfs-main -->
+  <project path="external/susfs4ksu" name="simonpunk/susfs4ksu" clone-depth="1" remote="gitlab" revision="c49b1dab205bbc4ef20b120e84c5b7530355961d" /> <!-- v1.5.12 gki-android15-6.6 -->
 </manifest>