diff --git a/res/values/colors_device_defaults.xml b/res/values/colors_device_defaults.xml
index 9a3ce32..299bdd4 100644
--- a/res/values/colors_device_defaults.xml
+++ b/res/values/colors_device_defaults.xml
@@ -13,9 +13,19 @@
 <!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
      overlaying new theme colors. -->
 <resources>
-    <color name="primary_device_default_dark">@color/system_neutral1_900</color>
-    <color name="primary_device_default_light">@color/system_neutral1_50</color>
-    <color name="primary_device_default_settings">@color/system_neutral1_900</color>
+    <!-- Define missing colors that don't exist in framework -->
+    <color name="error_color_material_dark">@android:color/system_error_200</color>
+    <color name="error_color_material_light">@android:color/system_error_600</color>
+    <color name="text_color_primary_device_default_light">@android:color/system_on_surface_light</color>
+    <color name="text_color_primary_device_default_dark">@android:color/system_on_surface_dark</color>
+    <color name="secondary_material_settings">@android:color/system_accent2_500</color>
+    <color name="secondary_material_settings_light">@android:color/system_accent2_300</color>
+    <color name="tertiary_material_settings">@android:color/system_accent3_500</color>
+    <color name="quaternary_material_settings">@android:color/system_neutral1_600</color>
+
+    <color name="primary_device_default_dark">@android:color/system_neutral1_900</color>
+    <color name="primary_device_default_light">@android:color/system_neutral1_50</color>
+    <color name="primary_device_default_settings">@android:color/system_neutral1_900</color>
     <color name="primary_device_default_settings_light">@color/primary_device_default_light</color>
     <color name="primary_dark_device_default_dark">@color/primary_device_default_dark</color>
     <color name="primary_dark_device_default_light">@color/primary_device_default_light</color>
@@ -27,39 +37,39 @@
     <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color>
     <color name="navigation_bar_divider_device_default_settings">#1f000000</color>
     <!--  Accent colors  -->
-    <color name="accent_device_default_light">@color/system_accent1_600</color>
-    <color name="accent_device_default_dark">@color/system_accent1_100</color>
+    <color name="accent_device_default_light">@android:color/system_accent1_600</color>
+    <color name="accent_device_default_dark">@android:color/system_accent1_100</color>
     <color name="accent_device_default">@color/accent_device_default_light</color>
-    <color name="accent_primary_device_default">@color/system_accent1_100</color>
-    <color name="accent_secondary_device_default">@color/system_accent2_100</color>
-    <color name="accent_tertiary_device_default">@color/system_accent3_100</color>
+    <color name="accent_primary_device_default">@android:color/system_accent1_100</color>
+    <color name="accent_secondary_device_default">@android:color/system_accent2_100</color>
+    <color name="accent_tertiary_device_default">@android:color/system_accent3_100</color>
     <!-- Accent variants -->
-    <color name="accent_primary_variant_light_device_default">@color/system_accent1_600</color>
-    <color name="accent_secondary_variant_light_device_default">@color/system_accent2_600</color>
-    <color name="accent_tertiary_variant_light_device_default">@color/system_accent3_600</color>
-    <color name="accent_primary_variant_dark_device_default">@color/system_accent1_300</color>
-    <color name="accent_secondary_variant_dark_device_default">@color/system_accent2_300</color>
-    <color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color>
+    <color name="accent_primary_variant_light_device_default">@android:color/system_accent1_600</color>
+    <color name="accent_secondary_variant_light_device_default">@android:color/system_accent2_600</color>
+    <color name="accent_tertiary_variant_light_device_default">@android:color/system_accent3_600</color>
+    <color name="accent_primary_variant_dark_device_default">@android:color/system_accent1_300</color>
+    <color name="accent_secondary_variant_dark_device_default">@android:color/system_accent2_300</color>
+    <color name="accent_tertiary_variant_dark_device_default">@android:color/system_accent3_300</color>
     <!-- Background colors -->
-    <color name="background_device_default_dark">@color/system_neutral1_900</color>
-    <color name="background_device_default_light">@color/system_neutral1_50</color>
+    <color name="background_device_default_dark">@android:color/system_neutral1_900</color>
+    <color name="background_device_default_light">@android:color/system_neutral1_50</color>
     <color name="background_floating_device_default_dark">@color/background_device_default_dark</color>
     <color name="background_floating_device_default_light">@color/background_device_default_light</color>
     <!-- Surface colors -->
-    <color name="surface_header_dark">@color/system_neutral1_700</color>
-    <color name="surface_header_light">@color/system_neutral1_100</color>
-    <color name="surface_variant_dark">@color/system_neutral1_700</color>
-    <color name="surface_variant_light">@color/system_neutral2_100</color>
-    <color name="surface_dark">@color/system_neutral1_800</color>
-    <color name="surface_highlight_light">@color/system_neutral1_0</color>
+    <color name="surface_header_dark">@android:color/system_neutral1_700</color>
+    <color name="surface_header_light">@android:color/system_neutral1_100</color>
+    <color name="surface_variant_dark">@android:color/system_neutral1_700</color>
+    <color name="surface_variant_light">@android:color/system_neutral2_100</color>
+    <color name="surface_dark">@android:color/system_neutral1_800</color>
+    <color name="surface_highlight_light">@android:color/system_neutral1_0</color>
     <!-- Please refer to text_color_[primary]_device_default_[light].xml for text colors-->
     <color name="foreground_device_default_light">@color/text_color_primary_device_default_light</color>
     <color name="foreground_device_default_dark">@color/text_color_primary_device_default_dark</color>
     <!-- Error color -->
     <color name="error_color_device_default_dark">@color/error_color_material_dark</color>
     <color name="error_color_device_default_light">@color/error_color_material_light</color>
-    <color name="list_divider_color_light">@color/system_neutral1_200</color>
-    <color name="list_divider_color_dark">@color/system_neutral1_700</color>
+    <color name="list_divider_color_light">@android:color/system_neutral1_200</color>
+    <color name="list_divider_color_dark">@android:color/system_neutral1_700</color>
     <color name="list_divider_opacity_device_default_light">@android:color/white</color>
     <color name="list_divider_opacity_device_default_dark">@android:color/white</color>
     <color name="loading_gradient_background_color_dark">#44484C</color>