diff --git a/smali/res/values-v31/styles.xml b/smali/res/values-v31/styles.xml
index f71cd0bc2..4088df6bc 100644
--- a/smali/res/values-v31/styles.xml
+++ b/smali/res/values-v31/styles.xml
@@ -4,7 +4,7 @@
         <item name="accent">@android:color/system_accent1_300</item>
         <item name="accent_alpha10">@android:color/system_accent1_300</item>
         <item name="action_sheet_action_foreground">@android:color/system_accent1_200</item>
-        <item name="action_sheet_separator">?action_sheet_action_foreground</item>
+        <item name="action_sheet_separator">@android:color/system_accent1_200</item>
         <item name="activity_indicator_tint">@android:color/system_neutral1_200</item>
         <item name="attach_picker_tab_active_background">@android:color/system_accent1_400</item>
         <item name="attach_picker_tab_active_icon">@android:color/system_neutral1_100</item>
@@ -13,11 +13,11 @@
         <item name="attach_picker_tab_inactive_icon">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_inactive_text">@android:color/system_neutral1_400</item>
         <item name="background_content">@android:color/system_neutral1_50</item>
-        <item name="background_highlighted">@color/black_alpha8</item>
+        <item name="background_highlighted">@android:color/system_neutral1_100</item>
         <item name="background_keyboard">@android:color/system_neutral1_100</item>
         <item name="background_light">@android:color/system_neutral1_50</item>
         <item name="background_page">@android:color/system_neutral1_50</item>
-        <item name="background_suggestions">@android:color/system_neutral1_100</item>
+        <item name="background_suggestions">@android:color/system_neutral1_50</item>
         <item name="button_bot_shadow">@android:color/system_neutral1_200</item>
         <item name="button_bot_shadow_disabled">#66c4c8cc</item>
         <item name="button_commerce_background">@color/green</item>
@@ -205,15 +205,15 @@
         <item name="placeholder_icon_tint">?accent</item>
         <item name="poll_option_background">@android:color/system_accent1_600</item>
         <item name="search_bar_background">@android:color/system_neutral1_50</item>
-        <item name="search_bar_field_background">@android:color/system_neutral1_100</item>
-        <item name="search_bar_field_tint">@android:color/system_neutral1_300</item>
+        <item name="search_bar_field_background">@android:color/system_accent2_50</item>
+        <item name="search_bar_field_tint">@android:color/system_neutral1_900</item>
         <item name="search_bar_segmented_control_tint">@android:color/system_neutral1_400</item>
         <item name="segmented_control_bar_background">@color/clear</item>
         <item name="segmented_control_tint">@android:color/system_neutral1_300</item>
         <item name="selection_off_icon">@android:color/system_neutral1_200</item>
-        <item name="separator_alpha">?background_content</item>
-        <item name="separator_alternate">?background_content</item>
-        <item name="separator_common">?background_content</item>
+        <item name="separator_alpha">@android:color/system_neutral1_100</item>
+        <item name="separator_alternate">@android:color/system_neutral1_100</item>
+        <item name="separator_common">@android:color/system_neutral1_100</item>
         <item name="snippet_background">@android:color/system_neutral1_100</item>
         <item name="snippet_border">@android:color/system_neutral1_200</item>
         <item name="snippet_icon_tertiary">@android:color/system_neutral1_200</item>
@@ -264,7 +264,7 @@
         <item name="accent">@android:color/system_accent1_400</item>
         <item name="accent_alpha10">@android:color/system_accent1_400</item>
         <item name="action_sheet_action_foreground">@android:color/system_accent1_400</item>
-        <item name="action_sheet_separator">?action_sheet_action_foreground</item>
+        <item name="action_sheet_separator">@android:color/system_accent1_400</item>
         <item name="activity_indicator_tint">@android:color/system_neutral1_200</item>
         <item name="attach_picker_tab_active_background">@android:color/system_accent1_500</item>
         <item name="attach_picker_tab_active_icon">@android:color/system_neutral1_100</item>
@@ -273,11 +273,11 @@
         <item name="attach_picker_tab_inactive_icon">@android:color/system_neutral1_400</item>
         <item name="attach_picker_tab_inactive_text">@android:color/system_neutral1_400</item>
         <item name="background_content">@android:color/system_neutral1_50</item>
-        <item name="background_highlighted">@color/black_alpha8</item>
+        <item name="background_highlighted">@android:color/system_neutral1_100</item>
         <item name="background_keyboard">@android:color/system_neutral1_100</item>
         <item name="background_light">@android:color/system_neutral1_50</item>
         <item name="background_page">@android:color/system_neutral1_50</item>
-        <item name="background_suggestions">@android:color/system_neutral1_100</item>
+        <item name="background_suggestions">@android:color/system_neutral1_50</item>
         <item name="button_bot_shadow">@android:color/system_neutral1_200</item>
         <item name="button_bot_shadow_disabled">#66c4c8cc</item>
         <item name="button_commerce_background">@color/green</item>
@@ -465,15 +465,15 @@
         <item name="placeholder_icon_tint">?accent</item>
         <item name="poll_option_background">@android:color/system_accent1_600</item>
         <item name="search_bar_background">@android:color/system_neutral1_100</item>
-        <item name="search_bar_field_background">@android:color/system_neutral1_50</item>
-        <item name="search_bar_field_tint">@android:color/system_neutral1_400</item>
+        <item name="search_bar_field_background">@android:color/system_accent1_50</item>
+        <item name="search_bar_field_tint">@android:color/system_neutral1_900</item>
         <item name="search_bar_segmented_control_tint">@android:color/system_neutral1_400</item>
         <item name="segmented_control_bar_background">@color/clear</item>
         <item name="segmented_control_tint">@android:color/system_neutral1_300</item>
         <item name="selection_off_icon">@android:color/system_neutral1_200</item>
-        <item name="separator_alpha">?background_content</item>
-        <item name="separator_alternate">?background_content</item>
-        <item name="separator_common">?background_content</item>
+        <item name="separator_alpha">@android:color/system_neutral1_100</item>
+        <item name="separator_alternate">@android:color/system_neutral1_100</item>
+        <item name="separator_common">@android:color/system_neutral1_100</item>
         <item name="snippet_background">@android:color/system_neutral1_100</item>
         <item name="snippet_border">@color/black_alpha15</item>
         <item name="snippet_icon_tertiary">@android:color/system_neutral1_200</item>
@@ -524,7 +524,7 @@
         <item name="accent">@android:color/system_accent1_300</item>
         <item name="accent_alpha10">@android:color/system_accent1_300</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
-        <item name="action_sheet_separator">?action_sheet_action_foreground</item>
+        <item name="action_sheet_separator">@android:color/system_neutral1_100</item>
         <item name="activity_indicator_tint">@android:color/system_neutral1_600</item>
         <item name="attach_picker_tab_active_background">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_active_icon">@android:color/system_neutral1_900</item>
@@ -537,7 +537,7 @@
         <item name="background_keyboard">@android:color/system_neutral1_800</item>
         <item name="background_light">@android:color/system_neutral1_900</item>
         <item name="background_page">@android:color/system_neutral1_1000</item>
-        <item name="background_suggestions">@android:color/system_neutral1_800</item>
+        <item name="background_suggestions">@android:color/system_neutral1_900</item>
         <item name="button_bot_shadow">@android:color/system_neutral1_900</item>
         <item name="button_bot_shadow_disabled">#6619191a</item>
         <item name="button_commerce_background">@color/green</item>
@@ -731,9 +731,9 @@
         <item name="segmented_control_bar_background">@android:color/system_neutral1_900</item>
         <item name="segmented_control_tint">@android:color/system_neutral1_500</item>
         <item name="selection_off_icon">@android:color/system_neutral1_700</item>
-        <item name="separator_alpha">?background_content</item>
-        <item name="separator_alternate">?background_content</item>
-        <item name="separator_common">?background_content</item>
+        <item name="separator_alpha">@android:color/system_neutral1_900</item>
+        <item name="separator_alternate">@android:color/system_neutral1_900</item>
+        <item name="separator_common">@android:color/system_neutral1_900</item>
         <item name="snippet_background">@android:color/system_neutral1_900</item>
         <item name="snippet_border">@android:color/system_neutral1_100</item>
         <item name="snippet_icon_tertiary">@android:color/system_neutral1_600</item>
@@ -784,7 +784,7 @@
         <item name="accent">@android:color/system_accent1_300</item>
         <item name="accent_alpha10">@android:color/system_accent1_300</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
-        <item name="action_sheet_separator">?action_sheet_action_foreground</item>
+        <item name="action_sheet_separator">@android:color/system_neutral1_100</item>
         <item name="activity_indicator_tint">@android:color/system_neutral1_600</item>
         <item name="attach_picker_tab_active_background">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_active_icon">@android:color/system_neutral1_900</item>
@@ -793,11 +793,11 @@
         <item name="attach_picker_tab_inactive_icon">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_inactive_text">@android:color/system_neutral1_500</item>
         <item name="background_content">@android:color/system_neutral1_900</item>
-        <item name="background_highlighted">@android:color/system_neutral1_1000</item>
+        <item name="background_highlighted">@android:color/system_neutral1_100</item>
         <item name="background_keyboard">@android:color/system_neutral1_800</item>
         <item name="background_light">@android:color/system_neutral1_900</item>
         <item name="background_page">@android:color/system_neutral1_1000</item>
-        <item name="background_suggestions">@android:color/system_neutral1_800</item>
+        <item name="background_suggestions">@android:color/system_neutral1_900</item>
         <item name="button_bot_shadow">@android:color/system_neutral1_900</item>
         <item name="button_bot_shadow_disabled">#6619191a</item>
         <item name="button_commerce_background">@color/green</item>
@@ -991,9 +991,9 @@
         <item name="segmented_control_bar_background">@android:color/system_neutral1_900</item>
         <item name="segmented_control_tint">@android:color/system_neutral1_500</item>
         <item name="selection_off_icon">@android:color/system_neutral1_700</item>
-        <item name="separator_alpha">?background_content</item>
-        <item name="separator_alternate">?background_content</item>
-        <item name="separator_common">?background_content</item>
+        <item name="separator_alpha">@android:color/system_neutral1_900</item>
+        <item name="separator_alternate">@android:color/system_neutral1_900</item>
+        <item name="separator_common">@android:color/system_neutral1_900</item>
         <item name="snippet_background">@android:color/system_neutral1_900</item>
         <item name="snippet_border">@android:color/system_neutral1_100</item>
         <item name="snippet_icon_tertiary">@android:color/system_neutral1_600</item>
@@ -1044,7 +1044,7 @@
         <item name="accent">@android:color/system_accent1_100</item>
         <item name="accent_alpha10">@android:color/system_accent1_100</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
-        <item name="action_sheet_separator">?action_sheet_action_foreground</item>
+        <item name="action_sheet_separator">@android:color/system_neutral1_100</item>
         <item name="activity_indicator_tint">@android:color/system_neutral1_600</item>
         <item name="attach_picker_tab_active_background">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_active_icon">@color/black</item>
@@ -1304,7 +1304,7 @@
         <item name="accent">@android:color/system_accent1_100</item>
         <item name="accent_alpha10">@android:color/system_accent1_100</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
-        <item name="action_sheet_separator">?action_sheet_action_foreground</item>
+        <item name="action_sheet_separator">@android:color/system_neutral1_100</item>
         <item name="activity_indicator_tint">@android:color/system_neutral1_600</item>
         <item name="attach_picker_tab_active_background">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_active_icon">@color/black</item>