diff --git a/config/common.mk b/config/common.mk
index 87fa024a4273fd17165875e8d7a62c5be8911e86..846c9c9bf441585dcc483647139fee99ff74ba08 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -14,6 +14,9 @@
 
 VENDOR_PATH := vendor/eos
 
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
+    system/%
+
 # /e/ OS packages
 PRODUCT_PACKAGES += \
     eSpeakTTS \
@@ -59,8 +62,11 @@ PRODUCT_PACKAGES += \
 endif
 
 # Overlays
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += $(VENDOR_PATH)/overlay/no-rro
+
 DEVICE_PACKAGE_OVERLAYS += \
-    $(VENDOR_PATH)/overlay
+    $(VENDOR_PATH)/overlay/common \
+    $(VENDOR_PATH)/overlay/no-rro
 
 # Permissions
 PRODUCT_COPY_FILES += \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to overlay/common/frameworks/base/core/res/res/values/config.xml
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values/strings.xml b/overlay/common/frameworks/base/packages/SettingsLib/res/values/strings.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SettingsLib/res/values/strings.xml
rename to overlay/common/frameworks/base/packages/SettingsLib/res/values/strings.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/flags.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/flags.xml
rename to overlay/common/frameworks/base/packages/SystemUI/res/values/flags.xml
diff --git a/overlay/packages/apps/PackageInstaller/res/values/strings.xml b/overlay/common/packages/apps/PackageInstaller/res/values/strings.xml
similarity index 100%
rename from overlay/packages/apps/PackageInstaller/res/values/strings.xml
rename to overlay/common/packages/apps/PackageInstaller/res/values/strings.xml
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
similarity index 100%
rename from overlay/packages/apps/Settings/res/values/config.xml
rename to overlay/common/packages/apps/Settings/res/values/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values/colors.xml b/overlay/frameworks/base/core/res/res/values/colors.xml
deleted file mode 100644
index ac81bce20b19a73cd92d96fc08dd2d47d216e604..0000000000000000000000000000000000000000
--- a/overlay/frameworks/base/core/res/res/values/colors.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021  E FOUNDATION
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <!-- Accent colors -->
-    <color name="accent_material_light">#0086FF</color>
-    <color name="accent_material_dark">#5DB2FF</color>
-
-    <!-- Primary and Secondary text -->
-    <color name="bright_foreground_holo_dark">#DEFFFFFF</color>
-    <color name="bright_foreground_holo_light">#DE000000</color>
-    <color name="dim_foreground_holo_dark">#99FFFFFF</color>
-    <color name="dim_foreground_holo_light">#99000000</color>
-
-    <!-- Background color -->
-    <color name="background_material_dark">#121212</color>
-    <color name="background_material_light">#FAFAFA</color>
-
-    <!-- Dialog/Popup colors -->
-    <color name="background_floating_material_dark">#1E1E1E</color>
-    <color name="background_floating_material_light">#FFFFFF</color>
-
-    <!-- Action/Status Bar colors colorPrimary and colorPrimarDark -->
-    <color name="primary_material_dark">#272727</color>
-    <color name="primary_material_light">#FFFFFF</color>
-    <color name="primary_dark_material_dark">#272727</color>
-    <color name="primary_dark_material_light">#FFFFFF</color>
-
-    <!-- User account colors from Rich color palette -->
-    <color name="user_icon_1">#0F94F6</color><!-- Blue -->
-    <color name="user_icon_2">#44B04C</color><!-- Green -->
-    <color name="user_icon_3">#AFD83D</color><!-- Chartreuse -->
-    <color name="user_icon_4">#FF7A00</color><!-- Orange -->
-    <color name="user_icon_5">#ED1C61</color><!-- Magenta -->
-    <color name="user_icon_6">#5754DC</color><!-- Violet -->
-    <color name="user_icon_7">#00B4B4</color><!-- Aqua -->
-    <color name="user_icon_8">#FFC300</color><!-- Amber -->
-    <color name="user_icon_default_gray">#008D96</color><!-- Teal for guest account -->
-
-</resources>
diff --git a/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml b/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7eeaeebbcd2e4dbcf72642fc7d30a8f3d8dfd817
--- /dev/null
+++ b/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <color name="sud_dynamic_color_accent_glif_v3_light">@*android:color/accent_device_default</color>
+    <color name="sud_dynamic_color_accent_glif_v3_dark">@*android:color/accent_device_default</color>
+</resources>
diff --git a/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml b/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ad17c1580a4e6854ff02d27faf6f7189a80b2bb
--- /dev/null
+++ b/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <style name="SudFullDynamicColorThemeGlifV3" parent="SudDynamicColorThemeGlifV3">
+    <item name="android:windowBackground">@*android:color/background_device_default_dark</item>
+    <item name="android:colorForeground">@android:color/system_neutral1_50</item>
+    <item name="android:colorForegroundInverse">@*android:color/background_device_default_dark</item>
+    <item name="android:colorBackground">@*android:color/background_device_default_dark</item>
+    <item name="android:colorBackgroundCacheHint">@*android:color/background_device_default_dark</item>
+    <item name="colorBackgroundFloating">@*android:color/background_floating_device_default_dark</item>
+    <item name="android:navigationBarColor">@*android:color/surface_header_dark</item>
+
+    <item name="android:textColorPrimary">@color/sud_system_primary_text</item>
+    <item name="android:textColorSecondary">@color/sud_system_secondary_text</item>
+    <item name="android:textColorTertiary">@color/sud_system_tertiary_text_inactive</item>
+    <item name="android:textColorPrimaryDisableOnly">@color/sud_system_tertiary_text_inactive</item>
+    <item name="android:textColorPrimaryInverseDisableOnly">@color/sud_system_tertiary_text_inactive</item>
+
+    <item name="colorControlNormal">?android:attr/textColorSecondary</item>
+    <item name="colorControlHighlight">@color/ripple_material_dark</item>
+    <item name="colorButtonNormal">@color/button_material_dark</item>
+    <item name="colorSwitchThumbNormal">@color/switch_thumb_material_dark</item>
+
+    <item name="alertDialogTheme">@style/SudFullDynamicColorAlertDialogThemeCompat</item>
+
+    <item name="sucFullDynamicColor">true</item>
+  </style>
+
+  <style name="SudFullDynamicColorThemeGlifV3.Light" parent="SudDynamicColorThemeGlifV3.Light">
+    <item name="android:windowBackground">@*android:color/background_device_default_light</item>
+    <item name="android:colorForeground">@android:color/system_neutral1_900</item>
+    <item name="android:colorForegroundInverse">@*android:color/background_device_default_light</item>
+    <item name="android:colorBackground">@*android:color/background_device_default_light</item>
+    <item name="android:colorBackgroundCacheHint">@*android:color/background_device_default_light</item>
+    <item name="colorBackgroundFloating">@*android:color/background_floating_device_default_light</item>
+    <item name="android:navigationBarColor">@*android:color/surface_header_light</item>
+
+    <item name="android:textColorPrimary">@color/sud_system_primary_text</item>
+    <item name="android:textColorSecondary">@color/sud_system_secondary_text</item>
+    <item name="android:textColorTertiary">@color/sud_system_tertiary_text_inactive</item>
+    <item name="android:textColorPrimaryDisableOnly">@color/sud_system_tertiary_text_inactive</item>
+
+    <item name="colorControlNormal">?android:attr/textColorSecondary</item>
+    <item name="colorControlHighlight">@color/ripple_material_light</item>
+    <item name="colorButtonNormal">@color/button_material_light</item>
+    <item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item>
+
+    <item name="alertDialogTheme">@style/SudFullDynamicColorAlertDialogThemeCompat.Light</item>
+
+    <item name="sucFullDynamicColor">true</item>
+  </style>
+</resources>
diff --git a/overlay/no-rro/external/setupdesign/main/res/values/colors.xml b/overlay/no-rro/external/setupdesign/main/res/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eff7fe259ba032198b1fed710ba375e1d51a1828
--- /dev/null
+++ b/overlay/no-rro/external/setupdesign/main/res/values/colors.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <color name="sud_glif_background_color_dark">@*android:color/background_device_default_dark</color>
+    <color name="sud_glif_v3_dialog_background_color_dark">@*android:color/background_floating_device_default_dark</color>
+    <color name="sud_glif_v3_dialog_background_color_light">@*android:color/background_floating_device_default_light</color>
+    <color name="sud_glif_v3_nav_bar_divider_color_light">#00000000</color>
+    <color name="sud_color_error_text_dark">@*android:color/error_color_material_dark</color>
+    <color name="sud_color_error_text_light">@*android:color/error_color_material_light</color>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_audio.xml b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_audio.xml
new file mode 100644
index 0000000000000000000000000000000000000000..46663b88e39c680066cde5d1f9f742f882b7317e
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_audio.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@*android:color/accent_device_default"
+        android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zM7.2 18c-.66 0,-1.2,-.54,-1.2,-1.2V12c0,-3.31 2.69,-6 6,-6s6 2.69 6 6v4.8c0 .66,-.54 1.2,-1.2 1.2H14v-4h2v-2c0,-2.21,-1.79,-4,-4,-4s-4 1.79,-4 4v2h2v4H7.2z"/>
+</vector>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_folder.xml b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_folder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ec09a5023c03fa4cea8d58747cd37c4e0cf01e7
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_folder.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@*android:color/accent_device_default"
+        android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_image.xml b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_image.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f6b177724595e814c4614b786e9c64c145c21484
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_image.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@*android:color/accent_device_default"
+        android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z"/>
+</vector>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_pdf.xml b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_pdf.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b046b10476be58b13f49ef5b2b6f87762c67eda2
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_pdf.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@*android:color/accent_device_default"
+        android:pathData="M7 11.5h1v-1H7v1zM19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm-9.5 8.5c0 .83,-.67 1.5,-1.5 1.5H7v2H5.5V9H8c.83 0 1.5.67 1.5 1.5v1zm10,-1H17v1h1.5V13H17v2h-1.5V9h4v1.5zm-5 3c0 .83,-.67 1.5,-1.5 1.5h-2.5V9H13c.83 0 1.5.67 1.5 1.5v3zm-2.5 0h1v-3h-1v3z"/>
+</vector>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_video.xml b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_video.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e8d452cac7252c0f605e5a0373ee3af27b9c3a27
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/drawable/ic_doc_video.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@*android:color/accent_device_default"
+        android:pathData="M18 4l2 4h-3l-2,-4h-2l2 4h-3l-2,-4H8l2 4H7L5 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V4h-4z"/>
+</vector>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/values-night/styles.xml b/overlay/no-rro/frameworks/base/core/res/res/values-night/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78e27b8e9d82364a72019e8ca394cc4b14c7f3ee
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/values-night/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <style name="Theme.DeviceDefault.SystemUI" parent="android:Theme.DeviceDefault">
+        <!-- Color palette -->
+        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
+        <item name="colorSecondary">@color/secondary_device_default_settings</item>
+        <item name="colorAccent">@color/accent_device_default_dark</item>
+        <item name="colorError">@color/error_color_device_default_dark</item>
+        <item name="colorSurfaceHeader">@android:color/black</item>
+        <item name="colorControlNormal">?attr/textColorPrimary</item>
+        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item>
+        <item name="forceDarkAllowed">false</item>
+        <item name="colorAccentSecondary">@color/accent_device_default_dark</item>
+        <item name="colorSurface">#2F3034</item>
+        <item name="android:colorBackgroundFloating">#1A1C1F</item>
+    </style>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/values/colors.xml b/overlay/no-rro/frameworks/base/core/res/res/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2c935376b71eb4910005ff055ff36dbacfec62ed
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/values/colors.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Accent colors -->
+    <color name="accent_material_light">#0086FF</color>
+    <color name="accent_material_dark">#5DB2FF</color>
+
+    <!-- Primary and Secondary text -->
+    <color name="bright_foreground_holo_dark">#DEFFFFFF</color>
+    <color name="bright_foreground_holo_light">#DE000000</color>
+    <color name="dim_foreground_holo_dark">#99FFFFFF</color>
+    <color name="dim_foreground_holo_light">#99000000</color>
+
+    <!-- Background color -->
+    <color name="background_material_dark">#121212</color>
+    <color name="background_material_light">#FAFAFA</color>
+
+    <!-- Dialog/Popup colors -->
+    <color name="background_floating_material_dark">#1E1E1E</color>
+    <color name="background_floating_material_light">#FFFFFF</color>
+
+    <!-- Action/Status Bar colors colorPrimary and colorPrimarDark -->
+    <color name="primary_material_dark">#272727</color>
+    <color name="primary_material_light">#FFFFFF</color>
+    <color name="primary_dark_material_dark">#272727</color>
+    <color name="primary_dark_material_light">#FFFFFF</color>
+
+    <!-- User account colors from Rich color palette -->
+    <color name="user_icon_1">#0F94F6</color><!-- Blue -->
+    <color name="user_icon_2">#44B04C</color><!-- Green -->
+    <color name="user_icon_3">#AFD83D</color><!-- Chartreuse -->
+    <color name="user_icon_4">#FF7A00</color><!-- Orange -->
+    <color name="user_icon_5">#ED1C61</color><!-- Magenta -->
+    <color name="user_icon_6">#5754DC</color><!-- Violet -->
+    <color name="user_icon_7">#00B4B4</color><!-- Aqua -->
+    <color name="user_icon_8">#FFC300</color><!-- Amber -->
+    <color name="user_icon_default_gray">#008D96</color><!-- Teal for guest account -->
+
+    <!-- Lightest shade of the accent color used by the system. White.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_0">#FFFFFF</color>
+    <!-- Shade of the accent system color at 99% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_10">#FBFDFF</color>
+    <!-- Shade of the accent system color at 95% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_50">#EDF1FE</color>
+    <!-- Shade of the accent system color at 90% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_100">#ADC7FA</color>
+    <!-- Shade of the accent system color at 80% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_200">#83ABF9</color>
+    <!-- Shade of the accent system color at 70% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_300">#518DF7</color>
+    <!-- Shade of the accent system color at 60% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_400">#3173DB</color>
+    <!-- Shade of the accent system color at 49.6% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_500">#265DAE</color>
+    <!-- Shade of the accent system color at 40% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_600">#20519A</color>
+    <!-- Shade of the accent system color at 30% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_700">#1A4585</color>
+    <!-- Shade of the accent system color at 20% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_800">#163A71</color>
+    <!-- Shade of the accent system color at 10% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_900">#102F60</color>
+    <!-- Darkest shade of the accent color used by the system. Black.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent1_1000">#071A3B</color>
+
+    <!-- Lightest shade of the secondary accent color used by the system. White.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_0">#FFFFFF</color>
+    <!-- Shade of the secondary accent system color at 99% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_10">#FBFDFF</color>
+    <!-- Shade of the secondary accent system color at 95% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_50">#D0E8FF</color>
+    <!-- Shade of the secondary accent system color at 90% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_100">#AFCAE3</color>
+    <!-- Shade of the secondary accent system color at 80% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_200">#8BA6BF</color>
+    <!-- Shade of the secondary accent system color at 70% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_300">#718CA5</color>
+    <!-- Shade of the secondary accent system color at 60% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_400">#557089</color>
+    <!-- Shade of the secondary accent system color at 49.6% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_500">#4F6A83</color>
+    <!-- Shade of the secondary accent system color at 40% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_600">#46617A</color>
+    <!-- Shade of the secondary accent system color at 30% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_700">#37526B</color>
+    <!-- Shade of the secondary accent system color at 20% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_800">#2B465F</color>
+    <!-- Shade of the secondary accent system color at 10% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_900">#213C55</color>
+    <!-- Darkest shade of the secondary accent color used by the system. Black.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent2_1000">#17324B</color>
+
+    <!-- Lightest shade of the tertiary accent color used by the system. White.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_0">#FFFFFF</color>
+    <!-- Shade of the tertiary accent system color at 99% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_10">#F8FFF8</color>
+    <!-- Shade of the tertiary accent system color at 95% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_50">#FBEBFD</color>
+    <!-- Shade of the tertiary accent system color at 90% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_100">#F3D9FB</color>
+    <!-- Shade of the tertiary accent system color at 80% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_200">#D7BDDE</color>
+    <!-- Shade of the tertiary accent system color at 70% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_300">#BAA2C2</color>
+    <!-- Shade of the tertiary accent system color at 60% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_400">#9F88A7</color>
+    <!-- Shade of the tertiary accent system color at 49% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_500">#856F8D</color>
+    <!-- Shade of the tertiary accent system color at 40% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_600">#6B5773</color>
+    <!-- Shade of the tertiary accent system color at 30% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_700">#523F5B</color>
+    <!-- Shade of the tertiary accent system color at 20% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_800">#3B2943</color>
+    <!-- Shade of the tertiary accent system color at 10% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_900">#25142E</color>
+    <!-- Darkest shade of the tertiary accent color used by the system. Black.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_accent3_1000">#000000</color>
+
+    <!-- Lightest shade of the neutral color used by the system. White.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_0">#FFFFFF</color>
+    <!-- Shade of the neutral system color at 99% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_10">#FDFBFE</color>
+    <!-- Shade of the neutral system color at 95% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_50">#F1F0F3</color>
+    <!-- Shade of the neutral system color at 90% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_100">#E3E2E5</color>
+    <!-- Shade of the neutral system color at 80% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_200">#C7C6C9</color>
+    <!-- Shade of the neutral system color at 70% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_300">#ABABAE</color>
+    <!-- Shade of the neutral system color at 60% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_400">#909094</color>
+    <!-- Shade of the neutral system color at 49% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_500">#77777A</color>
+    <!-- Shade of the neutral system color at 40% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_600">#5E5E61</color>
+    <!-- Shade of the neutral system color at 30% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_700">#46474A</color>
+    <!-- Shade of the neutral system color at 20% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_800">#2F3033</color>
+    <!-- Shade of the neutral system color at 10% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_900">#1A1C1F</color>
+    <!-- Darkest shade of the neutral color used by the system. Black.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral1_1000">#000000</color>
+
+    <!-- Lightest shade of the secondary neutral color used by the system. White.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_0">#FFFFFF</color>
+    <!-- Shade of the secondary neutral system color at 99% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_10">#FDFCFE</color>
+    <!-- Shade of the secondary neutral system color at 95% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_50">#EEF0F9</color>
+    <!-- Shade of the secondary neutral system color at 90% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_100">#E0E2EB</color>
+    <!-- Shade of the secondary neutral system color at 80% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_200">#C4C6CE</color>
+    <!-- Shade of the secondary neutral system color at 70% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_300">#A8ABB3</color>
+    <!-- Shade of the secondary neutral system color at 60% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_400">#8D9098</color>
+    <!-- Shade of the secondary neutral system color at 49% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_500">#75777E</color>
+    <!-- Shade of the secondary neutral system color at 40% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_600">#5C5E65</color>
+    <!-- Shade of the secondary neutral system color at 30% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_700">#45474E</color>
+    <!-- Shade of the secondary neutral system color at 20% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_800">#2E3036</color>
+    <!-- Shade of the secondary neutral system color at 10% perceptual luminance (L* in L*a*b* color space).
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_900">#1A1B1F</color>
+    <!-- Darkest shade of the secondary neutral color used by the system. Black.
+     This value can be overlaid at runtime by OverlayManager RROs. -->
+    <color name="system_neutral2_1000">#000000</color>
+
+    <color name="accent_device_default_light">#0086FF</color>
+    <color name="accent_device_default_dark">#5DB2FF</color>
+    <color name="primary_device_default_settings">@color/primary_device_default_dark</color>
+    <color name="accent_primary_device_default">@*android:color/accent_device_default</color>
+    <color name="primary_device_default_dark">@color/background_device_default_dark</color>
+    <color name="primary_device_default_light">@color/background_device_default_light</color>
+    <color name="navigation_bar_divider_device_default_settings">#00000000</color>
+
+    <color name="background_device_default_dark">#121212</color>
+    <color name="background_device_default_light">#ffffff</color>
+    <color name="background_floating_device_default_dark">#1e1e1e</color>
+    <color name="background_floating_device_default_light">#ffffff</color>
+    <color name="surface_header_dark">#272727</color>
+    <color name="surface_header_light">#ffffff</color>
+    <color name="surface_light">#ffffff</color>
+    <color name="surface_dark">#1e1e1e</color>
+
+    <color name="error_color_material_dark">#FB3846</color>
+    <color name="error_color_material_light">#FB3846</color>
+
+</resources>
diff --git a/overlay/no-rro/frameworks/base/core/res/res/values/styles.xml b/overlay/no-rro/frameworks/base/core/res/res/values/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af9fd321bbd64bcb309362c3a5f49d7b8a35e906
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/core/res/res/values/styles.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <style name="Theme.DeviceDefault.SystemUI" parent="Theme.DeviceDefault.Light">
+        <!-- Color palette -->
+        <item name="colorPrimary">@color/primary_device_default_settings_light</item>
+        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>
+        <item name="colorSecondary">@color/secondary_device_default_settings_light</item>
+        <item name="colorAccent">@color/accent_device_default_light</item>
+        <item name="colorAccentPrimary">@color/accent_device_default</item>
+        <item name="colorAccentSecondary">@color/accent_device_default</item>
+        <item name="colorAccentTertiary">@color/accent_device_default</item>
+        <item name="colorAccentPrimaryVariant">@color/accent_device_default</item>
+        <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item>
+        <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item>
+        <item name="colorSurface">@android:color/white</item>
+        <item name="colorSurfaceHighlight">@color/surface_highlight_light</item>
+        <item name="colorSurfaceVariant">@color/surface_variant_light</item>
+        <item name="colorSurfaceHeader">#F1F0F3</item>
+        <item name="colorError">@color/error_color_device_default_light</item>
+        <item name="colorControlNormal">?attr/textColorPrimary</item>
+        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>
+
+        <!-- Text styles -->
+        <item name="textAppearanceButton">@style/TextAppearance.DeviceDefault.Widget.Button</item>
+
+        <!-- Button styles -->
+        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>
+        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
+
+        <!-- Progress bar attributes -->
+        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>
+        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>
+
+        <!-- Toolbar attributes -->
+        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>
+        <item name="android:colorBackgroundFloating">#FAF9FB</item>
+    </style>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/half_rounded_left_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/half_rounded_left_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78c567ebdb81b22f18e6a3ae68d2516ebbf367e5
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/half_rounded_left_bk.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:targetApi="28"
+       android:shape="rectangle">
+    <solid android:color="#272727" />
+    <corners
+        android:topLeftRadius="?android:attr/dialogCornerRadius"
+        android:topRightRadius="0dp"
+        android:bottomLeftRadius="?android:attr/dialogCornerRadius"
+        android:bottomRightRadius="0dp"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/half_rounded_right_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/half_rounded_right_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c11cd4c62ec762a575c4aa9af57e569f47140b4
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/half_rounded_right_bk.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:targetApi="28"
+       android:shape="rectangle">
+    <solid android:color="#272727" />
+    <corners
+        android:topLeftRadius="0dp"
+        android:topRightRadius="?android:attr/dialogCornerRadius"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="?android:attr/dialogCornerRadius"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/rounded_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/rounded_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b061f58078b15e5977a3b0cc1a8e2c6b72f2788c
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/rounded_bk.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:targetApi="28"
+       android:shape="rectangle">
+    <solid android:color="#272727" />
+    <corners
+        android:radius="?android:attr/dialogCornerRadius"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/square_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/square_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0171c5126bba8c90ff1567c09ee62568574b8378
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable-night/square_bk.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       android:shape="rectangle">
+    <solid android:color="#272727" />
+    <corners
+        android:radius="0dp"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bba17d946f0a0c7a942cfeadf9779144b61fd68a
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:targetApi="28"
+       android:shape="rectangle">
+    <solid android:color="#F1F0F3" />
+    <corners
+        android:topLeftRadius="?android:attr/dialogCornerRadius"
+        android:topRightRadius="0dp"
+        android:bottomLeftRadius="?android:attr/dialogCornerRadius"
+        android:bottomRightRadius="0dp"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69095a866699bf43c49bafecb39c908db61af637
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:targetApi="28"
+       android:shape="rectangle">
+    <solid android:color="#F1F0F3" />
+    <corners
+        android:topLeftRadius="0dp"
+        android:topRightRadius="?android:attr/dialogCornerRadius"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="?android:attr/dialogCornerRadius"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0bb7c98d7142623f1e3e7413ca05d0cf26af801d
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:targetApi="28"
+       android:shape="rectangle">
+    <solid android:color="#F1F0F3" />
+    <corners
+        android:radius="?android:attr/dialogCornerRadius"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d22ea3954b7c62ef4dd3fee7370a1b50a14fc61f
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       android:shape="rectangle">
+    <solid android:color="#F1F0F3" />
+    <corners
+        android:radius="0dp"
+    />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-v31/dimens.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-v31/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4c220176412219052f6a96c5d8a885196b9d9e6
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-v31/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <dimen name="settingslib_min_switch_width">48dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-v31/styles.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-v31/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ce79a366a311f0a1dfac5c078cb0ddd29755539
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-v31/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <style name="MainSwitchText.Settingslib" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+        <item name="android:textSize">20sp</item>
+        <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsSpinner/res/drawable/arrow_drop_down.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsSpinner/res/drawable/arrow_drop_down.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9f4d7eab776df94fa04c168be752c2be23da46a8
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsSpinner/res/drawable/arrow_drop_down.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="18"
+        android:viewportHeight="18"
+        android:width="24dp"
+        android:height="24dp">
+    <path
+        android:pathData="M7 10l5 5 5 -5z"
+        android:fillColor="?android:attr/colorBackground"/>
+</vector>
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fd3a783e6aca7a44df3583d730bb386ff8851a7d
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"
+    android:color="@color/ripple_color">
+
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="?android:attr/colorBackgroundFloating"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_thumb_color.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_thumb_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..27b1c7c379bccd265901ae3773f8a5e967836c5c
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_thumb_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="false" android:color="@android:color/white" />
+    <item android:color="@android:color/white" />
+</selector>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_color.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..45d011f3c10b343319ef730a672d64f0a2f0082f
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#C8CED0" android:alpha="0.75" />
+    <item android:state_checked="true" android:color="#2CC766" />
+    <item android:color="#C8CED0" />
+</selector>
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/drawable-v31/settingslib_switch_thumb.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/drawable-v31/settingslib_switch_thumb.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb8924d661af892107b8b9f1a865c53ba70ae171
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/drawable-v31/settingslib_switch_thumb.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="2dp"
+        android:left="2dp"
+        android:right="2dp"
+        android:bottom="2dp">
+        <shape android:shape="oval" >
+            <size android:height="20dp" android:width="20dp" />
+            <solid android:color="@color/settingslib_switch_thumb_color" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/drawable-v31/settingslib_switch_track.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/drawable-v31/settingslib_switch_track.xml
new file mode 100644
index 0000000000000000000000000000000000000000..57ccda3784d79d1eb6328511346aa34e5d246192
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/drawable-v31/settingslib_switch_track.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:width="36dp"
+    android:height="20dp">
+
+    <solid android:color="@color/settingslib_switch_track_color" />
+    <corners android:radius="35dp" />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d98cbb951295e77bb260d0f13b9f5e13457d9ce
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <color name="settingslib_state_on_color">@*android:color/surface_header_dark</color>
+    <color name="settingslib_state_off_color">@*android:color/surface_header_dark</color>
+    <color name="settingslib_dialog_background">@*android:color/background_floating_device_default_dark</color>
+    <color name="settingslib_colorSurfaceHeader">@*android:color/background_device_default_dark</color>
+    <color name="settingslib_dialog_accent">@*android:color/accent_device_default_dark</color>
+</resources>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..820a284cf4b26d79abbc6b40629f2b54afcd9946
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <color name="settingslib_state_on_color">#F1F0F3</color>
+    <color name="settingslib_state_off_color">#F1F0F3</color>
+    <color name="settingslib_dialog_background">@*android:color/background_floating_device_default_light</color>
+    <color name="settingslib_colorSurfaceHeader">@*android:color/background_device_default_light</color>
+    <color name="settingslib_primary_dark_device_default_settings">@*android:color/background_device_default_dark</color>
+    <color name="settingslib_primary_device_default_settings_light">@*android:color/background_device_default_light</color>
+    <color name="settingslib_background_device_default_dark">@*android:color/background_device_default_dark</color>
+    <color name="settingslib_background_device_default_light">@*android:color/background_device_default_light</color>
+    <color name="settingslib_dialog_accent">@*android:color/accent_device_default_light</color>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-v31/styles.xml b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-v31/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..972f5a2ba4b5406cab225c6ab78c158d825f10e0
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SettingsLib/SettingsTheme/res/values-v31/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <style name="Switch.SettingsLib" parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:switchMinWidth">48dp</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="android:track">@drawable/settingslib_switch_track</item>
+        <item name="android:thumb">@drawable/settingslib_switch_thumb</item>
+    </style>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a357cfd2b352ffdab002b989faedd0df08c0c36d
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:color="?androidprv:attr/colorAccent"/>
+</selector>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notif_footer_btn_background.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notif_footer_btn_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd055260fe211831ad08cd2883da5e3b90203bce
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notif_footer_btn_background.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item>
+        <inset
+            android:insetBottom="4dp"
+            android:insetTop="4dp">
+            <shape android:shape="rectangle">
+                <corners android:radius="20dp" />
+                <padding
+                    android:left="20dp"
+                    android:right="20dp" />
+                <solid android:color="@android:color/transparent" />
+            </shape>
+        </inset>
+    </item>
+</ripple>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notification_guts_bg.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notification_guts_bg.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6dd157539e29e08cb9c352f738f713550a8dfe92
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notification_guts_bg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <solid android:color="#2F3034" />
+    <!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners -->
+    <corners android:radius="1dp" />
+</shape>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notification_material_bg.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notification_material_bg.xml
new file mode 100644
index 0000000000000000000000000000000000000000..95d74bce1824c1a17a09e3a71c65cc09b81f77e2
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/notification_material_bg.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+        android:color="?android:attr/colorControlHighlight">
+    <item>
+        <shape>
+            <solid android:color="#2F3034" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/qs_dialog_btn_outline.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/qs_dialog_btn_outline.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1bc8f2f6288a98bda43e114c5521a169bcd8d46a
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/qs_dialog_btn_outline.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       android:insetTop="@dimen/dialog_button_vertical_inset"
+       android:insetBottom="@dimen/dialog_button_vertical_inset">
+    <ripple android:color="?android:attr/colorControlHighlight">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white"/>
+                <corners android:radius="?android:attr/buttonCornerRadius"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <corners android:radius="?android:attr/buttonCornerRadius"/>
+                <solid android:color="@android:color/transparent"/>
+                <stroke android:color="#262626"
+                        android:width="1dp"
+                />
+                <padding android:left="@dimen/dialog_button_horizontal_padding"
+                         android:top="@dimen/dialog_button_vertical_padding"
+                         android:right="@dimen/dialog_button_horizontal_padding"
+                         android:bottom="@dimen/dialog_button_vertical_padding"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/qs_footer_action_chip_background.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/qs_footer_action_chip_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aced6b56a8146b8e15322ad9e209082c24971050
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable-night/qs_footer_action_chip_background.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetTop="@dimen/qs_footer_action_inset"
+    android:insetBottom="@dimen/qs_footer_action_inset">
+    <ripple
+        android:color="?android:attr/colorControlHighlight"
+        android:height="44dp">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/black"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
+                <stroke android:width="1dp" android:color="#262626"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/action_chip_background.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/action_chip_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1fd3e95b4d10fd0f35aa644ae21176bdca43636d
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/action_chip_background.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:color="@color/global_screenshot_button_ripple">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorAccent"/>
+            <corners android:radius="@dimen/screenshot_button_corner_radius"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notif_footer_btn_background.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd055260fe211831ad08cd2883da5e3b90203bce
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item>
+        <inset
+            android:insetBottom="4dp"
+            android:insetTop="4dp">
+            <shape android:shape="rectangle">
+                <corners android:radius="20dp" />
+                <padding
+                    android:left="20dp"
+                    android:right="20dp" />
+                <solid android:color="@android:color/transparent" />
+            </shape>
+        </inset>
+    </item>
+</ripple>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notification_guts_bg.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notification_guts_bg.xml
new file mode 100644
index 0000000000000000000000000000000000000000..27d395286145a45592af58b3fed413da014cd9ad
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notification_guts_bg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <solid android:color="@android:color/white" />
+    <!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners -->
+    <corners android:radius="1dp" />
+</shape>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notification_material_bg.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notification_material_bg.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7dc7d0776e71aef1541eb893cd899c592b062862
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/notification_material_bg.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+        android:color="?android:attr/colorControlHighlight">
+    <item>
+        <shape>
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ea1f6ad4f91a1121219f51e64de59c2488973d13
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       android:insetTop="@dimen/dialog_button_vertical_inset"
+       android:insetBottom="@dimen/dialog_button_vertical_inset">
+    <ripple android:color="?android:attr/colorControlHighlight">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white"/>
+                <corners android:radius="?android:attr/buttonCornerRadius"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <corners android:radius="?android:attr/buttonCornerRadius"/>
+                <solid android:color="@android:color/transparent"/>
+                <stroke android:color="#D6D6D9"
+                        android:width="1dp"
+                />
+                <padding android:left="@dimen/dialog_button_horizontal_padding"
+                         android:top="@dimen/dialog_button_vertical_padding"
+                         android:right="@dimen/dialog_button_horizontal_padding"
+                         android:bottom="@dimen/dialog_button_vertical_padding"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0595f8a025490f317a75127d439142c525bd9ad2
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetTop="@dimen/qs_footer_action_inset"
+    android:insetBottom="@dimen/qs_footer_action_inset">
+    <ripple
+        android:color="?android:attr/colorControlHighlight"
+        android:height="44dp">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/transparent"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
+                <stroke android:width="1dp" android:color="#D6D6D9"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/screenrecord_spinner_background.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/screenrecord_spinner_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d211f507d0028048684cdc00e4138ab677b08ca0
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/screenrecord_spinner_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+        android:shape="rectangle"
+        android:padding="12dp">
+    <corners android:radius="24dp"/>
+    <solid android:color="?android:attr/colorBackgroundFloating" />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_thumb_on.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_thumb_on.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9e625873dd4b76e511f8bd3cf5dcdab59c189ff4
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_thumb_on.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="@dimen/settingslib_switch_thumb_margin"
+        android:bottom="@dimen/settingslib_switch_thumb_margin">
+        <shape android:shape="oval">
+            <size
+                android:height="@dimen/settingslib_switch_thumb_size"
+                android:width="@dimen/settingslib_switch_thumb_size"/>
+            <solid android:color="@android:color/white"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_thumb_selector.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_thumb_selector.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb8924d661af892107b8b9f1a865c53ba70ae171
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_thumb_selector.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="2dp"
+        android:left="2dp"
+        android:right="2dp"
+        android:bottom="2dp">
+        <shape android:shape="oval" >
+            <size android:height="20dp" android:width="20dp" />
+            <solid android:color="@color/settingslib_switch_thumb_color" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_track_selector.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_track_selector.xml
new file mode 100644
index 0000000000000000000000000000000000000000..57ccda3784d79d1eb6328511346aa34e5d246192
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/drawable/settingslib_track_selector.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:width="36dp"
+    android:height="20dp">
+
+    <solid android:color="@color/settingslib_switch_track_color" />
+    <corners android:radius="35dp" />
+</shape>
\ No newline at end of file
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/values-night/colors.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values-night/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..79dc3b9826cc6f1011bd2d301a143ef23ecb699e
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values-night/colors.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <color name="control_primary_text">#E6FFFFFF</color>
+   <color name="connected_network_primary_color">#DEFFFFFF</color>
+   <color name="settingslib_state_on_color">@*android:color/surface_header_dark</color>
+
+   <color name="global_actions_lite_background">@*android:color/background_device_default_dark</color>
+   <color name="global_actions_lite_button_background">@*android:color/background_floating_device_default_dark</color>
+   <color name="global_actions_lite_emergency_icon">@*android:color/background_device_default_dark</color>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/values-night/styles.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values-night/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..72a859e502e491eafabe262ba5721935711cd899
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values-night/styles.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <style name="Theme.SystemUI.QuickSettings" parent="@*android:style/Theme.DeviceDefault.SystemUI">
+        <item name="lightIconTheme">@style/QSIconTheme</item>
+        <item name="darkIconTheme">@style/QSIconTheme</item>
+        <item name="android:colorError">@*android:color/error_color_material_dark</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="offStateColor">#2F3034</item>
+        <item name="underSurfaceColor">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+        <item name="android:itemTextAppearance">@style/Control.MenuItem</item>
+    </style>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/colors.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8f030f5eb385b49a87641259a78e8455c2c5ec46
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/colors.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <color name="control_primary_text">#E6000000</color>
+   <color name="privacy_chip_background">@*android:color/accent_device_default</color>
+   <color name="connected_network_primary_color">#DE000000</color>
+   <color name="settingslib_state_on_color">#F1F0F3</color>
+
+   <color name="global_actions_lite_background">@*android:color/background_device_default_light</color>
+   <color name="global_actions_lite_button_background">#F1F0F3</color>
+   <color name="global_actions_lite_emergency_background">#F85D4D</color>
+   <color name="global_actions_lite_emergency_icon">@*android:color/background_device_default_light</color>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d9ea8d522817bd53e0d55ad598dbe62a0e89c5d
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <dimen name="settingslib_min_switch_width">48dp</dimen>
+   <dimen name="settingslib_switch_track_width">48dp</dimen>
+</resources>
diff --git a/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/styles.xml b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e85413aea69df17b6e3011d6910475544c0cf7b5
--- /dev/null
+++ b/overlay/no-rro/frameworks/base/packages/SystemUI/res/values/styles.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources>
+   <style name="Theme.SystemUI.QuickSettings" parent="@*android:style/Theme.DeviceDefault.SystemUI">
+        <item name="lightIconTheme">@style/QSIconTheme</item>
+        <item name="darkIconTheme">@style/QSIconTheme</item>
+        <item name="android:colorError">@*android:color/error_color_material_light</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="offStateColor">#DDDDE4</item>
+        <item name="underSurfaceColor">#F1F0F3</item>
+        <item name="android:colorBackground">#F1F0F3</item>
+        <item name="android:itemTextAppearance">@style/Control.MenuItem</item>
+    </style>
+    <style name="Theme.SystemUI" parent="@*android:style/Theme.DeviceDefault.SystemUI">
+        <item name="lightIconTheme">@style/DualToneLightTheme</item>
+        <item name="darkIconTheme">@style/DualToneDarkTheme</item>
+        <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>
+        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>
+        <item name="wallpaperTextColorAccent">@android:color/white</item>
+        <item name="android:colorError">@*android:color/error_color_material_dark</item>
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
+        <item name="passwordStyle">@style/PasswordTheme</item>
+        <item name="numPadKeyStyle">@style/NumPadKey</item>
+        <item name="backgroundProtectedStyle">@style/BackgroundProtectedStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="shadowRadius">@dimen/keyguard_shadow_radius</item>
+
+        <!-- Needed for MediaRoute chooser dialog -->
+        <item name="*android:isLightTheme">false</item>
+    </style>
+    <style name="InternetDialog.NetworkTitle.Active">
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textDirection">locale</item>
+    </style>
+    <style name="InternetDialog.NetworkSummary.Active">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+     <style name="ScreenRecord.Switch">
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:switchMinWidth">40dp</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="android:track">@drawable/settingslib_switch_track</item>
+        <item name="android:thumb">@drawable/settingslib_switch_thumb</item>
+    </style>
+    <style name="Widget.Dialog.Button">
+        <item name="android:buttonCornerRadius">28dp</item>
+        <item name="android:background">@drawable/qs_dialog_btn_filled</item>
+        <item name="android:textColor">?android:attr/colorBackgroundFloating</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:lineHeight">20sp</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="android:minWidth">0dp</item>
+    </style>
+
+    <style name="Widget.Dialog.Button.BorderButton">
+        <item name="android:background">@drawable/qs_dialog_btn_outline</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+    <style name="MediaPlayer" parent="@*android:style/Theme.DeviceDefault.Light">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:backgroundTint">@android:color/white</item>
+    </style>
+</resources>
diff --git a/rro_overlays/PowerOffAlarmOverlay/Android.bp b/overlay/rro_overlays/PowerOffAlarmOverlay/Android.bp
similarity index 100%
rename from rro_overlays/PowerOffAlarmOverlay/Android.bp
rename to overlay/rro_overlays/PowerOffAlarmOverlay/Android.bp
diff --git a/rro_overlays/PowerOffAlarmOverlay/AndroidManifest.xml b/overlay/rro_overlays/PowerOffAlarmOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/PowerOffAlarmOverlay/AndroidManifest.xml
rename to overlay/rro_overlays/PowerOffAlarmOverlay/AndroidManifest.xml
diff --git a/rro_overlays/PowerOffAlarmOverlay/res/values-ar-rXB/strings.xml b/overlay/rro_overlays/PowerOffAlarmOverlay/res/values-ar-rXB/strings.xml
similarity index 100%
rename from rro_overlays/PowerOffAlarmOverlay/res/values-ar-rXB/strings.xml
rename to overlay/rro_overlays/PowerOffAlarmOverlay/res/values-ar-rXB/strings.xml
diff --git a/rro_overlays/PowerOffAlarmOverlay/res/values-de/strings.xml b/overlay/rro_overlays/PowerOffAlarmOverlay/res/values-de/strings.xml
similarity index 100%
rename from rro_overlays/PowerOffAlarmOverlay/res/values-de/strings.xml
rename to overlay/rro_overlays/PowerOffAlarmOverlay/res/values-de/strings.xml
diff --git a/rro_overlays/PowerOffAlarmOverlay/res/values-en-rXA/strings.xml b/overlay/rro_overlays/PowerOffAlarmOverlay/res/values-en-rXA/strings.xml
similarity index 100%
rename from rro_overlays/PowerOffAlarmOverlay/res/values-en-rXA/strings.xml
rename to overlay/rro_overlays/PowerOffAlarmOverlay/res/values-en-rXA/strings.xml
diff --git a/rro_overlays/PowerOffAlarmOverlay/res/values-zh-rCN/strings.xml b/overlay/rro_overlays/PowerOffAlarmOverlay/res/values-zh-rCN/strings.xml
similarity index 100%
rename from rro_overlays/PowerOffAlarmOverlay/res/values-zh-rCN/strings.xml
rename to overlay/rro_overlays/PowerOffAlarmOverlay/res/values-zh-rCN/strings.xml
diff --git a/rro_overlays/PowerOffAlarmOverlay/res/values/strings.xml b/overlay/rro_overlays/PowerOffAlarmOverlay/res/values/strings.xml
similarity index 100%
rename from rro_overlays/PowerOffAlarmOverlay/res/values/strings.xml
rename to overlay/rro_overlays/PowerOffAlarmOverlay/res/values/strings.xml