diff --git a/jenslody.xml b/jenslody.xml
index 335afd9..efb752d 100644
--- a/jenslody.xml
+++ b/jenslody.xml
@@ -6,15 +6,6 @@
            review="review.msm8916.com"
            revision="lineage-15.1" />
 
-
-<!--
-  <remove-project name="device/generic/mini-emulator-arm64" />
-  <remove-project name="device/generic/mini-emulator-x86" />
-  <remove-project name="device/generic/mini-emulator-x86_64" />
-  <remove-project name="device/generic/qemu" />
-  <remove-project name="device/generic/x86" />
-  <remove-project name="device/generic/x86_64" />
--->
   <remove-project name="platform/prebuilts/android-emulator" />
 
   <remove-project name="platform/prebuilts/clang/host/darwin-x86"/>
@@ -34,31 +25,61 @@
   <remove-project name="platform/prebuilts/libs/libedit" />
 
 <!--
-  <remove-project name="platform/sdk" />
-  <remove-project name="LineageOS/android_hardware_qcom_audio"/>
-
-  <remove-project name="LineageOS/android_vendor_qcom_opensource_dataservices"/>
+  <remove-project name="hardware_qcom_display" />
+  <project path="hardware/qcom/display-caf/apq8084" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8084" />
+  <project path="hardware/qcom/display-caf/msm8916" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8916" />
+  <project path="hardware/qcom/display-caf/msm8952" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8952" />
+  <project path="hardware/qcom/display-caf/msm8960" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8960" />
+  <project path="hardware/qcom/display-caf/msm8974" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8974" />
+  <project path="hardware/qcom/display-caf/msm8994" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8994" />
+  <project path="hardware/qcom/display-caf/msm8996" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8996" />
+  <project path="hardware/qcom/display-caf/msm8998" name="LineageOS/android_hardware_qcom_display" groups="pdk,qcom,qcom_display" remote="github" revision="lineage-15.1-caf-8998" />
 -->
-  <remove-project name="hardware_qcom_audio"/>
 
-  <remove-project name="vendor_qcom_opensource_dataservices"/>
+  <!-- Qcom Common 
+  <remove-project name="device_qcom_common" />
+  <project path="device/qcom/common" name="LineageOS/android_device_qcom_common" remote="github" revision="lineage-15.1"/>
 
+  <remove-project name="device_qcom_sepolicy" />
+  <project path="device/qcom/sepolicy" name="LineageOS/android_device_qcom_sepolicy" remote="github" revision="lineage-15.1" groups="pdk" />
+
+-->
   <remove-project name="vendor_validus" />
   <project path="vendor/validus" name="jenslody/vendor_validus" remote="github" revision="8.1" />
 
-  <project path="packages/apps/OTAUpdates" name="jenslody/OTAUpdates" remote="github" revision="8.1" />
+  <remove-project name="frameworks_base" />
+  <project path="frameworks/base" name="jenslody/frameworks_base" remote="github" revision="8.1" groups="pdk" />
 
+  <remove-project name="system_sepolicy" />
+  <project path="system/sepolicy" name="jenslody/system_sepolicy" groups="pdk" remote="github" revision="8.1" />
 
-<!--
-  <remove-project name="system_vold" />
-  <project path="system/vold" name="LineageOS/android_system_vold" groups="pdk" remote="github" revision="lineage-15.1" />
--->
+  <remove-project name="packages_apps_Camera2" />
+  <project path="packages/apps/Camera2" name="jenslody/android_packages_apps_Camera2" remote="github" revision="lineage-15.1" groups="pdk-fs" />
+
+  <remove-project name="frameworks_av" />
+  <project path="frameworks/av" name="jenslody/android_frameworks_av" remote="github" revision="lineage-15.1" groups="pdk" />
+
+ <!-- Samsung Hardware Repo -->
+  <project path="hardware/samsung" name="jenslody/android_hardware_samsung" remote="github" revision="lineage-15.1" />
+
+ <!-- Samsung MSM8916 Common Repos -->
+  <project path="device/samsung/qcom-common" name="jenslody/android_device_samsung_qcom-common" remote="github" groups="device" revision="lineage-15.1" />
+
+ <!-- Galaxy J5 (SM-J500H - j53gxx) || (J500F-G-M-Y - j5lte) || (J500FN - j5nlte) || (J5008 - j5ltechn) -->
+  <project path="device/samsung/j5nlte" name="jenslody/android_device_samsung_j5nlte" groups="device" remote="github" revision="lineage-15.1" />
+  <project path="device/samsung/j5ltechn" name="jenslody/android_device_samsung_j5ltechn" groups="device" remote="github" revision="lineage-15.1" />
+  <project path="device/samsung/j5lte" name="jenslody/android_device_samsung_j5lte" groups="device" remote="github" revision="lineage-15.1" />
+  <project path="device/samsung/j53gxx" name="jenslody/android_device_samsung_j53gxx" groups="device" remote="github" revision="lineage-15.1" />
+  <project path="device/samsung/j5-common" name="jenslody/android_device_samsung_j5-common" groups="device" remote="github" revision="lineage-15.1" />
+
+  <remove-project name="hardware_qcom_audio"/>
   <project path="hardware/qcom/audio-caf/msm8916" name="Galaxy-MSM8916/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk" remote="github" revision="lineage-15.1-caf-8916" />
 
+  <remove-project name="vendor_qcom_opensource_dataservices"/>
   <project path="vendor/qcom/opensource/dataservices" name="Galaxy-MSM8916/android_vendor_qcom_opensource_dataservices" remote="github" revision="lineage-15.1" />
-  <!-- Qcom Common --><!--
-  <project path="device/qcom/common" name="LineageOS/android_device_qcom_common"/>
--->
+
+  <project path="packages/apps/OTAUpdates" name="jenslody/OTAUpdates" remote="github" revision="8.1" />
+
  <!-- TWRP -->
 <!--
  <project path="bootable/recovery-twrp" name="omnirom/android_bootable_recovery" remote="github" revision="android-8.1"/>
@@ -96,14 +117,6 @@
 
   <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" groups="pdk-fs" remote="aosp" revision="master" />
 
-
- <!-- Galaxy J5 (SM-J500H - j53gxx) || (J500F-G-M-Y - j5lte) || (J500FN - j5nlte) || (J5008 - j5ltechn) -->
-  <project path="device/samsung/j5-common" name="jenslody/android_device_samsung_j5-common" groups="device" remote="github" revision="lineage-15.1" />
-  <project path="device/samsung/j53gxx" name="jenslody/android_device_samsung_j53gxx" groups="device" remote="github" revision="lineage-15.1" />
-  <project path="device/samsung/j5lte" name="jenslody/android_device_samsung_j5lte" groups="device" remote="github" revision="lineage-15.1" />
-  <project path="device/samsung/j5ltechn" name="jenslody/android_device_samsung_j5ltechn" groups="device" remote="github" revision="lineage-15.1" />
-  <project path="device/samsung/j5nlte" name="jenslody/android_device_samsung_j5nlte" groups="device" remote="github" revision="lineage-15.1" />
-
  <!-- (J510FN - j5xnlte) -->
 <!--
   <project path="device/samsung/j5x-common" name="Galaxy-MSM8916/android_device_samsung_j5x-common" groups="device" remote="Galaxy-MSM8916"/>
@@ -121,8 +134,7 @@
   <project path="device/samsung/serranovelte" name="Galaxy-MSM8916/android_device_samsung_serranovelte" groups="device" remote="Galaxy-MSM8916"/>
 -->
  <!-- Samsung MSM8916 Common Repos -->
-  <project path="device/samsung/msm8916-common" name="Galaxy-MSM8916/android_device_samsung_msm8916-common" groups="device" remote="Galaxy-MSM8916"/>
-  <project path="device/samsung/qcom-common" name="jenslody/android_device_samsung_qcom-common" remote="github" groups="device" revision="lineage-15.1" />
+  <project path="device/samsung/msm8916-common" name="Galaxy-MSM8916/android_device_samsung_msm8916-common" groups="device" remote="github" revision="lineage-15.1" />
 
  <!-- arm-eabi-7.2 -->
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-7.2" name="Galaxy-MSM8916/android-prebuilts-gcc-linux-x86-arm-arm-eabi-7.2" remote="github" revision="master"/>
@@ -132,9 +144,6 @@
   <project path="external/sony/boringssl-compat" name="LineageOS/android_external_sony_boringssl-compat" remote="github" revision="lineage-15.1" />
   <project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" remote="github" revision="lineage-15.1" />
   
- <!-- Samsung Hardware Repo -->
-  <project path="hardware/samsung" name="jenslody/android_hardware_samsung" remote="github" revision="lineage-15.1" />
-
  <!-- Common Samsung MSM8916 Kernel -->
   <project path="kernel/samsung/msm8916" name="Galaxy-MSM8916/android_kernel_samsung_msm8916" remote="Galaxy-MSM8916"/>