diff --git a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.kt b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.kt
index d290d13..73ca387 100755
--- a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.kt
+++ b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.kt
@@ -410,7 +410,7 @@ open class CameraLightSensorService : Service() {
 
     companion object {
         protected val TAG: String = CameraLightSensorService::class.java.simpleName
-        const val DEBUG = true
+        const val DEBUG = false
         protected const val CAMERA_CHOICE = CameraCharacteristics.LENS_FACING_FRONT
         private const val DELAY = 5 * 1000 // 5 Seconds
         fun BatteryOptimization(context: Context?) {
@@ -425,4 +425,4 @@ open class CameraLightSensorService : Service() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml b/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml
index 6e3bdee..748c4d8 100644
--- a/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml
+++ b/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml
@@ -20,8 +20,8 @@
             android:icon="@drawable/ic_sound" >
             <intent
                 android:action="android.intent.action.MAIN"
-                android:targetClass="com.eurekateam.samsungextras.ClearSpeakerActivity"
-                android:targetPackage="com.eurekateam.samsungextras.speaker" />
+                android:targetClass=".speaker.ClearSpeakerActivity"
+                android:targetPackage="com.eurekateam.samsungextras" />
         </Preference>
         <Preference
             android:key="dolby_settings"
@@ -30,7 +30,7 @@
             android:icon="@drawable/ic_speaker_cleaner_icon" >
             <intent
                 android:action="android.intent.action.MAIN"
-                android:targetClass="com.eurekateam.samsungextras.dolby.DolbyActivity"
+                android:targetClass=".dolby.DolbyActivity"
                 android:targetPackage="com.eurekateam.samsungextras" />
         </Preference>
     </PreferenceCategory>
@@ -44,8 +44,8 @@
             android:icon="@drawable/ic_led" >
             <intent
                 android:action="android.intent.action.MAIN"
-                android:targetClass="com.eurekateam.samsungextras.FlashLightActivity"
-                android:targetPackage="com.eurekateam.samsungextras.flashlight" />
+                android:targetClass=".flashlight.FlashLightActivity"
+                android:targetPackage="com.eurekateam.samsungextras" />
         </Preference>
     </PreferenceCategory>
     <PreferenceCategory
@@ -69,8 +69,8 @@
             android:persistent="true">
         <intent
             android:action="android.intent.action.MAIN"
-            android:targetClass="com.eurekateam.samsungextras.FastChargeActivity"
-            android:targetPackage="com.eurekateam.samsungextras.fastcharge" />
+            android:targetClass=".fastcharge.FastChargeActivity"
+            android:targetPackage="com.eurekateam.samsungextras" />
         </Preference>
 
     </PreferenceCategory>
diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh
index 584f191..34baacb 100644
--- a/universal7885-common/vendorsetup.sh
+++ b/universal7885-common/vendorsetup.sh
@@ -1,7 +1,7 @@
 git clone  git@github.com:eurekadevelopment/android_vendor_samsung_a20_r.git vendor/samsung -b master
 #git clone git@github.com:eurekadevelopment/android_device_samsung_a20_r.git device/samsung
 rm -rf hardware/samsung
-git clone git@github.com:eurekadevelopment/android_hardware_samsung.git hardware/samsung -b NUKED_ALL
+git clone git@github.com:eurekadevelopment/android_hardware_samsung.git hardware/samsung -b NUKE_ALL
 git clone git@github.com:eurekadevelopment/Eureka-Kernel-Exynos7885-Q-R-S-private.git kernel/samsung/exynos7885 --depth=1 -b R8.0_rom
 git clone https://github.com/lineageos/android_hardware_samsung_nfc hardware/samsung/nfc
 git clone https://github.com/lineageos/android_hardware_samsung_slsi_libbt hardware/samsung_slsi/libbt