diff --git a/res/values/colors_device_defaults.xml b/res/values/colors_device_defaults.xml
index a73c712..180c1bc 100644
--- a/res/values/colors_device_defaults.xml
+++ b/res/values/colors_device_defaults.xml
@@ -32,34 +32,34 @@
     <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">@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_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">@android:color/accent_device_default_light</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>