diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml b/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
deleted file mode 100644
index 6e52d2c6..00000000
--- a/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015 The Android Open Source Project
-**           2017 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.
-*/
--->
-
-<resources>
-    <!-- IDs for each color mode. The values must match the corresponding constants in
-         android.view.Display -->
-    <integer-array name="color_mode_ids">
-        <item>0</item>
-        <item>-1</item>
-        <item>-1</item>
-    </integer-array>
-</resources>
diff --git a/rro_overlays/CarrierConfigOverlay/Android.bp b/rro_overlays/CarrierConfigOverlay/Android.bp
new file mode 100644
index 00000000..5f37cf9f
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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.
+//
+
+runtime_resource_overlay {
+    name: "CarrierConfigOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..d3d41315
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.carrierconfig.overlay">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.carrierconfig"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
similarity index 100%
rename from overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
rename to rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
diff --git a/rro_overlays/DialerOverlay/Android.bp b/rro_overlays/DialerOverlay/Android.bp
new file mode 100644
index 00000000..1ede11c7
--- /dev/null
+++ b/rro_overlays/DialerOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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.
+//
+
+runtime_resource_overlay {
+    name: "DialerOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/DialerOverlay/AndroidManifest.xml b/rro_overlays/DialerOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..4c9928c5
--- /dev/null
+++ b/rro_overlays/DialerOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.overlay">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.dialer"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/rro_overlays/DialerOverlay/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
rename to rro_overlays/DialerOverlay/res/values/config.xml
diff --git a/rro_overlays/FrameworksOverlay/Android.bp b/rro_overlays/FrameworksOverlay/Android.bp
new file mode 100644
index 00000000..9ac1202e
--- /dev/null
+++ b/rro_overlays/FrameworksOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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.
+//
+
+runtime_resource_overlay {
+    name: "FrameworksOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/FrameworksOverlay/AndroidManifest.xml b/rro_overlays/FrameworksOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..94f67db3
--- /dev/null
+++ b/rro_overlays/FrameworksOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.frameworks.overlay">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc234-mnc15-en-rGB/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rGB/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc234-mnc15-en-rGB/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rGB/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc234-mnc15-en-rIN/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rIN/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc234-mnc15-en-rIN/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rIN/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc234-mnc15/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc234-mnc15/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc02-en-rGB/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rGB/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc02-en-rGB/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rGB/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc02-en-rIN/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rIN/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc02-en-rIN/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rIN/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc02/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc02/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc04-en-rGB/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rGB/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc04-en-rGB/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rGB/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc04-en-rIN/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rIN/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc04-en-rIN/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rIN/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc04/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc04/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc09-en-rGB/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rGB/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc09-en-rGB/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rGB/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc09-en-rIN/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rIN/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc09-en-rIN/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rIN/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc09/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc262-mnc09/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc004/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc310-mnc004/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc310-mnc004/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc120/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc310-mnc120/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc260/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc310-mnc260/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc410/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc310-mnc410/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc311-mnc480/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc311-mnc480/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc312-mnc530/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc312-mnc530/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc312-mnc530/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc312-mnc530/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc313-mnc100/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc313-mnc100/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc313-mnc100/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc313-mnc100/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc460-mnc03/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc460-mnc03/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc460-mnc03/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc460-mnc03/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values-mcc460-mnc11/config.xml b/rro_overlays/FrameworksOverlay/res/values-mcc460-mnc11/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values-mcc460-mnc11/config.xml
rename to rro_overlays/FrameworksOverlay/res/values-mcc460-mnc11/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/rro_overlays/FrameworksOverlay/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to rro_overlays/FrameworksOverlay/res/values/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values/strings.xml b/rro_overlays/FrameworksOverlay/res/values/strings.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/strings.xml
rename to rro_overlays/FrameworksOverlay/res/values/strings.xml
diff --git a/rro_overlays/SettingsOverlay/Android.bp b/rro_overlays/SettingsOverlay/Android.bp
new file mode 100644
index 00000000..c3c068cf
--- /dev/null
+++ b/rro_overlays/SettingsOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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.
+//
+
+runtime_resource_overlay {
+    name: "SettingsOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/SettingsOverlay/AndroidManifest.xml b/rro_overlays/SettingsOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..22a672d7
--- /dev/null
+++ b/rro_overlays/SettingsOverlay/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.settings"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
+
diff --git a/overlay/packages/apps/Settings/res/values/arrays.xml b/rro_overlays/SettingsOverlay/res/values/arrays.xml
similarity index 100%
rename from overlay/packages/apps/Settings/res/values/arrays.xml
rename to rro_overlays/SettingsOverlay/res/values/arrays.xml
diff --git a/rro_overlays/SettingsProviderOverlay/Android.bp b/rro_overlays/SettingsProviderOverlay/Android.bp
new file mode 100644
index 00000000..40ae5eb4
--- /dev/null
+++ b/rro_overlays/SettingsProviderOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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.
+//
+
+runtime_resource_overlay {
+    name: "SettingsProviderOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/SettingsProviderOverlay/AndroidManifest.xml b/rro_overlays/SettingsProviderOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..4f31e673
--- /dev/null
+++ b/rro_overlays/SettingsProviderOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settingsprovider.overlay">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.providers.settings"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/rro_overlays/SettingsProviderOverlay/res/values/defaults.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to rro_overlays/SettingsProviderOverlay/res/values/defaults.xml
diff --git a/rro_overlays/SystemUIOverlay/Android.bp b/rro_overlays/SystemUIOverlay/Android.bp
new file mode 100644
index 00000000..a4029e76
--- /dev/null
+++ b/rro_overlays/SystemUIOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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.
+//
+
+runtime_resource_overlay {
+    name: "SystemUIOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/SystemUIOverlay/AndroidManifest.xml b/rro_overlays/SystemUIOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..7ea74ef9
--- /dev/null
+++ b/rro_overlays/SystemUIOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.systemui.overlay">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.systemui"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml b/rro_overlays/SystemUIOverlay/res/values-sw600dp/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml
rename to rro_overlays/SystemUIOverlay/res/values-sw600dp/dimens.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/rro_overlays/SystemUIOverlay/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/config.xml
rename to rro_overlays/SystemUIOverlay/res/values/config.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/rro_overlays/SystemUIOverlay/res/values/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
rename to rro_overlays/SystemUIOverlay/res/values/dimens.xml
diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp
new file mode 100644
index 00000000..7d61e9e7
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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.
+//
+
+runtime_resource_overlay {
+    name: "TelephonyOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..a41438da
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.phone.overlay">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.phone"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/rro_overlays/TelephonyOverlay/res/values/config.xml
similarity index 100%
rename from overlay/packages/services/Telephony/res/values/config.xml
rename to rro_overlays/TelephonyOverlay/res/values/config.xml
diff --git a/overlay/packages/services/Telephony/res/values/strings.xml b/rro_overlays/TelephonyOverlay/res/values/strings.xml
similarity index 100%
rename from overlay/packages/services/Telephony/res/values/strings.xml
rename to rro_overlays/TelephonyOverlay/res/values/strings.xml
diff --git a/sdm660.mk b/sdm660.mk
index 29c7e948..ff4345e2 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -382,6 +382,15 @@ PRODUCT_PACKAGES += \
 DEVICE_PACKAGE_OVERLAYS += \
     $(COMMON_PATH)/overlay
 
+PRODUCT_PACKAGES += \
+    CarrierConfigOverlay \
+    DialerOverlay \
+    FrameworksOverlay \
+    SettingsOverlay \
+    SettingsProviderOverlay \
+    SystemUIOverlay \
+    TelephonyOverlay
+
 # RRO configuration
 TARGET_USES_RRO := true