diff --git a/default.xml b/default.xml
index a77ac4c..0c5ea14 100644
--- a/default.xml
+++ b/default.xml
@@ -7,14 +7,18 @@
            revision="refs/tags/android-6.0.1_r81" />
 
   <remote  name="lineage-mirror"
-           fetch=".." />
+           fetch="https://git.replicant.us/" />
 
   <remote name="replicant"
-	  fetch=".." />
+           fetch="https://git.replicant.us/" />
 
   <remote name="fdroid"
-	  fetch="https://gitlab.com/fdroid/"
-	  revision="refs/tags/0.2.7" />
+           fetch="https://gitlab.com/fdroid/"
+           revision="refs/tags/0.2.7" />
+
+  <remote  name="adhoc"
+           fetch="https://code.adhoc.zone/ADHOC/"
+           revision="adhoc-dev" />
 
   <remote  name="private"
            fetch="ssh://git@github.com" />
@@ -154,7 +158,7 @@
   <project path="frameworks/minikin" name="LineageOS-mirror/android_frameworks_minikin.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/ml" name="LineageOS-mirror/android_frameworks_ml.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/multidex" name="LineageOS-mirror/android_frameworks_multidex.git" groups="pdk-cw-fs,pdk-fs" />
-  <project path="frameworks/native" name="replicant/frameworks_native.git" remote="replicant" groups="pdk" />
+  <project path="frameworks/native" name="replicant-frameworks_native.git" remote="adhoc" groups="pdk" />
   <project path="frameworks/opt/bitmap" name="LineageOS-mirror/android_frameworks_opt_bitmap.git" groups="pdk-fs" />
   <project path="frameworks/opt/bluetooth" name="LineageOS-mirror/android_frameworks_opt_bluetooth.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/opt/calendar" name="LineageOS-mirror/android_frameworks_opt_calendar.git" groups="pdk-cw-fs,pdk-fs" />
@@ -236,7 +240,7 @@
   <project path="packages/apps/Provision" name="LineageOS-mirror/android_packages_apps_Provision.git" groups="pdk-fs" />
   <project path="packages/apps/Screencast" name="LineageOS-mirror/android_packages_apps_Screencast.git" />
   <project path="packages/apps/Settings" name="replicant/packages_apps_Settings.git" remote="replicant" groups="pdk-fs" />
-  <project path="packages/apps/SetupWizard" name="replicant/packages_apps_SetupWizard.git" remote="replicant" />
+  <project path="packages/apps/SetupWizard" name="replicant-packages_apps_SetupWizard.git" remote="adhoc" />
   <project path="packages/apps/SmartCardService" name="LineageOS-mirror/android_packages_apps_SmartCardService.git" groups="pdk-fs" />
   <project path="packages/apps/Snap" name="LineageOS-mirror/android_packages_apps_Snap.git" />
   <project path="packages/apps/SoundRecorder" name="LineageOS-mirror/android_packages_apps_SoundRecorder.git" groups="pdk-fs" />
@@ -292,8 +296,8 @@
   <project path="system/qcom" name="LineageOS-mirror/android_system_qcom.git" groups="qcom" />
   <project path="system/security" name="LineageOS-mirror/android_system_security.git" groups="pdk" />
   <project path="system/vold" name="LineageOS-mirror/android_system_vold.git" groups="pdk" />
-  <project path="vendor/replicant" name="replicant/vendor_replicant.git" remote="replicant" />
-  <project path="vendor/cmsdk" name="replicant/vendor_cmsdk.git" remote="replicant" />
+  <project path="vendor/replicant" name="replicant-vendor_replicant.git" remote="adhoc" />
+  <project path="vendor/cmsdk" name="replicant-vendor_cmsdk.git" remote="adhoc" />
 
 <!-- CMSDK SAMPLES -->
   <project path="vendor/cmsdk/samples/weatherproviderservice/OpenWeatherMapProvider" name="LineageOS-mirror/android_packages_apps_OpenWeatherMapProvider.git" />
@@ -530,7 +534,7 @@
   <project path="device/samsung/tuna" name="replicant/device_samsung_tuna.git" remote="replicant" />
   <project path="device/samsung/espressowifi" name="replicant/device_samsung_espressowifi.git" remote="replicant" />
   <project path="device/samsung/espresso3g" name="replicant/device_samsung_espresso3g.git" remote="replicant" />
-  <project path="device/samsung/galaxys2-common" name="replicant/device_samsung_galaxys2-common.git" remote="replicant" />
+  <project path="device/samsung/galaxys2-common" name="replicant-device_samsung_galaxys2-common.git" remote="adhoc" />
   <project path="device/samsung/smdk4412-common" name="replicant/device_samsung_smdk4412-common.git" remote="replicant" />
   <project path="device/samsung/smdk4412-qcom-common" name="LineageOS-mirror/android_device_samsung_smdk4412-qcom-common.git" />
     <project path="device/samsung/kona-common" name="replicant/device_samsung_kona-common.git" remote="replicant" />
@@ -541,4 +545,7 @@
   <project path="hardware/tinyalsa-audio" name="replicant/hardware_tinyalsa-audio.git" remote="replicant" />
   <project path="external/stlport" name="LineageOS-mirror/android_external_stlport.git" />
 
+<!-- PROPRIETARY -->
+  <project path="vendor/samsung" name="proprietary-vendor_samsung.git" remote="adhoc" />
+
 </manifest>