diff --git a/app/src/main/res/color/sel_dynamic_surface_bright.xml b/app/src/main/res/color/sel_dynamic_surface_bright.xml
deleted file mode 100644
index 84e104f7b..000000000
--- a/app/src/main/res/color/sel_dynamic_surface_bright.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-    <item android:color="@color/m3_sys_color_dynamic_dark_surface_bright" android:alpha="0.5" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_black.xml
deleted file mode 100644
index 3a94afd3e..000000000
--- a/app/src/main/res/color/sel_dynamic_surface_container_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container" android:alpha="0.5" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_high_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_high_black.xml
deleted file mode 100644
index 3f32bfab9..000000000
--- a/app/src/main/res/color/sel_dynamic_surface_container_high_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_high" android:alpha="0.5" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_highest_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_highest_black.xml
deleted file mode 100644
index 50b4d3397..000000000
--- a/app/src/main/res/color/sel_dynamic_surface_container_highest_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_highest" android:alpha="0.5" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_low_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_low_black.xml
deleted file mode 100644
index 39b093200..000000000
--- a/app/src/main/res/color/sel_dynamic_surface_container_low_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_low" android:alpha="0.5" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_lowest_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_lowest_black.xml
deleted file mode 100644
index e3794b4d2..000000000
--- a/app/src/main/res/color/sel_dynamic_surface_container_lowest_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_lowest" android:alpha="0.5" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_dim_black.xml b/app/src/main/res/color/sel_dynamic_surface_dim_black.xml
deleted file mode 100644
index 3287accc1..000000000
--- a/app/src/main/res/color/sel_dynamic_surface_dim_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" />
-    <item android:color="@color/m3_sys_color_dynamic_dark_surface_dim" android:alpha="0.5" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes_black.xml b/app/src/main/res/values/themes_black.xml
index e2df0617d..75b8f6d24 100644
--- a/app/src/main/res/values/themes_black.xml
+++ b/app/src/main/res/values/themes_black.xml
@@ -2,13 +2,13 @@
 <resources>
     <style name="Theme.Auxio.Black" parent="Theme.Auxio.Base">
         <item name="colorSurface">@android:color/black</item>
-        <item name="colorSurfaceDim">@color/sel_dynamic_surface_dim_black</item>
-        <item name="colorSurfaceBright">@color/sel_dynamic_surface_bright</item>
-        <item name="colorSurfaceContainerLowest">@color/sel_dynamic_surface_container_lowest_black</item>
-        <item name="colorSurfaceContainerLow">@color/sel_dynamic_surface_container_low_black</item>
-        <item name="colorSurfaceContainer">@color/sel_dynamic_surface_container_black</item>
-        <item name="colorSurfaceContainerHigh">@color/sel_dynamic_surface_container_high_black</item>
-        <item name="colorSurfaceContainerHighest">@color/sel_dynamic_surface_container_highest_black</item>
+        <item name="colorSurfaceDim">@color/m3_ref_palette_dynamic_neutral_variant4</item>
+        <item name="colorSurfaceBright">@color/m3_ref_palette_dynamic_neutral_variant12</item>
+        <item name="colorSurfaceContainerLowest">@color/m3_ref_palette_dynamic_neutral_variant0</item>
+        <item name="colorSurfaceContainerLow">@color/m3_ref_palette_dynamic_neutral_variant4</item>
+        <item name="colorSurfaceContainer">@color/m3_ref_palette_dynamic_neutral_variant6</item>
+        <item name="colorSurfaceContainerHigh">@color/m3_ref_palette_dynamic_neutral_variant10</item>
+        <item name="colorSurfaceContainerHighest">@color/m3_ref_palette_dynamic_neutral_variant12</item>
     </style>
     <style name="Theme.Auxio.Red.Black" parent="Theme.Auxio.Red">
         <item name="colorSurface">@color/red_surface_black</item>