diff --git a/overlay/no-rro/external/setupdesign/main/res/values-night-v31/colors.xml b/overlay/no-rro/external/setupdesign/main/res/values-night-v31/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7d08298c0bfe8f2baa3806e689d833c425b416f1
--- /dev/null
+++ b/overlay/no-rro/external/setupdesign/main/res/values-night-v31/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2024
+  ~ 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_system_background_surface">@*android:color/e_background_dark</color>
+</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
index 7eeaeebbcd2e4dbcf72642fc7d30a8f3d8dfd817..920f616e15bf1b26bbd8524289d5f68a6b7af77d 100644
--- a/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml
+++ b/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright Murena SAS 2022
+  ~ Copyright Murena SAS 2024
   ~ 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
@@ -15,6 +15,7 @@
   ~  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>
+  <color name="sud_system_background_surface">@*android:color/e_background_light</color>
+  <color name="sud_system_accent1_600">@*android:color/e_accent_light</color>
+  <color name="sud_system_accent1_100">@*android:color/e_accent_dark</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
index 9ad17c1580a4e6854ff02d27faf6f7189a80b2bb..25ccb0cb781442c0961e7e4bbed77bca67b48fe4 100644
--- a/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml
+++ b/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright Murena SAS 2022
+  ~ Copyright Murena SAS 2024
   ~ 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
@@ -15,52 +15,17 @@
   ~  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 name="SudFullDynamicColorAlertDialogThemeCompat" parent="SudDynamicColorAlertDialogThemeCompat">
+    <item name="android:colorBackground">@*android:color/e_floating_background_dark</item>
+  </style>
+  <style name="SudFullDynamicColorAlertDialogThemeCompat.Light" parent="SudDynamicColorAlertDialogThemeCompat.Light">
+    <item name="android:colorBackground">@*android:color/e_floating_background_light</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 name="SudFullDynamicColorAlertDialogTheme" parent="SudDynamicColorAlertDialogTheme">
+    <item name="android:colorBackground">@*android:color/e_floating_background_dark</item>
+  </style>
+  <style name="SudFullDynamicColorAlertDialogTheme.Light" parent="SudDynamicColorAlertDialogTheme.Light">
+    <item name="android:colorBackground">@*android:color/e_floating_background_light</item>
   </style>
 </resources>