diff --git a/res/values-night-v21/colors.xml b/res/values-night-v21/colors.xml
index d3c7a39228f58faaf3be476e868e8185b4e3d53e..ccea56697f600f890d20401d815db87b6042fd9c 100644
--- a/res/values-night-v21/colors.xml
+++ b/res/values-night-v21/colors.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#121212</color>
-    <color name="colorPrimaryDark">#272727</color>
-    <color name="colorAccent">#5db2ff</color>
-    <color name="color_default_primary_text">#ccffffff</color>
-    <color name="color_default_secondary_text">#8cffffff</color>
+    <color name="colorPrimary">@*android:color/background_material_dark</color>
+    <color name="colorPrimaryDark">@*android:color/primary_dark_material_dark</color>
+    <color name="colorAccent">@*android:color/accent_material_dark</color>
+    <color name="color_default_primary_text">@*android:color/bright_foreground_holo_dark</color>
+    <color name="color_default_secondary_text">@*android:color/dim_foreground_holo_dark</color>
     <color name="color_default_blue_lite">#145db2ff</color>
     <color name="color_gray2">#848484</color>
-    <color name="popup_background">#2e2e2e</color>
-    <color name="date_strip_bg">#2e2e2e</color>
-    <color name="icon_color">#bdffffff</color>
-    <color name="appbar_text_color">#deffffff</color>
-    <color name="appbar_icon_color">#99ffffff</color>
+    <color name="popup_background">@*android:color/background_floating_material_dark</color>
+    <color name="date_strip_bg">#1e1e1e</color>
+    <color name="icon_color">@*android:color/dim_foreground_holo_dark</color>
+    <color name="appbar_text_color">@*android:color/bright_foreground_holo_dark</color>
+    <color name="appbar_icon_color">@*android:color/dim_foreground_holo_dark</color>
     <color name="navigation_drawer_color">#363636</color>
-    <color name="color_non_focus_item_bg">#2e2e2e</color>
-    <color name="foreground_color">#2e2e2e</color>
+    <color name="color_non_focus_item_bg">#1e1e1e</color>
+    <color name="foreground_color">@*android:color/background_floating_material_light</color>
     <color name="grid_line_dark">#1fffffff</color>
     <color name="calendar_grid_line_inner_horizontal_color">#1fffffff</color>
     <color name="calendar_grid_line_inner_vertical_color">#1fffffff</color>
diff --git a/res/values-v21/colors.xml b/res/values-v21/colors.xml
index 3be95af68d649ab2fba68ad2be56c9ae0773538f..c33b486aa590fc7e94d18e9f5e981729a5eecadb 100644
--- a/res/values-v21/colors.xml
+++ b/res/values-v21/colors.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="colorPrimary">#ffffff</color>
-    <color name="colorPrimaryDark">#ffffff</color>
-    <color name="colorAccent">#0086ff</color>
-    <color name="color_default_primary_text">#cc000000</color>
-    <color name="color_default_secondary_text">#8c000000</color>
+<resources>
+    <color name="colorPrimary">@*android:color/primary_material_light</color>
+    <color name="colorPrimaryDark">@*android:color/primary_dark_material_light</color>
+    <color name="colorAccent">@*android:color/accent_material_light</color>
+    <color name="color_default_primary_text">@*android:color/bright_foreground_holo_light</color>
+    <color name="color_default_secondary_text">@*android:color/dim_foreground_holo_light</color>
     <color name="color_default_blue_lite">#140086ff</color>
     <color name="color_gray2">#848484</color>
-    <color name="popup_background">#ffffff</color>
+    <color name="popup_background">@*android:color/background_floating_material_light</color>
     <color name="date_strip_bg">#eeeeee</color>
-    <color name="icon_color">#99000000</color>
-    <color name="appbar_text_color">#de000000</color>
-    <color name="appbar_icon_color">#99000000</color>
+    <color name="icon_color">@*android:color/dim_foreground_holo_light</color>
+    <color name="appbar_text_color">@*android:color/bright_foreground_holo_light</color>
+    <color name="appbar_icon_color">@*android:color/dim_foreground_holo_light</color>
     <color name="navigation_drawer_color">#ffffff</color>
     <color name="color_non_focus_item_bg">#f0f0f0</color>
-    <color name="foreground_color">#ffffff</color>
+    <color name="foreground_color">@*android:color/background_floating_material_light</color>
     <color name="calendar_grid_line_inner_horizontal_color">#14212121</color>
     <color name="calendar_grid_line_inner_vertical_color">#14212121</color>
     <color name="month_grid_lines">#14212121</color>