diff --git a/dap/Android.bp b/universal7885-common/dap/Android.bp
similarity index 100%
rename from dap/Android.bp
rename to universal7885-common/dap/Android.bp
diff --git a/dap/AndroidManifest.xml b/universal7885-common/dap/AndroidManifest.xml
similarity index 100%
rename from dap/AndroidManifest.xml
rename to universal7885-common/dap/AndroidManifest.xml
diff --git a/dap/proguard.flags b/universal7885-common/dap/proguard.flags
similarity index 100%
rename from dap/proguard.flags
rename to universal7885-common/dap/proguard.flags
diff --git a/dap/src/org/lineageos/dap/BootCompletedReceiver.kt b/universal7885-common/dap/src/org/lineageos/dap/BootCompletedReceiver.kt
similarity index 100%
rename from dap/src/org/lineageos/dap/BootCompletedReceiver.kt
rename to universal7885-common/dap/src/org/lineageos/dap/BootCompletedReceiver.kt
diff --git a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
index ebcf53c..a243fcc 100644
--- a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -56,4 +56,27 @@
     <string-array name="config_biometric_sensors" translatable="false" >
         <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
     </string-array>
+
+    <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
+    <bool name="config_unplugTurnsOnScreen">true</bool>
+
+    <!-- Control the behavior when the user long presses the power button.
+		0 - Nothing
+                1 - Global actions menu
+                2 - Power off (with confirmation)
+                3 - Power off (without confirmation)
+                4 - Go to voice assist
+                5 - Go to assistant (Settings.Secure.ASSISTANT)	        -->
+    <integer name="config_longPressOnPowerBehavior">1</integer>
+
+    <!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
+     <integer name="config_shutdownBatteryTemperature">600</integer>
+
+    <!-- From Stock framework-res.apk: -->
+    <bool name="config_enableBurnInProtection">false</bool>
+    <bool name="config_enableMultiUserUI">false</bool>
+    <bool name="config_enableNightMode">true</bool>
+    <bool name="config_pinnerAssistantApp">false</bool>
+    <bool name="config_pinnerCameraApp">false</bool>
+    <bool name="config_pinnerHomeApp">false</bool>
 </resources>
diff --git a/usb/Android.bp b/universal7885-common/usb/Android.bp
similarity index 100%
rename from usb/Android.bp
rename to universal7885-common/usb/Android.bp
diff --git a/usb/Usb.cpp b/universal7885-common/usb/Usb.cpp
similarity index 100%
rename from usb/Usb.cpp
rename to universal7885-common/usb/Usb.cpp
diff --git a/usb/Usb.h b/universal7885-common/usb/Usb.h
similarity index 100%
rename from usb/Usb.h
rename to universal7885-common/usb/Usb.h
diff --git a/usb/android.hardware.usb@1.1-service.typec.rc b/universal7885-common/usb/android.hardware.usb@1.1-service.typec.rc
similarity index 100%
rename from usb/android.hardware.usb@1.1-service.typec.rc
rename to universal7885-common/usb/android.hardware.usb@1.1-service.typec.rc
diff --git a/usb/android.hardware.usb@1.1-service.typec.xml b/universal7885-common/usb/android.hardware.usb@1.1-service.typec.xml
similarity index 100%
rename from usb/android.hardware.usb@1.1-service.typec.xml
rename to universal7885-common/usb/android.hardware.usb@1.1-service.typec.xml
diff --git a/usb/service.cpp b/universal7885-common/usb/service.cpp
similarity index 100%
rename from usb/service.cpp
rename to universal7885-common/usb/service.cpp