diff --git a/device.mk b/device.mk
index 3a8787f..112ade1 100644
--- a/device.mk
+++ b/device.mk
@@ -31,8 +31,9 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/com.nxp.mifare.xml
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay
+PRODUCT_PACKAGES += \
+    MiatollFrameworks \
+    MiatollSystemUI
 
 # Rootdir
 PRODUCT_PACKAGES += \
diff --git a/overlay/MiatollFrameworks/Android.bp b/overlay/MiatollFrameworks/Android.bp
new file mode 100644
index 0000000..729e279
--- /dev/null
+++ b/overlay/MiatollFrameworks/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "MiatollFrameworks",
+    vendor: true,
+}
diff --git a/overlay/MiatollFrameworks/AndroidManifest.xml b/overlay/MiatollFrameworks/AndroidManifest.xml
new file mode 100644
index 0000000..25abe66
--- /dev/null
+++ b/overlay/MiatollFrameworks/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.miatoll">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="300"
+        android:targetPackage="android" />
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/MiatollFrameworks/res/values/config.xml
similarity index 94%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to overlay/MiatollFrameworks/res/values/config.xml
index 0868f94..20fc7d9 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/MiatollFrameworks/res/values/config.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2021 The LineageOS Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
 
@@ -252,4 +244,5 @@
         <item>760</item>  <!-- sensorLocationY -->
         <item>100</item>  <!-- sensorRadius -->
     </array>
+
 </resources> 
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/MiatollFrameworks/res/values/dimens.xml
similarity index 54%
rename from overlay/frameworks/base/core/res/res/values/dimens.xml
rename to overlay/MiatollFrameworks/res/values/dimens.xml
index 343ef27..58425a7 100644
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/overlay/MiatollFrameworks/res/values/dimens.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2021 The LineageOS Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
+
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">102px</dimen>
 
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/MiatollFrameworks/res/xml/power_profile.xml
similarity index 96%
rename from overlay/frameworks/base/core/res/res/xml/power_profile.xml
rename to overlay/MiatollFrameworks/res/xml/power_profile.xml
index a1c416a..60c8c0c 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/MiatollFrameworks/res/xml/power_profile.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<device xmlns:android="http://schemas.android.com/apk/res/android" name="Android">
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
     <item name="battery.capacity">5020</item>
     <array name="cpu.clusters.cores">
         <value>6</value>
diff --git a/overlay/MiatollSystemUI/Android.bp b/overlay/MiatollSystemUI/Android.bp
new file mode 100644
index 0000000..c8d2223
--- /dev/null
+++ b/overlay/MiatollSystemUI/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "MiatollSystemUI",
+    vendor: true,
+}
diff --git a/overlay/MiatollSystemUI/AndroidManifest.xml b/overlay/MiatollSystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..b8e22a7
--- /dev/null
+++ b/overlay/MiatollSystemUI/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.systemui.miatoll">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="300"
+        android:targetPackage="com.android.systemui" />
+</manifest>
diff --git a/overlay/MiatollSystemUI/res/values/dimens.xml b/overlay/MiatollSystemUI/res/values/dimens.xml
new file mode 100644
index 0000000..3923448
--- /dev/null
+++ b/overlay/MiatollSystemUI/res/values/dimens.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <dimen name="rounded_corner_content_padding">16dp</dimen>
+
+    <!-- Location on the screen of the center of the physical power button. -->
+    <dimen name="physical_power_button_center_screen_location_y">760px</dimen>
+
+    <!-- Location on the screen of the center of the fingerprint sensor. -->
+    <dimen name="physical_fingerprint_sensor_center_screen_location_x">1080px</dimen>
+    <dimen name="physical_fingerprint_sensor_center_screen_location_y">760px</dimen>
+
+</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
deleted file mode 100644
index eaeaccb..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2006, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
--->
-<resources>
-    <dimen name="rounded_corner_content_padding">16dp</dimen>
-
-    <!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">760px</dimen>
-
-    <!-- Location on the screen of the center of the fingerprint sensor. -->
-    <dimen name="physical_fingerprint_sensor_center_screen_location_x">1080px</dimen>
-    <dimen name="physical_fingerprint_sensor_center_screen_location_y">760px</dimen>
-
-</resources>