diff --git a/smali/res/values-v31/styles.xml b/smali/res/values-v31/styles.xml
index 7e4d26e76..bc24c9ed1 100644
--- a/smali/res/values-v31/styles.xml
+++ b/smali/res/values-v31/styles.xml
@@ -189,8 +189,8 @@
         <item name="media_overlay_button_foreground">@android:color/system_neutral1_800</item>
         <item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
         <item name="modal_card_background">@android:color/system_neutral1_100</item>
-        <item name="modal_card_border">@color/clear</item>
-        <item name="modal_card_header_close">@color/black</item>
+        <item name="modal_card_border">?modal_card_background</item>
+        <item name="modal_card_header_close">?modal_card_background</item>
         <item name="music_playback_icon">@color/black</item>
         <item name="overlay_status_background">@android:color/system_neutral1_50</item>
         <item name="overlay_status_foreground">@android:color/system_neutral1_500</item>
@@ -449,8 +449,8 @@
         <item name="media_overlay_button_foreground">@android:color/system_neutral1_800</item>
         <item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
         <item name="modal_card_background">@android:color/system_neutral1_100</item>
-        <item name="modal_card_border">@color/clear</item>
-        <item name="modal_card_header_close">@color/black</item>
+        <item name="modal_card_border">?modal_card_background</item>
+        <item name="modal_card_header_close">?modal_card_background</item>
         <item name="music_playback_icon">@color/black</item>
         <item name="overlay_status_background">@android:color/system_neutral1_50</item>
         <item name="overlay_status_foreground">@android:color/system_neutral1_500</item>
@@ -709,8 +709,8 @@
         <item name="media_overlay_button_foreground">@android:color/system_neutral1_800</item>
         <item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
         <item name="modal_card_background">@android:color/system_neutral1_800</item>
-        <item name="modal_card_border">@android:color/system_neutral1_100</item>
-        <item name="modal_card_header_close">@android:color/system_neutral1_100</item>
+        <item name="modal_card_border">?modal_card_background</item>
+        <item name="modal_card_header_close">?modal_card_background</item>
         <item name="music_playback_icon">@android:color/system_neutral1_100</item>
         <item name="overlay_status_background">@android:color/system_neutral1_900</item>
         <item name="overlay_status_foreground">@android:color/system_neutral1_100</item>
@@ -969,8 +969,8 @@
         <item name="media_overlay_button_foreground">@android:color/system_neutral1_800</item>
         <item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
         <item name="modal_card_background">@android:color/system_neutral1_800</item>
-        <item name="modal_card_border">@android:color/system_neutral1_100</item>
-        <item name="modal_card_header_close">@android:color/system_neutral1_100</item>
+        <item name="modal_card_border">?modal_card_background</item>
+        <item name="modal_card_header_close">?modal_card_background</item>
         <item name="music_playback_icon">@android:color/system_neutral1_100</item>
         <item name="overlay_status_background">@android:color/system_neutral1_900</item>
         <item name="overlay_status_foreground">@android:color/system_neutral1_100</item>
@@ -1229,8 +1229,8 @@
         <item name="media_overlay_button_foreground">@color/black</item>
         <item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
         <item name="modal_card_background">@color/black</item>
-        <item name="modal_card_border">@android:color/system_neutral1_100</item>
-        <item name="modal_card_header_close">@android:color/system_neutral1_100</item>
+        <item name="modal_card_border">?modal_card_background</item>
+        <item name="modal_card_header_close">?modal_card_background</item>
         <item name="music_playback_icon">@android:color/system_neutral1_100</item>
         <item name="overlay_status_background">@color/black</item>
         <item name="overlay_status_foreground">@android:color/system_neutral1_100</item>
@@ -1489,8 +1489,8 @@
         <item name="media_overlay_button_foreground">@color/black</item>
         <item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
         <item name="modal_card_background">@color/black</item>
-        <item name="modal_card_border">@android:color/system_neutral1_100</item>
-        <item name="modal_card_header_close">@android:color/system_neutral1_100</item>
+        <item name="modal_card_border">?modal_card_background</item>
+        <item name="modal_card_header_close">?modal_card_background</item>
         <item name="music_playback_icon">@android:color/system_neutral1_100</item>
         <item name="overlay_status_background">@color/black</item>
         <item name="overlay_status_foreground">@android:color/system_neutral1_100</item>