diff --git a/jenslody.xml b/jenslody.xml
index b711308..9d7681f 100644
--- a/jenslody.xml
+++ b/jenslody.xml
@@ -7,10 +7,9 @@
   <remote  name="Galaxy-MSM8916"
            fetch="https://github.com"
            review="review.msm8916.com"
-           revision="lineage-15.1" />
+           revision="lineage-16.0" />
 
 <!--
--->
   <remove-project name="platform/prebuilts/android-emulator" />
 
   <remove-project name="platform/prebuilts/clang/host/darwin-x86"/>
@@ -20,11 +19,14 @@
   <remove-project name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
   <remove-project name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" />
   <remove-project name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" />
+-->
   <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" />
 
+<!--
   <remove-project name="platform/prebuilts/gdb/darwin-x86"/>
   <remove-project name="platform/prebuilts/go/darwin-x86"/>
   <remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
+-->
   
   <remove-project name="platform/prebuilts/gradle-plugin" />
   <remove-project name="platform/prebuilts/libs/libedit" />
@@ -38,14 +40,15 @@
   <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="packages_apps_Camera2" />
+  <remove-project name="platform/packages/apps/Camera2" />
   <project path="packages/apps/Camera2" name="jenslody/android_packages_apps_Camera2.git" remote="gitlab" revision="lineage-15.1" groups="pdk-fs" />
 
+
   <remove-project name="frameworks_av" />
   <project path="frameworks/av" name="jenslody/android_frameworks_av.git" remote="gitlab" revision="oreo.1" groups="pdk" />
-
+-->
+<!--
 
   <remove-project name="build" />
   <project path="build/make" name="jenslody/build.git" remote="gitlab" revision="oreo.1" >
@@ -58,23 +61,25 @@
     <linkfile src="tools" dest="build/tools" />
   </project>
 
-
+-->
+<!--
   <remove-project name="frameworks_base" />
   <project path="frameworks/base" name="jenslody/frameworks_base-1.git" remote="gitlab" revision="oreo.1" groups="pdk" />
-
   <remove-project name="vendor_bootleggers" />
   <project path="vendor/bootleggers" name="jenslody/vendor_bootleggers.git" remote="gitlab" revision="oreo.1" />
 
   <remove-project name="packages_apps_Settings" />
   <project path="packages/apps/Settings" name="jenslody/packages_apps_Settings-1.git" remote="gitlab" revision="oreo.1" groups="pdk-fs" />
+-->
 
   <!-- 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" />
-
+-->
+  <project path="device/qcom/sepolicy" name="LineageOS/android_device_qcom_sepolicy" remote="github" revision="lineage-16.0" groups="pdk" />
+<!--
   <remove-project name="packages_apps_WolvesDen" />
   <project path="packages/apps/WolvesDen" name="jenslody/packages_apps_WolvesDen" remote="gitlab" revision="8.1" />
 
@@ -85,32 +90,38 @@
 -->
  
 <!-- Samsung Hardware Repo -->
-  <project path="hardware/samsung" name="jenslody/android_hardware_samsung.git" remote="gitlab" revision="lineage-15.1" />
-
+  <project path="hardware/samsung" name="jenslody/android_hardware_samsung.git" remote="gitlab" revision="lineage-16.0" />
+ 
  <!-- Samsung MSM8916 Common Repos -->
-  <project path="device/samsung/qcom-common" name="jenslody/android_device_samsung_qcom-common.git" remote="gitlab" groups="device" revision="lineage-15.1" />
+  <project path="device/samsung/qcom-common" name="jenslody/android_device_samsung_qcom-common.git" remote="gitlab" groups="device" revision="lineage-16.0" />
 
  <!-- 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.git" groups="device" remote="gitlab" revision="oreo.1" />
-  <project path="device/samsung/j5ltechn" name="jenslody/android_device_samsung_j5ltechn.git" groups="device" remote="gitlab" revision="oreo.1" />
-  <project path="device/samsung/j5lte" name="jenslody/android_device_samsung_j5lte.git" groups="device" remote="gitlab" revision="oreo.1" />
-  <project path="device/samsung/j53gxx" name="jenslody/android_device_samsung_j53gxx.git" groups="device" remote="gitlab" revision="oreo.1" />
-  <project path="device/samsung/j5-common" name="jenslody/android_device_samsung_j5-common.git" groups="device" remote="gitlab" revision="lineage-15.1" />
+  <project path="device/samsung/j5nlte" name="jenslody/android_device_samsung_j5nlte.git" groups="device" remote="gitlab" revision="pie" />
+  <project path="device/samsung/j5ltechn" name="jenslody/android_device_samsung_j5ltechn.git" groups="device" remote="gitlab" revision="pie" />
+  <project path="device/samsung/j5lte" name="jenslody/android_device_samsung_j5lte.git" groups="device" remote="gitlab" revision="pie" />
+  <project path="device/samsung/j5-common" name="jenslody/android_device_samsung_j5-common.git" groups="device" remote="gitlab" revision="lineage-16.0" />
 
-<!-- -->
+<!--
   <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" />
-
+  <project path="hardware/qcom/audio-caf/msm8916" name="Galaxy-MSM8916/android_hardware_qcmsm8916-commonom_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" />
+-->
+  <project path="vendor/qcom/opensource/audio" name="LineageOS/android_vendor_qcom_opensource_audio" remote="github" revision="lineage-16.0" />
 
+<!--
   <project path="packages/apps/OTAUpdates" name="jenslody/OTAUpdates.git" remote="gitlab" revision="oreo.1" />
+-->
+ <!-- TWRP
+  <remove-project name="bootable_recovery"/>
+  <project path="bootable/recovery-twrp" name="omnirom/android_bootable_recovery" remote="github" revision="android-9.0"/>
+ -->
 
- <!-- TWRP -->
 <!--
- <project path="bootable/recovery-twrp" name="omnirom/android_bootable_recovery" remote="github" revision="android-8.1"/>
+  <project path="bootable/recovery-twrp" name="Galaxy-MSM8916/android_bootable_recovery" remote="github" revision="android-8.1"/>
 -->
-
   <!-- A3 Device Trees -->
 <!--
   <project path="device/samsung/a3lte" name="Galaxy-MSM8916/android_device_samsung_a3lte" groups="device" remote="Galaxy-MSM8916"/>
@@ -144,9 +155,13 @@
   <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" groups="pdk-fs" remote="aosp" revision="master" />
 
  <!-- (J510FN - j5xnlte) -->
-<!--
+<!-- 
   <project path="device/samsung/j5x-common" name="Galaxy-MSM8916/android_device_samsung_j5x-common" groups="device" remote="Galaxy-MSM8916"/>
   <project path="device/samsung/j5xnlte" name="Galaxy-MSM8916/android_device_samsung_j5xnlte" groups="device" remote="Galaxy-MSM8916"/>
+-->
+<!-- O7 
+  <project path="device/samsung/o7-common" name="Galaxy-MSM8916/android_device_samsung_o7-common" groups="device" remote="Galaxy-MSM8916"/>
+  <project path="device/samsung/o7prolte" name="Galaxy-MSM8916/android_device_samsung_o7prolte" groups="device" remote="Galaxy-MSM8916"/>
 -->
  <!-- Galaxy J7 Device Tree SM-J700P -->
 <!--
@@ -160,15 +175,29 @@
   <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="github" 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-2018-08-17" />
+-->
+  <project path="device/samsung/msm8916-common" name="Galaxy-MSM8916/android_device_samsung_msm8916-common" groups="device" remote="Galaxy-MSM8916" />
 
  <!-- 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" groups="pdk,linux,arm"  remote="github" revision="master"/>
 
- <!-- Dependencies -->
-<!--  <project path="external/toybox" name="omnirom/android_external_toybox" remote="github" revision="android-8.1"/> -->
-<!--  <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" />
+ <!-- Dependencies 
+  <remove-project name="android_external_toybox" />
+  <project path="external/toybox" name="omnirom/android_external_toybox" remote="github" revision="android-8.1"/>
+-->
+<!-- -->
+<!-- -->
+  <project path="external/sony/boringssl-compat" name="LineageOS/android_external_sony_boringssl-compat" remote="github" revision="lineage-16.0" />
+<!--
+  <project path="external/busybox" name="omnirom/android_external_busybox" remote="github" revision="android-8.1"/>
+ -->
+
+<!--
+  <project path="external/ntfs-3g" name="LineageOS/android_external_ntfs-3g" remote="github" revision="lineage-15.1"/>
+-->
+  <project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" remote="github" revision="lineage-16.0" />
   
  <!-- Common Samsung MSM8916 Kernel -->
   <project path="kernel/samsung/msm8916" name="Galaxy-MSM8916/android_kernel_samsung_msm8916" remote="Galaxy-MSM8916"/>