diff --git a/device.mk b/device.mk
index ef77528..2096686 100644
--- a/device.mk
+++ b/device.mk
@@ -36,9 +36,12 @@ PRODUCT_PACKAGES += \
     vendor.xiaomi.hardware.motor@1.0.vendor
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+PRODUCT_PACKAGES += \
+    ApertureOverlayDevice \
+    FrameworkResOverlayDevice \
+    LineageSystemUIOverlayDevice \
+    SettingsOverlayDevice \
+    SystemUIOverlayDevice
 
 # Shipping API level
 PRODUCT_SHIPPING_API_LEVEL := 28
diff --git a/rro_overlays/ApertureOverlayDevice/Android.bp b/rro_overlays/ApertureOverlayDevice/Android.bp
new file mode 100644
index 0000000..35736bb
--- /dev/null
+++ b/rro_overlays/ApertureOverlayDevice/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "ApertureOverlayDevice",
+    vendor: true,
+}
diff --git a/rro_overlays/ApertureOverlayDevice/AndroidManifest.xml b/rro_overlays/ApertureOverlayDevice/AndroidManifest.xml
new file mode 100644
index 0000000..1d00c9a
--- /dev/null
+++ b/rro_overlays/ApertureOverlayDevice/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.lineageos.aperture.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="org.lineageos.aperture" />
+
+</manifest>
diff --git a/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml b/rro_overlays/ApertureOverlayDevice/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
rename to rro_overlays/ApertureOverlayDevice/res/values/config.xml
diff --git a/rro_overlays/FrameworkResOverlayDevice/Android.bp b/rro_overlays/FrameworkResOverlayDevice/Android.bp
new file mode 100644
index 0000000..906bfcd
--- /dev/null
+++ b/rro_overlays/FrameworkResOverlayDevice/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "FrameworkResOverlayDevice",
+    vendor: true,
+}
diff --git a/rro_overlays/FrameworkResOverlayDevice/AndroidManifest.xml b/rro_overlays/FrameworkResOverlayDevice/AndroidManifest.xml
new file mode 100644
index 0000000..252ebfd
--- /dev/null
+++ b/rro_overlays/FrameworkResOverlayDevice/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="android" />
+
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/rro_overlays/FrameworkResOverlayDevice/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to rro_overlays/FrameworkResOverlayDevice/res/values/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/rro_overlays/FrameworkResOverlayDevice/res/values/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/dimens.xml
rename to rro_overlays/FrameworkResOverlayDevice/res/values/dimens.xml
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/rro_overlays/FrameworkResOverlayDevice/res/xml/power_profile.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/xml/power_profile.xml
rename to rro_overlays/FrameworkResOverlayDevice/res/xml/power_profile.xml
diff --git a/rro_overlays/LineageSystemUIOverlayDevice/Android.bp b/rro_overlays/LineageSystemUIOverlayDevice/Android.bp
new file mode 100644
index 0000000..a170e7a
--- /dev/null
+++ b/rro_overlays/LineageSystemUIOverlayDevice/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "LineageSystemUIOverlayDevice",
+    vendor: true,
+}
diff --git a/rro_overlays/LineageSystemUIOverlayDevice/AndroidManifest.xml b/rro_overlays/LineageSystemUIOverlayDevice/AndroidManifest.xml
new file mode 100644
index 0000000..080eb27
--- /dev/null
+++ b/rro_overlays/LineageSystemUIOverlayDevice/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.systemui.overlay.lineage.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="250"
+        android:targetPackage="com.android.systemui" />
+
+</manifest>
diff --git a/overlay-lineage/frameworks/base/packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png b/rro_overlays/LineageSystemUIOverlayDevice/res/drawable-nodpi/udfps_icon_pressed.png
similarity index 100%
rename from overlay-lineage/frameworks/base/packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png
rename to rro_overlays/LineageSystemUIOverlayDevice/res/drawable-nodpi/udfps_icon_pressed.png
diff --git a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml b/rro_overlays/LineageSystemUIOverlayDevice/res/values/config.xml
similarity index 100%
rename from overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml
rename to rro_overlays/LineageSystemUIOverlayDevice/res/values/config.xml
diff --git a/rro_overlays/SettingsOverlayDevice/Android.bp b/rro_overlays/SettingsOverlayDevice/Android.bp
new file mode 100644
index 0000000..1920a61
--- /dev/null
+++ b/rro_overlays/SettingsOverlayDevice/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsOverlayDevice",
+    vendor: true,
+}
diff --git a/rro_overlays/SettingsOverlayDevice/AndroidManifest.xml b/rro_overlays/SettingsOverlayDevice/AndroidManifest.xml
new file mode 100644
index 0000000..45365b0
--- /dev/null
+++ b/rro_overlays/SettingsOverlayDevice/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="com.android.settings" />
+
+</manifest>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/rro_overlays/SettingsOverlayDevice/res/values/config.xml
similarity index 100%
rename from overlay/packages/apps/Settings/res/values/config.xml
rename to rro_overlays/SettingsOverlayDevice/res/values/config.xml
diff --git a/rro_overlays/SystemUIOverlayDevice/Android.bp b/rro_overlays/SystemUIOverlayDevice/Android.bp
new file mode 100644
index 0000000..4bfce23
--- /dev/null
+++ b/rro_overlays/SystemUIOverlayDevice/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SystemUIOverlayDevice",
+    vendor: true,
+}
diff --git a/rro_overlays/SystemUIOverlayDevice/AndroidManifest.xml b/rro_overlays/SystemUIOverlayDevice/AndroidManifest.xml
new file mode 100644
index 0000000..b1d712c
--- /dev/null
+++ b/rro_overlays/SystemUIOverlayDevice/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.systemui.overlay.device">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="com.android.systemui" />
+
+</manifest>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/rro_overlays/SystemUIOverlayDevice/res/values/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
rename to rro_overlays/SystemUIOverlayDevice/res/values/dimens.xml