diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml
index c94d155a5f39464adc9cb70ccb2cd512f5125f2b..157e622321a73d3431bd24f29c2041a4692d719a 100644
--- a/res/color/search_chip_background_color.xml
+++ b/res/color/search_chip_background_color.xml
@@ -16,7 +16,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>
-    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
+    <item android:state_selected="true" android:color="@*android:color/e_alpha_accent"/>
+    <item android:state_enabled="true" android:color="@*android:color/e_action_bar"/>
     <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/bottom_sheet_dialog_background.xml b/res/drawable/bottom_sheet_dialog_background.xml
index 703667a52423ac8aef3b3576999f5155fb99f419..f3f7bb930fedc9e62cd8fe0aaf77fcdcbdf7e9ed 100644
--- a/res/drawable/bottom_sheet_dialog_background.xml
+++ b/res/drawable/bottom_sheet_dialog_background.xml
@@ -15,7 +15,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="?android:attr/colorBackground" />
+    <solid android:color="?android:attr/colorBackgroundFloating" />
 
     <corners android:topLeftRadius="@dimen/grid_item_radius"
              android:topRightRadius="@dimen/grid_item_radius"
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index 1a9993033240dffb18681a538d51f4ac8d01fb9f..4ccac591f8a9942d1366889364fc47a02df59cad 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:colorControlNormal"
+        android:fillColor="@*android:color/e_primary_text_color"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index bc273524ba973bce677a3975297e79d28abe813c..09e9782d822e2cc2ece7994f92f61dadfc989245 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@*android:color/e_primary_text_color"
         android:pathData="M3,18h18v-2H3V18zM3,13h18v-2H3V13zM3,6v2h18V6H3z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml
index 5067af08e842dd9fc197a8f8d3f618c343c1b768..de96b1f12df9b083d9180caf9fc1dde49d4a0296 100644
--- a/res/drawable/list_divider.xml
+++ b/res/drawable/list_divider.xml
@@ -15,7 +15,7 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:tint="?android:attr/colorForeground">
+       android:tint="@android:color/transparent">
     <solid android:color="@color/list_divider_color" />
     <size
         android:height="1dp"
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
index d08c17d9fae3a80794c0aa73aaabf7a7306f8b17..52cb68ad262c80e3ec01035ed233d27b458042a4 100644
--- a/res/layout/drawer_layout.xml
+++ b/res/layout/drawer_layout.xml
@@ -79,13 +79,13 @@
             android:layout_gravity="start"
             android:orientation="vertical"
             android:elevation="0dp"
-            android:background="?android:attr/colorBackground">
+            android:background="@*android:color/e_drawer_background">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/roots_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@*android:color/e_drawer_background"
                 android:elevation="0dp"
                 app:titleTextAppearance="@style/DrawerMenuTitle"
                 app:titleTextColor="?android:colorAccent"/>
diff --git a/res/layout/fragment_pick.xml b/res/layout/fragment_pick.xml
index cba4ecb9a467c25c1d892f39317b872ea7b40efc..c3446f4944e80da98a7e9913b062b349fb9121fa 100644
--- a/res/layout/fragment_pick.xml
+++ b/res/layout/fragment_pick.xml
@@ -44,8 +44,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-            android:backgroundTint="@color/fragment_pick_button_background_color"
-            android:textColor="@color/fragment_pick_button_text_color"
             android:layout_marginEnd="4dp" />
 
         <!-- Handles touch events when button1 is disabled. -->
diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml
index 8763351c9f33b27ca4cb3217b777a13deb006cc8..4d531b1970892c35648ad6bddc547467bc3277c0 100644
--- a/res/layout/inspector_activity.xml
+++ b/res/layout/inspector_activity.xml
@@ -55,7 +55,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@*android:color/e_action_bar"
                 android:theme="?actionBarTheme"
                 app:title="@string/inspector_title"
                 app:titleTextAppearance="@style/ToolbarTitle"
@@ -76,7 +76,7 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bottom_sheet_dialog_background"
+            android:background="@color/app_background_color"
             android:paddingBottom="5dp">
 
             <com.android.documentsui.inspector.DetailsView
diff --git a/res/layout/inspector_header.xml b/res/layout/inspector_header.xml
index 94a092790a434286dc3d091a32e1cc6318f70afd..d50ccf09602d037ef51ae70a0570642fefe78d27 100644
--- a/res/layout/inspector_header.xml
+++ b/res/layout/inspector_header.xml
@@ -24,6 +24,6 @@
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
         android:alpha="0.0"
-        android:background="?android:colorBackgroundFloating" />
+        android:background="?android:colorBackground" />
 
 </RelativeLayout>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 143b3e693cfa8847837796f909cfea62d7198da0..71c0d45b2ad8adb1fb6ea43fee83864b38c749eb 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -14,14 +14,8 @@
      limitations under the License.
 -->
 <resources>
-    <color name="app_background_color">#202124</color>
-    <color name="background_floating">#3C4043</color>
     <color name="nav_bar_translucent">#52000000</color>
 
-    <color name="primary">#8AB4F8</color>
-    <color name="secondary">#3D8AB4F8</color>
-    <color name="hairline">#5F6368</color>
-
     <color name="empty_state_text_color">@android:color/white</color>
     <color name="error_image_color">@android:color/white</color>
 
@@ -32,7 +26,6 @@
     <color name="doc_list_item_subtitle_disabled">#36ffffff</color>
 
     <color name="list_divider_color">#9aa0a6</color>
-    <color name="list_item_selected_background_color">?android:colorSecondary</color>
 
     <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
 </resources>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 8ade73172dd2fdfff1ce649528d6356ad1ad73d3..ddf2dcd0278b53d0f53542362831e510a8a7a175 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -18,30 +18,4 @@
     <style name="LauncherTheme" parent="DocumentsTheme">
         <item name="android:windowBackground">@drawable/launcher_screen_night</item>
     </style>
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <!-- Toolbar -->
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@color/app_background_color</item>
-        <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-    </style>
 </resources>
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
index c82ff581433ae77f8b0a17c02869e6e37d368bff..5c64448bb75be1969a760cf6fe7b90f92b0f8de8 100644
--- a/res/values-v31/styles.xml
+++ b/res/values-v31/styles.xml
@@ -39,7 +39,7 @@
   <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
     <item name="android:textAppearance">@style/MaterialButtonTextAppearance
     </item>
-    <item name="android:backgroundTint">@android:color/white</item>
+    <item name="android:backgroundTint">@*android:color/e_floating_background</item>
     <item name="android:textColor">?android:colorAccent</item>
   </style>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 12b8762aafe4d26ad1b7166d85705cbf4d37969b..54d86f25fa9369adf4a128ed3fb95c3badfcd18e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,13 +18,13 @@
        else that needs to manually declare a background matching the "default"
        app background (e.g. the drawer overlay). -->
 
-  <color name="app_background_color">@android:color/white</color>
-  <color name="background_floating">@android:color/white</color>
+  <color name="app_background_color">@*android:color/e_background</color>
+  <color name="background_floating">@*android:color/e_floating_background</color>
   <color name="nav_bar_translucent">#99FFFFFF</color>
 
-  <color name="primary">#1E88E5</color> <!-- Blue 600 -->
-  <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
-  <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
+  <color name="primary">@*android:color/e_accent</color> <!-- Blue 600 -->
+  <color name="secondary">@*android:color/e_alpha_accent</color> <!-- Blue 50 -->
+  <color name="hairline">@*android:color/e_stroke_color</color>
 
   <color name="chip_background_disable_color">#fff1f3f4</color>
   <color name="menu_search_background">@android:color/transparent</color>
@@ -55,7 +55,7 @@
   <color name="list_divider_color">#1f000000</color>
   <color name="list_item_selected_background_color">?android:colorSecondary
   </color>
-  <color name="color_surface_header">@color/app_background_color</color>
+  <color name="color_surface_header">@*android:color/e_action_bar</color>
 
   <color name="tab_selected_text_color">@color/primary</color>
   <color name="work_profile_button_stroke_color">@color/primary</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1efd1d5d188c41cf57465e28cc9fa5b624e48a89..6576d445de920f36e32b68882159a2fe7faab8a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,6 +24,7 @@
              override this -->
         <item name="android:actionMenuTextColor">?android:textColorPrimary</item>
         <item name="android:textAllCaps">false</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <!-- This gets overridden for specific platform versions and/or configs -->
@@ -37,7 +38,7 @@
     </style>
 
     <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">@color/app_background_color</item>
+        <item name="cardBackgroundColor">@*android:color/e_floating_background</item>
         <item name="cardPreventCornerOverlap">false</item>
         <item name="cardCornerRadius">@dimen/grid_item_radius</item>
         <item name="cardElevation">@dimen/grid_item_elevation</item>
@@ -69,7 +70,6 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?android:colorControlNormal</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
     </style>
 
@@ -113,6 +113,8 @@
     </style>
 
     <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered">
+        <item name="colorSurface">@color/background_floating</item>
+        <item name="elevationOverlayEnabled">false</item>
         <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>
         <item name="alertDialogStyle">@style/MaterialAlertDialogStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4433742822b46e7185983101213cb601478ccf4c..058ec428f3b3b6efd683b843ed8738f6121fd2d8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,13 +22,13 @@
     <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
 
         <item name="android:actionBarSize">@dimen/action_bar_size</item>
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
+        <item name="android:actionModeBackground">@*android:color/e_action_bar</item>
 
         <!-- Color section -->
         <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:colorBackground">@color/app_background_color</item>
         <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_light</item>
+        <item name="android:colorControlHighlight">@*android:color/e_alpha_accent</item>
         <item name="android:colorControlActivated">@color/primary</item>
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorSecondary">@color/secondary</item>
@@ -36,16 +36,15 @@
 
         <!-- System | Widget section -->
         <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:colorBackground</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:statusBarColor">@*android:color/e_action_bar</item>
+        <item name="android:navigationBarColor">@*android:color/e_action_bar</item>
         <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
 
         <!-- OEM should not overlay this attr -->
         <item name="android:windowNoTitle">true</item>
-
+        <item name="android:textColorPrimary">@*android:color/e_primary_text_color</item>
+        <item name="android:textColorSecondary">@*android:color/e_secondary_text_color</item>
     </style>
 
     <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 4f455c1a4acb3422d108d974fa9ff11a4ce96c0c..c25f73613d44a6f84e764b13abf977e54e6c0101 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -528,12 +528,6 @@ public abstract class BaseActivity
         });
 
         getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
-        if (Build.VERSION.SDK_INT >= 29) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setNavigationBarContrastEnforced(true);
-        } else {
-            getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
     }
 
     @Override
diff --git a/src/com/android/documentsui/inspector/InspectorActivity.java b/src/com/android/documentsui/inspector/InspectorActivity.java
index 948d66fb27c213b052e6600c816538cfaebd28f6..42759526111f7273c040fa769548bda38bca4748 100644
--- a/src/com/android/documentsui/inspector/InspectorActivity.java
+++ b/src/com/android/documentsui/inspector/InspectorActivity.java
@@ -119,11 +119,5 @@ public class InspectorActivity extends AppCompatActivity {
         });
 
         getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
-        if (Build.VERSION.SDK_INT >= 29) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setNavigationBarContrastEnforced(true);
-        } else {
-            getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
     }
 }
\ No newline at end of file