Merge branch 'feature/dark-theme' into dev

2025-12-08 01:58:52 -06:00 · 2016-04-15 18:29:39 -04:00
parent f5f3ec9f88 90e513e778
commit b601a643dd
101 changed files with 1299 additions and 646 deletions
--- a/app/src/main/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png
+++ b/app/src/main/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png
--- a/app/src/main/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png
+++ b/app/src/main/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png
--- a/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_focused_holo_light.9.png
--- a/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png
+++ b/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png
--- a/app/src/main/res/drawable-hdpi/apptheme_textfield_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-hdpi/apptheme_textfield_focused_holo_light.9.png
--- a/app/src/main/res/drawable-hdpi/ic_action_add.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_add.png
--- a/app/src/main/res/drawable-hdpi/ic_action_add_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_add_dark.png
--- a/app/src/main/res/drawable-hdpi/ic_action_add_light.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_add_light.png
--- a/app/src/main/res/drawable-hdpi/ic_action_edit_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_edit_dark.png
--- a/app/src/main/res/drawable-hdpi/ic_action_edit_light.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_edit_light.png
--- a/app/src/main/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png
+++ b/app/src/main/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png
--- a/app/src/main/res/drawable-mdpi/apptheme_textfield_default_holo_light.9.png
+++ b/app/src/main/res/drawable-mdpi/apptheme_textfield_default_holo_light.9.png
--- a/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_focused_holo_light.9.png
--- a/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png
+++ b/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png
--- a/app/src/main/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png
--- a/app/src/main/res/drawable-mdpi/ic_action_add.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_add.png
--- a/app/src/main/res/drawable-mdpi/ic_action_add_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_add_dark.png
--- a/app/src/main/res/drawable-mdpi/ic_action_add_light.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_add_light.png
--- a/app/src/main/res/drawable-mdpi/ic_action_edit_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_edit_dark.png
--- a/app/src/main/res/drawable-mdpi/ic_action_edit_light.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_edit_light.png
--- a/app/src/main/res/drawable-v21/ripple_white.xml
+++ b/app/src/main/res/drawable-v21/ripple_white.xml
@@ -20,5 +20,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
        android:color="?android:colorControlHighlight">

-    <item android:drawable="@color/white" />
+    <item android:drawable="?attr/cardBackgroundColor" />
 </ripple>
--- a/app/src/main/res/menu-v21/show_habit_fragment_menu.xml
+++ b/app/src/main/res/menu-v21/show_habit_fragment_menu.xml
@@ -18,11 +18,7 @@
  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
  -->

-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_edit_habit"
-        android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_edit_dark"
-        android:title="@string/edit"/>
-</menu>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="?highlightedBackgroundColor" />
+    <stroke android:width="2dip" android:color="@color/grey_500"/>
+</shape>
--- a/app/src/main/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png
+++ b/app/src/main/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png
--- a/app/src/main/res/drawable-xhdpi/apptheme_textfield_default_holo_light.9.png
+++ b/app/src/main/res/drawable-xhdpi/apptheme_textfield_default_holo_light.9.png
--- a/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png
--- a/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_holo_light.9.png
+++ b/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_holo_light.9.png
--- a/app/src/main/res/drawable-xhdpi/apptheme_textfield_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-xhdpi/apptheme_textfield_focused_holo_light.9.png
--- a/app/src/main/res/drawable-xhdpi/ic_action_add.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_add.png
--- a/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png
--- a/app/src/main/res/drawable-xhdpi/ic_action_add_light.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_add_light.png
--- a/app/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
--- a/app/src/main/res/drawable-xhdpi/ic_action_edit_light.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_edit_light.png
--- a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png
+++ b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png
--- a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png
+++ b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png
--- a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png
--- a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_holo_light.9.png
+++ b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_holo_light.9.png
--- a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png
+++ b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png
--- a/app/src/main/res/drawable-xxhdpi/ic_action_add.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_add.png
--- a/app/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
--- a/app/src/main/res/drawable-xxhdpi/ic_action_add_light.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_add_light.png
--- a/app/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
--- a/app/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
--- a/app/src/main/res/drawable/apptheme_edit_text_holo_light.xml
+++ b/app/src/main/res/drawable/apptheme_edit_text_holo_light.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/apptheme_textfield_default_holo_light" />
-    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/apptheme_textfield_disabled_holo_light" />
-    <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/apptheme_textfield_activated_holo_light" />
-    <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/apptheme_textfield_focused_holo_light" />
-    <item android:state_enabled="true" android:drawable="@drawable/apptheme_textfield_default_holo_light" />
-    <item android:state_focused="true" android:drawable="@drawable/apptheme_textfield_disabled_focused_holo_light" />
-    <item android:drawable="@drawable/apptheme_textfield_disabled_holo_light" />
-</selector>
--- a/app/src/main/res/drawable/card_amoled_background.xml
+++ b/app/src/main/res/drawable/card_amoled_background.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="0dp"
+        android:bottom="0dp"
+        android:left="0dp"
+        android:right="0dp">
+        <shape>
+            <solid android:color="@color/black" />
+        </shape>
+    </item>
+    <item
+        android:top="0dp"
+        android:bottom="1dp"
+        android:left="0dp"
+        android:right="0dp">
+        <shape>
+            <solid android:color="@color/black" />
+        </shape>
+    </item>
+    <item
+        android:top="0dp"
+        android:bottom="1.5dp"
+        android:left="0dp"
+        android:right="0dp">
+        <shape>
+            <solid android:color="@color/black"/>
+        </shape>
+    </item>
+    <item
+        android:top="0.5dp"
+        android:bottom="1.5dp"
+        android:left="0.5dp"
+        android:right="0.5dp">
+        <shape>
+            <solid android:color="@color/black"/>
+        </shape>
+    </item>
+</layer-list>
--- a/app/src/main/res/drawable/card_dark_background.xml
+++ b/app/src/main/res/drawable/card_dark_background.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="0dp"
+        android:bottom="0dp"
+        android:left="0dp"
+        android:right="0dp">
+        <shape>
+            <solid android:color="#202020" />
+        </shape>
+    </item>
+    <item
+        android:top="0dp"
+        android:bottom="1dp"
+        android:left="0dp"
+        android:right="0dp">
+        <shape>
+            <solid android:color="#101010" />
+        </shape>
+    </item>
+    <item
+        android:top="0dp"
+        android:bottom="1.5dp"
+        android:left="0dp"
+        android:right="0dp">
+        <shape>
+            <solid android:color="#202020"/>
+        </shape>
+    </item>
+    <item
+        android:top="0.5dp"
+        android:bottom="1.5dp"
+        android:left="0.5dp"
+        android:right="0.5dp">
+        <shape>
+            <solid android:color="@color/grey_850"/>
+        </shape>
+    </item>
+</layer-list>
--- a/app/src/main/res/drawable/card_light_background.xml
+++ b/app/src/main/res/drawable/card_light_background.xml
--- a/app/src/main/res/drawable/habits_list_header_amoled_background.xml
+++ b/app/src/main/res/drawable/habits_list_header_amoled_background.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:top="40dp">
+        <shape android:shape="rectangle" >
+            <gradient
+                android:startColor="@color/black"
+                android:endColor="@color/black"
+                android:angle="270"/>
+        </shape>
+    </item>
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/black" />
+        </shape>
+    </item>
+
+</layer-list>
--- a/app/src/main/res/drawable/habits_list_header_dark_background.xml
+++ b/app/src/main/res/drawable/habits_list_header_dark_background.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:top="40dp">
+        <shape android:shape="rectangle" >
+            <gradient
+                android:startColor="#30000000"
+                android:endColor="#00000000"
+                android:angle="270"/>
+        </shape>
+    </item>
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="#202020" />
+        </shape>
+    </item>
+
+</layer-list>
--- a/app/src/main/res/drawable/habits_list_header_light_background.xml
+++ b/app/src/main/res/drawable/habits_list_header_light_background.xml
@@ -20,7 +20,7 @@

 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item android:top="40dp">
+    <item android:top="44dp">
        <shape android:shape="rectangle" >
            <gradient
                android:startColor="#30000000"
--- a/app/src/main/res/drawable/selected_box_amoled.xml
+++ b/app/src/main/res/drawable/selected_box_amoled.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
  ~
@@ -17,12 +18,7 @@
  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
  -->

-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.isoron.uhabits.MainActivity" >
-    
-    <item
-        android:id="@+id/action_add"
-        android:title="@string/add_habit" android:showAsAction="always" android:icon="@drawable/ic_action_add_dark"/>
-
-</menu>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/black" />
+    <stroke android:width="2dip" android:color="@color/grey_500"/>
+</shape>
--- a/app/src/main/res/menu-v21/list_habits_context.xml
+++ b/app/src/main/res/menu-v21/list_habits_context.xml
@@ -18,31 +18,7 @@
  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
  -->

-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_edit_habit"
-        android:title="@string/edit"
-        android:icon="@drawable/ic_action_edit_dark"/>
-
-    <item
-        android:id="@+id/action_color"
-        android:title="@string/color_picker_default_title"
-        android:icon="@drawable/ic_action_color_dark"/>
-
-    <item
-        android:id="@+id/action_archive_habit"
-        android:title="@string/archive"
-        android:icon="@drawable/ic_action_archive_dark" />
-
-    <item
-        android:id="@+id/action_unarchive_habit"
-        android:title="@string/unarchive"
-        android:icon="@drawable/ic_action_unarchive_dark"/>
-
-    <item
-        android:id="@+id/action_delete"
-        android:title="@string/delete"
-        android:showAsAction="never" />
-
-</menu>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/grey_800" />
+    <stroke android:width="2dip" android:color="@color/grey_500"/>
+</shape>
--- a/app/src/main/res/drawable/selected_box_light.xml
+++ b/app/src/main/res/drawable/selected_box_light.xml
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -21,14 +21,14 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
            android:layout_width="fill_parent"
            android:layout_height="fill_parent"
-            android:background="@color/windowBackground"
+            android:background="?windowBackgroundColor"
            android:fillViewport="true">

    <LinearLayout
-        style="@style/cardsListStyle">
+        style="@style/CardList">

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:gravity="center">

            <ImageView
@@ -44,7 +44,7 @@
                android:textStyle="bold"
                android:textSize="16sp"
                android:layout_margin="6dp"
-                android:textColor="@color/blue_700"
+                android:textColor="?aboutScreenColor"
                android:text="@string/app_name"/>

            <TextView
@@ -57,124 +57,124 @@
        </LinearLayout>

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:gravity="center">

            <TextView
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/links"
-                android:textColor="@color/blue_700"/>
+                android:textColor="?aboutScreenColor"/>

            <TextView
                android:id="@+id/tvRate"
-                style="@style/aboutClickableItemStyle"
+                style="@style/About.Item.Clickable"
                android:text="@string/pref_rate_this_app"/>

            <TextView
                android:id="@+id/tvFeedback"
-                style="@style/aboutClickableItemStyle"
+                style="@style/About.Item.Clickable"
                android:text="@string/pref_send_feedback"/>

            <TextView
                android:id="@+id/tvSource"
-                style="@style/aboutClickableItemStyle"
+                style="@style/About.Item.Clickable"
                android:text="@string/pref_view_source_code"/>

        </LinearLayout>

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:gravity="center">

            <TextView
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/developers"
-                android:textColor="@color/blue_700"/>
+                android:textColor="?aboutScreenColor"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Álinson Xavier"/>
        </LinearLayout>

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:gravity="center">

            <TextView
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/translators"
-                android:textColor="@color/blue_700"/>
+                android:textColor="?aboutScreenColor"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Limin Lu (中文)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="François Mahé (Français)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Naofumi F (日本語)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Matthias Meisser (Deutsch)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Al Alloush (العَرَبِية‎)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Thibaut Girka (Français)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Can Altas (Deutsch)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Marco Cavazza (Italiano)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Adam Jurkiewicz (Polski)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Dmitriy Bogdanov (Русский)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Dalecarlian (Svenska)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Robin (Svenska)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Josh (한국어 )"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Ander Raso Vazquez (Español)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="XuToTo (中文)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Tomáš Borovec (Čeština)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Mathis Chenuet (Français)"/>

            <TextView
-                style="@style/aboutItemStyle"
+                style="@style/About.Item"
                android:text="Álinson Xavier (Português)"/>
        </LinearLayout>
    </LinearLayout>
--- a/app/src/main/res/layout/edit_habit.xml
+++ b/app/src/main/res/layout/edit_habit.xml
@@ -45,7 +45,7 @@
                android:id="@+id/buttonPickColor"
                style="@style/dialogFormInputColor"
                android:contentDescription="@string/color_picker_default_title"
-                android:src="@drawable/ic_action_color_light"/>
+                android:src="?dialogIconChangeColor"/>
        </LinearLayout>

        <EditText
@@ -63,7 +63,7 @@

            <Spinner
                android:id="@+id/sFrequency"
-                style="@style/dialogFormSpinner"
+                style="?dialogFormSpinnerTheme"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:entries="@array/frequencyQuickSelect"
@@ -111,7 +111,7 @@

            <TextView
                android:id="@+id/inputReminderTime"
-                style="@style/dialogFormSpinner"/>
+                style="?dialogFormSpinnerTheme"/>
        </LinearLayout>

        <LinearLayout
@@ -125,7 +125,7 @@

            <TextView
                android:id="@+id/inputReminderDays"
-                style="@style/dialogFormSpinner"/>
+                style="?dialogFormSpinnerTheme"/>

        </LinearLayout>
    </LinearLayout>
--- a/app/src/main/res/layout/list_habits_fragment.xml
+++ b/app/src/main/res/layout/list_habits_fragment.xml
@@ -26,12 +26,17 @@

    <com.mobeta.android.dslv.DragSortListView
        android:id="@+id/listView"
-        style="@style/habitsListStyle"
        dslv:drag_enabled="true"
        dslv:drag_start_mode="onLongPress"
        dslv:sort_enabled="true"
        dslv:track_drag_sort="false"
-        />
+        android:layout_width="match_parent"
+        android:background="?windowBackgroundColor"
+        android:paddingTop="@dimen/checkmarkHeight"
+        android:layout_height="match_parent"
+        android:divider="?windowBackgroundColor"
+        android:listSelector="@android:color/transparent"
+        android:dividerHeight="1dp"/>

    <LinearLayout
        android:id="@+id/llEmpty"
@@ -42,30 +47,32 @@

        <TextView
            android:id="@+id/tvStarEmpty"
-            style="@style/habitsListEmptyStyle"
+            style="@style/ListHabits.EmptyState"
            android:text="@string/fa_star_half_o"
            android:textSize="80sp"/>

        <TextView
-            style="@style/habitsListEmptyStyle"
+            style="@style/ListHabits.EmptyState"
            android:text="@string/no_habits_found"/>

    </LinearLayout>

-    <LinearLayout style="@style/habitsListHeaderStyle">
+    <LinearLayout
+        android:id="@+id/header"
+        style="@style/ListHabits.Header">

        <TextView
            android:id="@+id/tvStarHeader"
-            style="@style/habitsListStarStyle"/>
+            style="@style/ListHabits.Star"/>

        <TextView
            android:id="@+id/tvNameHeader"
-            style="@style/habitsListNameStyle"
+            style="@style/ListHabits.Label"
            android:text=""/>

        <LinearLayout
            android:id="@+id/llButtonsHeader"
-            style="@style/habitsListButtonsPanelStyle"/>
+            style="@style/ListHabits.CheckmarkPanel"/>
    </LinearLayout>

    <ProgressBar
@@ -73,7 +80,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_marginTop="37dp"
+        android:layout_below="@id/header"
        />

    <LinearLayout
@@ -85,7 +92,7 @@
        android:orientation="vertical"
        android:animateLayoutChanges="true"
        android:visibility="invisible"
-        style="@style/cardStyle">
+        style="@style/Card">

        <TextView
            android:layout_width="wrap_content"
--- a/app/src/main/res/layout/list_habits_header_check.xml
+++ b/app/src/main/res/layout/list_habits_header_check.xml
@@ -18,6 +18,14 @@
  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
  -->

-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/tvCheck"
-    style="@style/habitsListHeaderCheckStyle" />
+    style="@style/ListHabits.Checkmark"
+    android:layout_width="20dp"
+    android:layout_height="20dp"
+    android:background="@color/transparent"
+    android:textColor="?mediumContrastTextColor"
+    android:textAllCaps="true"
+    android:textStyle="bold"
+    android:textSize="10sp"/>
--- a/app/src/main/res/layout/list_habits_item.xml
+++ b/app/src/main/res/layout/list_habits_item.xml
@@ -20,23 +20,23 @@

 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/llOuter"
-    style="@style/habitsListItemStyle">
+    style="@style/ListHabits.Item">

    <LinearLayout
        android:id="@+id/llInner"
-        style="@style/habitsListItemInnerPanelStyle">
+        style="@style/ListHabits.HabitCard">

        <TextView
            android:id="@+id/tvStar"
-            style="@style/habitsListStarStyle" />
+            style="@style/ListHabits.Star" />

        <TextView
            android:id="@+id/label"
-            style="@style/habitsListNameStyle" />
+            style="@style/ListHabits.Label" />

        <LinearLayout
            android:id="@+id/llButtons"
-            style="@style/habitsListButtonsPanelStyle" />
+            style="@style/ListHabits.CheckmarkPanel" />
    </LinearLayout>

 </LinearLayout>
--- a/app/src/main/res/layout/list_habits_item_check.xml
+++ b/app/src/main/res/layout/list_habits_item_check.xml
@@ -20,4 +20,4 @@

 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/tvCheck"
-    style="@style/habitsListCheckStyle" />
+    style="@style/ListHabits.Checkmark" />
--- a/app/src/main/res/layout/show_habit.xml
+++ b/app/src/main/res/layout/show_habit.xml
@@ -22,20 +22,20 @@
            xmlns:tools="http://schemas.android.com/tools"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-            android:background="@color/windowBackground"
+            android:background="?windowBackgroundColor"
            android:fillViewport="true">

    <LinearLayout
-        style="@style/cardsListStyle"
+        style="@style/CardList"
        tools:context="org.isoron.uhabits.ShowHabitActivity">

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:gravity="start">

            <TextView
                android:id="@+id/tvOverview"
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/overview"/>

            <LinearLayout
@@ -47,7 +47,7 @@

                <org.isoron.uhabits.views.RingView
                    android:id="@+id/scoreRing"
-                    style="@style/smallDataViewStyle"
+                    style="@style/SmallDataView"
                    android:layout_width="100dp"
                    app:label="@string/strength"
                    app:maxDiameter="80"
@@ -58,7 +58,7 @@
        </LinearLayout>

        <RelativeLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:gravity="center">

            <Spinner
@@ -74,7 +74,7 @@

            <TextView
                android:id="@+id/tvStrength"
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/habit_strength"
                android:layout_alignParentTop="true"
                android:layout_alignParentLeft="true"
@@ -89,14 +89,14 @@
        </RelativeLayout>

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:clipToPadding="false"
            android:orientation="vertical"
            android:paddingBottom="0dp">

            <TextView
                android:id="@+id/tvHistory"
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/history"/>

            <org.isoron.uhabits.views.HabitHistoryView
@@ -118,12 +118,12 @@
        </LinearLayout>

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:orientation="vertical">

            <TextView
                android:id="@+id/tvStreaks"
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/best_streaks"/>

            <org.isoron.uhabits.views.HabitStreakView
@@ -133,12 +133,12 @@
        </LinearLayout>

        <LinearLayout
-            style="@style/cardStyle"
+            style="@style/Card"
            android:orientation="vertical">

            <TextView
                android:id="@+id/tvWeekdayFreq"
-                style="@style/cardHeaderStyle"
+                style="@style/CardHeader"
                android:text="@string/frequency"/>

            <org.isoron.uhabits.views.HabitFrequencyView
--- a/app/src/main/res/menu/list_habits_context.xml
+++ b/app/src/main/res/menu/list_habits_context.xml
@@ -23,25 +23,26 @@
    <item
        android:id="@+id/action_edit_habit"
        android:title="@string/edit"
-        android:icon="@drawable/ic_action_edit_light"/>
+        android:icon="?iconEdit"/>

    <item
        android:id="@+id/action_color"
        android:title="@string/color_picker_default_title"
-        android:icon="@drawable/ic_action_color_light"/>
+        android:icon="?iconChangeColor"/>

    <item
        android:id="@+id/action_archive_habit"
        android:title="@string/archive"
-        android:icon="@drawable/ic_action_archive_light" />
+        android:icon="?iconArchive" />

    <item
        android:id="@+id/action_unarchive_habit"
        android:title="@string/unarchive"
-        android:icon="@drawable/ic_action_unarchive_light"/>
+        android:icon="?iconUnarchive"/>

    <item
        android:id="@+id/action_delete"
-        android:title="@string/delete" />
+        android:title="@string/delete"
+        android:showAsAction="never"/>

 </menu>
--- a/app/src/main/res/menu/list_habits_menu.xml
+++ b/app/src/main/res/menu/list_habits_menu.xml
@@ -28,6 +28,12 @@
        android:enabled="true"
        android:title="@string/show_archived"/>

+    <item
+        android:id="@+id/action_night_mode"
+        android:checkable="true"
+        android:enabled="true"
+        android:title="@string/night_mode"/>
+
    <item
        android:id="@+id/action_settings"
        android:orderInCategory="100"
--- a/app/src/main/res/menu/list_habits_options.xml
+++ b/app/src/main/res/menu/list_habits_options.xml
@@ -23,7 +23,7 @@

    <item
        android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_add"
+        android:icon="?iconAdd"
        android:title="@string/add_habit"
        android:showAsAction="always"/>

--- a/app/src/main/res/menu/show_habit_fragment_menu.xml
+++ b/app/src/main/res/menu/show_habit_fragment_menu.xml
@@ -22,7 +22,7 @@

    <item
        android:id="@+id/action_edit_habit"
-        android:icon="@drawable/ic_action_edit_light"
+        android:icon="?iconEdit"
        android:title="@string/edit"
        android:showAsAction="ifRoom"/>

--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -20,15 +20,91 @@
 <resources>

    <style name="AppBaseTheme" parent="android:Theme.Material.Light.DarkActionBar">
-        <item name="android:textColor">#606060</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/primary_darker</item>
        <item name="android:dialogTheme">@style/MyDialogStyle</item>
        <item name="android:alertDialogTheme">@style/MyDialogStyle</item>
        <item name="android:windowContentTransitions">true</item>
        <item name="android:windowAllowEnterTransitionOverlap">true</item>
        <item name="android:windowAllowReturnTransitionOverlap">true</item>
        <item name="android:spinnerItemStyle">@style/dialogFormSmallText</item>
+
+        <item name="android:colorPrimary">@color/blue_grey_800</item>
+        <item name="android:colorPrimaryDark">@color/blue_grey_900</item>
+        <item name="cardBackgroundColor">@color/grey_50</item>
+        <item name="windowBackgroundColor">@color/grey_200</item>
+        <item name="headerBackgroundColor">@color/grey_200</item>
+        <item name="highlightedBackgroundColor">@color/grey_100</item>
+
+        <item name="android:textColor">@color/grey_800</item>
+        <item name="useHabitColorAsPrimary">true</item>
+        <item name="palette">@array/lightPalette</item>
+
+        <item name="highContrastReverseTextColor">@color/white</item>
+        <item name="mediumContrastReverseTextColor">@color/grey_500</item>
+        <item name="lowContrastReverseTextColor">@color/grey_700</item>
+
+        <item name="highContrastTextColor">@color/grey_800</item>
+        <item name="mediumContrastTextColor">@color/grey_500</item>
+        <item name="lowContrastTextColor">@color/grey_300</item>
+
+        <item name="iconAdd">@drawable/ic_action_add_dark</item>
+        <item name="iconArchive">@drawable/ic_action_archive_dark</item>
+        <item name="iconEdit">@drawable/ic_action_edit_dark</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
+
+        <item name="aboutScreenColor">@color/blue_700</item>
+    </style>
+
+    <style name="AppBaseThemeDark" parent="android:Theme.Material">
+        <item name="android:dialogTheme">@style/MyDialogStyleDark</item>
+        <item name="android:alertDialogTheme">@style/MyDialogStyleDark</item>
+        <item name="android:windowContentTransitions">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+
+        <item name="android:colorPrimary">@color/grey_950</item>
+        <item name="android:colorPrimaryDark">@color/black</item>
+        <item name="cardBackgroundColor">@color/grey_850</item>
+        <item name="windowBackgroundColor">@color/grey_900</item>
+        <item name="headerBackgroundColor">@color/grey_900</item>
+        <item name="highlightedBackgroundColor">@color/grey_800</item>
+
+        <item name="android:textColor">@color/grey_100</item>
+        <item name="useHabitColorAsPrimary">false</item>
+
+        <item name="highContrastTextColor">@color/grey_100</item>
+        <item name="mediumContrastTextColor">@color/grey_500</item>
+        <item name="lowContrastTextColor">@color/grey_800</item>
+
+        <item name="highContrastReverseTextColor">@color/grey_900</item>
+        <item name="mediumContrastReverseTextColor">@color/grey_700</item>
+        <item name="lowContrastReverseTextColor">@color/grey_300</item>
+
+        <item name="iconAdd">@drawable/ic_action_add_dark</item>
+        <item name="iconArchive">@drawable/ic_action_archive_dark</item>
+        <item name="iconEdit">@drawable/ic_action_edit_dark</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerDark</item>
+
+        <item name="palette">@array/darkPalette</item>
+
+        <item name="aboutScreenColor">@color/blue_300</item>
+    </style>
+
+    <style name="AppBaseThemeDark.PureBlack">
+        <item name="android:colorPrimary">@color/black</item>
+        <item name="android:colorPrimaryDark">@color/black</item>
+        <item name="cardBackgroundColor">@color/black</item>
+        <item name="windowBackgroundColor">@color/black</item>
+        <item name="headerBackgroundColor">@color/black</item>
+        <item name="highlightedBackgroundColor">@color/black</item>
+
+        <item name="lowContrastTextColor">@color/grey_900</item>
+        <item name="highContrastReverseTextColor">@color/black</item>
    </style>

    <style name="MyDialogStyle" parent="android:Theme.Material.Light.Dialog">
@@ -36,12 +112,17 @@
        <item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
    </style>

-    <style name="cardStyle" parent="cardBasicStyle">
-        <item name="android:background">@color/white</item>
-        <item name="android:elevation">1dp</item>
+    <style name="MyDialogStyleDark" parent="android:Theme.Material.Dialog">
+        <item name="android:spinnerItemStyle">@style/dialogFormText</item>
+        <item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
    </style>

-    <style name="aboutClickableItemStyle" parent="aboutItemStyle">
+    <style name="Card" parent="CardCommon">
+        <item name="android:elevation">1dp</item>
+        <item name="android:background">?attr/cardBackgroundColor</item>
+    </style>
+
+    <style name="About.Item.Clickable" parent="About.Item">
        <item name="android:paddingBottom">12dp</item>
        <item name="android:paddingTop">12dp</item>
        <item name="android:background">@drawable/ripple_transparent</item>
--- a/app/src/main/res/values-v21/styles_list_habits.xml
+++ b/app/src/main/res/values-v21/styles_list_habits.xml
@@ -20,19 +20,16 @@

 <resources>

-    <style name="habitsListHeaderStyle" parent="habitsListHeaderBasicStyle">
-        <item name="android:background">#f0f0f0</item>
+    <style name="ListHabits.Header">
+        <item name="android:background">?headerBackgroundColor</item>
        <item name="android:elevation">2dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:paddingRight">4dp</item>
    </style>

-    <style name="habitsListCheckStyle" parent="habitsListCheckBasicStyle">
+    <style name="ListHabits.Checkmark" parent="ListHabits.CheckmarkCommon">
        <item name="android:background">@drawable/ripple_transparent</item>
    </style>
-
-    <style name="habitsListItemInnerPanelStyle" parent="cardStyle">
-        <item name="android:orientation">horizontal</item>
-        <item name="android:padding">3dp</item>
-        <item name="android:background">@drawable/ripple_white</item>
-        <item name="android:elevation">1dp</item>
-    </style>
 </resources>
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <attr name="windowBackgroundColor" format="reference"/>
+    <attr name="cardBackgroundColor" format="reference"/>
+    <attr name="headerBackgroundColor" format="reference"/>
+    <attr name="highlightedBackgroundColor" format="reference"/>
+    <attr name="useHabitColorAsPrimary" format="boolean"/>
+    <attr name="palette" format="reference"/>
+    <attr name="aboutScreenColor" format="reference"/>
+
+    <attr name="highContrastTextColor" format="reference"/>
+    <attr name="mediumContrastTextColor" format="reference"/>
+    <attr name="lowContrastTextColor" format="reference"/>
+
+    <attr name="highContrastReverseTextColor" format="reference"/>
+    <attr name="mediumContrastReverseTextColor" format="reference"/>
+    <attr name="lowContrastReverseTextColor" format="reference"/>
+
+    <attr name="iconAdd" format="reference"/>
+    <attr name="iconArchive" format="reference"/>
+    <attr name="iconChangeColor" format="reference"/>
+    <attr name="iconEdit" format="reference"/>
+    <attr name="iconUnarchive" format="reference"/>
+    <attr name="dialogIconChangeColor" format="reference"/>
+
+    <attr name="dialogFormSpinnerTheme" format="reference"/>
+
+    <!-- Pre-Lollipop -->
+    <attr name="cardBackground" format="reference"/>
+    <attr name="headerBackground" format="reference"/>
+    <attr name="selectedBackground" format="reference"/>
+</resources>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,15 +15,38 @@
     limitations under the License.
 -->
 <resources>
-    
-    <color name="primary">#37474f</color>
-    <color name="primary_darker">#263238</color>
-    <color name="windowBackground">#e6e6e6</color>
-    <color name="primaryTextColor">@color/grey_900</color>
-    <color name="secondaryTextColor">@color/grey_800</color>
-    <color name="fadedTextColor">@color/grey_600</color>

-    <color name="white">#ffffff</color>
+    <array name="lightPalette">
+        <item>@color/red_700</item>
+        <item>@color/deep_orange_700</item>
+        <item>@color/yellow_800</item>
+        <item>@color/lime_700</item>
+        <item>@color/green_700</item>
+        <item>@color/teal_600</item>
+        <item>@color/cyan_600</item>
+        <item>@color/light_blue_600</item>
+        <item>@color/deep_purple_600</item>
+        <item>@color/purple_600</item>
+        <item>@color/pink_600</item>
+        <item>@color/grey_800</item>
+        <item>@color/grey_500</item>
+    </array>
+
+    <array name="darkPalette">
+        <item>@color/red_200</item>
+        <item>@color/deep_orange_200</item>
+        <item>@color/yellow_200</item>
+        <item>@color/lime_200</item>
+        <item>@color/green_A200</item>
+        <item>@color/teal_200</item>
+        <item>@color/cyan_200</item>
+        <item>@color/light_blue_200</item>
+        <item>@color/deep_purple_200</item>
+        <item>@color/purple_200</item>
+        <item>@color/pink_200</item>
+        <item>@color/grey_100</item>
+        <item>@color/grey_500</item>
+    </array>

    <!-- Time and Date picker -->
    <color name="circle_background">#f2f2f2</color>
@@ -53,267 +76,267 @@
    <color name="line_dark">#808080</color>

    <!-- Material design color palette -->
-    <!--<color name="red_50">#FFEBEE</color>-->
-    <!--<color name="red_100">#FFCDD2</color>-->
-    <!--<color name="red_200">#EF9A9A</color>-->
-    <!--<color name="red_300">#E57373</color>-->
-    <!--<color name="red_400">#EF5350</color>-->
-    <!--<color name="red_500">#F44336</color>-->
-    <!--<color name="red_600">#E53935</color>-->
-    <!--<color name="red_700">#D32F2F</color>-->
-    <!--<color name="red_800">#C62828</color>-->
-    <!--<color name="red_900">#B71C1C</color>-->
-    <!--<color name="red_A100">#FF8A80</color>-->
-    <!--<color name="red_A200">#FF5252</color>-->
-    <!--<color name="red_A400">#FF1744</color>-->
-    <!--<color name="red_A700">#D50000</color>-->
+    <color name="red_50">#FFEBEE</color>
+    <color name="red_100">#FFCDD2</color>
+    <color name="red_200">#EF9A9A</color>
+    <color name="red_300">#E57373</color>
+    <color name="red_400">#EF5350</color>
+    <color name="red_500">#F44336</color>
+    <color name="red_600">#E53935</color>
+    <color name="red_700">#D32F2F</color>
+    <color name="red_800">#C62828</color>
+    <color name="red_900">#B71C1C</color>
+    <color name="red_A100">#FF8A80</color>
+    <color name="red_A200">#FF5252</color>
+    <color name="red_A400">#FF1744</color>
+    <color name="red_A700">#D50000</color>

-    <!--<color name="deep_purple_50">#EDE7F6</color>-->
-    <!--<color name="deep_purple_100">#D1C4E9</color>-->
-    <!--<color name="deep_purple_200">#B39DDB</color>-->
-    <!--<color name="deep_purple_300">#9575CD</color>-->
-    <!--<color name="deep_purple_400">#7E57C2</color>-->
-    <!--<color name="deep_purple_500">#673AB7</color>-->
-    <!--<color name="deep_purple_600">#5E35B1</color>-->
-    <!--<color name="deep_purple_700">#512DA8</color>-->
-    <!--<color name="deep_purple_800">#4527A0</color>-->
-    <!--<color name="deep_purple_900">#311B92</color>-->
-    <!--<color name="deep_purple_A100">#B388FF</color>-->
-    <!--<color name="deep_purple_A200">#7C4DFF</color>-->
-    <!--<color name="deep_purple_A400">#651FFF</color>-->
-    <!--<color name="deep_purple_A700">#6200EA</color>-->
+    <color name="deep_purple_50">#EDE7F6</color>
+    <color name="deep_purple_100">#D1C4E9</color>
+    <color name="deep_purple_200">#B39DDB</color>
+    <color name="deep_purple_300">#9575CD</color>
+    <color name="deep_purple_400">#7E57C2</color>
+    <color name="deep_purple_500">#673AB7</color>
+    <color name="deep_purple_600">#5E35B1</color>
+    <color name="deep_purple_700">#512DA8</color>
+    <color name="deep_purple_800">#4527A0</color>
+    <color name="deep_purple_900">#311B92</color>
+    <color name="deep_purple_A100">#B388FF</color>
+    <color name="deep_purple_A200">#7C4DFF</color>
+    <color name="deep_purple_A400">#651FFF</color>
+    <color name="deep_purple_A700">#6200EA</color>

-    <!--<color name="light_blue_50">#E1F5FE</color>-->
-    <!--<color name="light_blue_100">#B3E5FC</color>-->
-    <!--<color name="light_blue_200">#81D4FA</color>-->
-    <!--<color name="light_blue_300">#4FC3F7</color>-->
-    <!--<color name="light_blue_400">#29B6F6</color>-->
-    <!--<color name="light_blue_500">#03A9F4</color>-->
-    <!--<color name="light_blue_600">#039BE5</color>-->
-    <!--<color name="light_blue_700">#0288D1</color>-->
-    <!--<color name="light_blue_800">#0277BD</color>-->
-    <!--<color name="light_blue_900">#01579B</color>-->
-    <!--<color name="light_blue_A100">#80D8FF</color>-->
-    <!--<color name="light_blue_A200">#40C4FF</color>-->
-    <!--<color name="light_blue_A400">#00B0FF</color>-->
-    <!--<color name="light_blue_A700">#0091EA</color>-->
+    <color name="light_blue_50">#E1F5FE</color>
+    <color name="light_blue_100">#B3E5FC</color>
+    <color name="light_blue_200">#81D4FA</color>
+    <color name="light_blue_300">#4FC3F7</color>
+    <color name="light_blue_400">#29B6F6</color>
+    <color name="light_blue_500">#03A9F4</color>
+    <color name="light_blue_600">#039BE5</color>
+    <color name="light_blue_700">#0288D1</color>
+    <color name="light_blue_800">#0277BD</color>
+    <color name="light_blue_900">#01579B</color>
+    <color name="light_blue_A100">#80D8FF</color>
+    <color name="light_blue_A200">#40C4FF</color>
+    <color name="light_blue_A400">#00B0FF</color>
+    <color name="light_blue_A700">#0091EA</color>

-    <!--<color name="green_50">#E8F5E9</color>-->
-    <!--<color name="green_100">#C8E6C9</color>-->
-    <!--<color name="green_200">#A5D6A7</color>-->
-    <!--<color name="green_300">#81C784</color>-->
-    <!--<color name="green_400">#66BB6A</color>-->
-    <!--<color name="green_500">#4CAF50</color>-->
-    <!--<color name="green_600">#43A047</color>-->
-    <!--<color name="green_700">#388E3C</color>-->
-    <!--<color name="green_800">#2E7D32</color>-->
-    <!--<color name="green_900">#1B5E20</color>-->
-    <!--<color name="green_A100">#B9F6CA</color>-->
-    <!--<color name="green_A200">#69F0AE</color>-->
-    <!--<color name="green_A400">#00E676</color>-->
-    <!--<color name="green_A700">#00C853</color>-->
+    <color name="green_50">#E8F5E9</color>
+    <color name="green_100">#C8E6C9</color>
+    <color name="green_200">#A5D6A7</color>
+    <color name="green_300">#81C784</color>
+    <color name="green_400">#66BB6A</color>
+    <color name="green_500">#4CAF50</color>
+    <color name="green_600">#43A047</color>
+    <color name="green_700">#388E3C</color>
+    <color name="green_800">#2E7D32</color>
+    <color name="green_900">#1B5E20</color>
+    <color name="green_A100">#B9F6CA</color>
+    <color name="green_A200">#69F0AE</color>
+    <color name="green_A400">#00E676</color>
+    <color name="green_A700">#00C853</color>

-    <!--<color name="yellow_50">#FFFDE7</color>-->
-    <!--<color name="yellow_100">#FFF9C4</color>-->
-    <!--<color name="yellow_200">#FFF59D</color>-->
-    <!--<color name="yellow_300">#FFF176</color>-->
-    <!--<color name="yellow_400">#FFEE58</color>-->
-    <!--<color name="yellow_500">#FFEB3B</color>-->
-    <!--<color name="yellow_600">#FDD835</color>-->
-    <!--<color name="yellow_700">#FBC02D</color>-->
-    <!--<color name="yellow_800">#F9A825</color>-->
-    <!--<color name="yellow_900">#F57F17</color>-->
-    <!--<color name="yellow_A100">#FFFF8D</color>-->
-    <!--<color name="yellow_A200">#FFFF00</color>-->
-    <!--<color name="yellow_A400">#FFEA00</color>-->
-    <!--<color name="yellow_A700">#FFD600</color>-->
+    <color name="yellow_50">#FFFDE7</color>
+    <color name="yellow_100">#FFF9C4</color>
+    <color name="yellow_200">#FFF59D</color>
+    <color name="yellow_300">#FFF176</color>
+    <color name="yellow_400">#FFEE58</color>
+    <color name="yellow_500">#FFEB3B</color>
+    <color name="yellow_600">#FDD835</color>
+    <color name="yellow_700">#FBC02D</color>
+    <color name="yellow_800">#F9A825</color>
+    <color name="yellow_900">#F57F17</color>
+    <color name="yellow_A100">#FFFF8D</color>
+    <color name="yellow_A200">#FFFF00</color>
+    <color name="yellow_A400">#FFEA00</color>
+    <color name="yellow_A700">#FFD600</color>

-    <!--<color name="deep_orange_50">#FBE9E7</color>-->
-    <!--<color name="deep_orange_100">#FFCCBC</color>-->
-    <!--<color name="deep_orange_200">#FFAB91</color>-->
-    <!--<color name="deep_orange_300">#FF8A65</color>-->
-    <!--<color name="deep_orange_400">#FF7043</color>-->
-    <!--<color name="deep_orange_500">#FF5722</color>-->
-    <!--<color name="deep_orange_600">#F4511E</color>-->
-    <!--<color name="deep_orange_700">#E64A19</color>-->
-    <!--<color name="deep_orange_800">#D84315</color>-->
-    <!--<color name="deep_orange_900">#BF360C</color>-->
-    <!--<color name="deep_orange_A100">#FF9E80</color>-->
-    <!--<color name="deep_orange_A200">#FF6E40</color>-->
-    <!--<color name="deep_orange_A400">#FF3D00</color>-->
-    <!--<color name="deep_orange_A700">#DD2C00</color>-->
+    <color name="deep_orange_50">#FBE9E7</color>
+    <color name="deep_orange_100">#FFCCBC</color>
+    <color name="deep_orange_200">#FFAB91</color>
+    <color name="deep_orange_300">#FF8A65</color>
+    <color name="deep_orange_400">#FF7043</color>
+    <color name="deep_orange_500">#FF5722</color>
+    <color name="deep_orange_600">#F4511E</color>
+    <color name="deep_orange_700">#E64A19</color>
+    <color name="deep_orange_800">#D84315</color>
+    <color name="deep_orange_900">#BF360C</color>
+    <color name="deep_orange_A100">#FF9E80</color>
+    <color name="deep_orange_A200">#FF6E40</color>
+    <color name="deep_orange_A400">#FF3D00</color>
+    <color name="deep_orange_A700">#DD2C00</color>

-    <!--<color name="blue_grey_50">#ECEFF1</color>-->
-    <!--<color name="blue_grey_100">#CFD8DC</color>-->
-    <!--<color name="blue_grey_200">#B0BEC5</color>-->
-    <!--<color name="blue_grey_300">#90A4AE</color>-->
-    <!--<color name="blue_grey_400">#78909C</color>-->
-    <!--<color name="blue_grey_500">#607D8B</color>-->
-    <!--<color name="blue_grey_600">#546E7A</color>-->
-    <!--<color name="blue_grey_700">#455A64</color>-->
-    <!--<color name="blue_grey_800">#37474F</color>-->
-    <!--<color name="blue_grey_900">#263238</color>-->
+    <color name="blue_grey_50">#ECEFF1</color>
+    <color name="blue_grey_100">#CFD8DC</color>
+    <color name="blue_grey_200">#B0BEC5</color>
+    <color name="blue_grey_300">#90A4AE</color>
+    <color name="blue_grey_400">#78909C</color>
+    <color name="blue_grey_500">#607D8B</color>
+    <color name="blue_grey_600">#546E7A</color>
+    <color name="blue_grey_700">#455A64</color>
+    <color name="blue_grey_800">#37474F</color>
+    <color name="blue_grey_900">#263238</color>

-    <!--<color name="pink_50">#FCE4EC</color>-->
-    <!--<color name="pink_100">#F8BBD0</color>-->
-    <!--<color name="pink_200">#F48FB1</color>-->
-    <!--<color name="pink_300">#F06292</color>-->
-    <!--<color name="pink_400">#EC407A</color>-->
-    <!--<color name="pink_500">#E91E63</color>-->
-    <!--<color name="pink_600">#D81B60</color>-->
-    <!--<color name="pink_700">#C2185B</color>-->
-    <!--<color name="pink_800">#AD1457</color>-->
-    <!--<color name="pink_900">#880E4F</color>-->
-    <!--<color name="pink_A100">#FF80AB</color>-->
-    <!--<color name="pink_A200">#FF4081</color>-->
-    <!--<color name="pink_A400">#F50057</color>-->
-    <!--<color name="pink_A700">#C51162</color>-->
+    <color name="pink_50">#FCE4EC</color>
+    <color name="pink_100">#F8BBD0</color>
+    <color name="pink_200">#F48FB1</color>
+    <color name="pink_300">#F06292</color>
+    <color name="pink_400">#EC407A</color>
+    <color name="pink_500">#E91E63</color>
+    <color name="pink_600">#D81B60</color>
+    <color name="pink_700">#C2185B</color>
+    <color name="pink_800">#AD1457</color>
+    <color name="pink_900">#880E4F</color>
+    <color name="pink_A100">#FF80AB</color>
+    <color name="pink_A200">#FF4081</color>
+    <color name="pink_A400">#F50057</color>
+    <color name="pink_A700">#C51162</color>

-    <!--<color name="indigo_50">#E8EAF6</color>-->
-    <!--<color name="indigo_100">#C5CAE9</color>-->
-    <!--<color name="indigo_200">#9FA8DA</color>-->
-    <!--<color name="indigo_300">#7986CB</color>-->
-    <!--<color name="indigo_400">#5C6BC0</color>-->
+    <color name="indigo_50">#E8EAF6</color>
+    <color name="indigo_100">#C5CAE9</color>
+    <color name="indigo_200">#9FA8DA</color>
+    <color name="indigo_300">#7986CB</color>
+    <color name="indigo_400">#5C6BC0</color>
    <color name="indigo_500">#3F51B5</color>
-    <!--<color name="indigo_600">#3949AB</color>-->
-    <!--<color name="indigo_700">#303F9F</color>-->
-    <!--<color name="indigo_800">#283593</color>-->
-    <!--<color name="indigo_900">#1A237E</color>-->
-    <!--<color name="indigo_A100">#8C9EFF</color>-->
-    <!--<color name="indigo_A200">#536DFE</color>-->
-    <!--<color name="indigo_A400">#3D5AFE</color>-->
-    <!--<color name="indigo_A700">#304FFE</color>-->
+    <color name="indigo_600">#3949AB</color>
+    <color name="indigo_700">#303F9F</color>
+    <color name="indigo_800">#283593</color>
+    <color name="indigo_900">#1A237E</color>
+    <color name="indigo_A100">#8C9EFF</color>
+    <color name="indigo_A200">#536DFE</color>
+    <color name="indigo_A400">#3D5AFE</color>
+    <color name="indigo_A700">#304FFE</color>

-    <!--<color name="cyan_50">#E0F7FA</color>-->
-    <!--<color name="cyan_100">#B2EBF2</color>-->
-    <!--<color name="cyan_200">#80DEEA</color>-->
-    <!--<color name="cyan_300">#4DD0E1</color>-->
-    <!--<color name="cyan_400">#26C6DA</color>-->
-    <!--<color name="cyan_500">#00BCD4</color>-->
-    <!--<color name="cyan_600">#00ACC1</color>-->
-    <!--<color name="cyan_700">#0097A7</color>-->
-    <!--<color name="cyan_800">#00838F</color>-->
-    <!--<color name="cyan_900">#006064</color>-->
-    <!--<color name="cyan_A100">#84FFFF</color>-->
-    <!--<color name="cyan_A200">#18FFFF</color>-->
-    <!--<color name="cyan_A400">#00E5FF</color>-->
-    <!--<color name="cyan_A700">#00B8D4</color>-->
+    <color name="cyan_50">#E0F7FA</color>
+    <color name="cyan_100">#B2EBF2</color>
+    <color name="cyan_200">#80DEEA</color>
+    <color name="cyan_300">#4DD0E1</color>
+    <color name="cyan_400">#26C6DA</color>
+    <color name="cyan_500">#00BCD4</color>
+    <color name="cyan_600">#00ACC1</color>
+    <color name="cyan_700">#0097A7</color>
+    <color name="cyan_800">#00838F</color>
+    <color name="cyan_900">#006064</color>
+    <color name="cyan_A100">#84FFFF</color>
+    <color name="cyan_A200">#18FFFF</color>
+    <color name="cyan_A400">#00E5FF</color>
+    <color name="cyan_A700">#00B8D4</color>

-    <!--<color name="light_green_50">#F1F8E9</color>-->
-    <!--<color name="light_green_100">#DCEDC8</color>-->
-    <!--<color name="light_green_200">#C5E1A5</color>-->
-    <!--<color name="light_green_300">#AED581</color>-->
-    <!--<color name="light_green_400">#9CCC65</color>-->
-    <!--<color name="light_green_500">#8BC34A</color>-->
-    <!--<color name="light_green_600">#7CB342</color>-->
-    <!--<color name="light_green_700">#689F38</color>-->
-    <!--<color name="light_green_800">#558B2F</color>-->
-    <!--<color name="light_green_900">#33691E</color>-->
-    <!--<color name="light_green_A100">#CCFF90</color>-->
-    <!--<color name="light_green_A200">#B2FF59</color>-->
-    <!--<color name="light_green_A400">#76FF03</color>-->
-    <!--<color name="light_green_A700">#64DD17</color>-->
+    <color name="light_green_50">#F1F8E9</color>
+    <color name="light_green_100">#DCEDC8</color>
+    <color name="light_green_200">#C5E1A5</color>
+    <color name="light_green_300">#AED581</color>
+    <color name="light_green_400">#9CCC65</color>
+    <color name="light_green_500">#8BC34A</color>
+    <color name="light_green_600">#7CB342</color>
+    <color name="light_green_700">#689F38</color>
+    <color name="light_green_800">#558B2F</color>
+    <color name="light_green_900">#33691E</color>
+    <color name="light_green_A100">#CCFF90</color>
+    <color name="light_green_A200">#B2FF59</color>
+    <color name="light_green_A400">#76FF03</color>
+    <color name="light_green_A700">#64DD17</color>

-    <!--<color name="amber_50">#FFF8E1</color>-->
-    <!--<color name="amber_100">#FFECB3</color>-->
-    <!--<color name="amber_200">#FFE082</color>-->
-    <!--<color name="amber_300">#FFD54F</color>-->
-    <!--<color name="amber_400">#FFCA28</color>-->
-    <!--<color name="amber_500">#FFC107</color>-->
-    <!--<color name="amber_600">#FFB300</color>-->
-    <!--<color name="amber_700">#FFA000</color>-->
-    <!--<color name="amber_800">#FF8F00</color>-->
-    <!--<color name="amber_900">#FF6F00</color>-->
-    <!--<color name="amber_A100">#FFE57F</color>-->
-    <!--<color name="amber_A200">#FFD740</color>-->
-    <!--<color name="amber_A400">#FFC400</color>-->
-    <!--<color name="amber_A700">#FFAB00</color>-->
+    <color name="amber_50">#FFF8E1</color>
+    <color name="amber_100">#FFECB3</color>
+    <color name="amber_200">#FFE082</color>
+    <color name="amber_300">#FFD54F</color>
+    <color name="amber_400">#FFCA28</color>
+    <color name="amber_500">#FFC107</color>
+    <color name="amber_600">#FFB300</color>
+    <color name="amber_700">#FFA000</color>
+    <color name="amber_800">#FF8F00</color>
+    <color name="amber_900">#FF6F00</color>
+    <color name="amber_A100">#FFE57F</color>
+    <color name="amber_A200">#FFD740</color>
+    <color name="amber_A400">#FFC400</color>
+    <color name="amber_A700">#FFAB00</color>

-    <!--<color name="brown_50">#EFEBE9</color>-->
-    <!--<color name="brown_100">#D7CCC8</color>-->
-    <!--<color name="brown_200">#BCAAA4</color>-->
-    <!--<color name="brown_300">#A1887F</color>-->
-    <!--<color name="brown_400">#8D6E63</color>-->
-    <!--<color name="brown_500">#795548</color>-->
-    <!--<color name="brown_600">#6D4C41</color>-->
-    <!--<color name="brown_700">#5D4037</color>-->
-    <!--<color name="brown_800">#4E342E</color>-->
-    <!--<color name="brown_900">#3E2723</color>-->
+    <color name="brown_50">#EFEBE9</color>
+    <color name="brown_100">#D7CCC8</color>
+    <color name="brown_200">#BCAAA4</color>
+    <color name="brown_300">#A1887F</color>
+    <color name="brown_400">#8D6E63</color>
+    <color name="brown_500">#795548</color>
+    <color name="brown_600">#6D4C41</color>
+    <color name="brown_700">#5D4037</color>
+    <color name="brown_800">#4E342E</color>
+    <color name="brown_900">#3E2723</color>

-    <!--<color name="purple_50">#F3E5F5</color>-->
-    <!--<color name="purple_100">#E1BEE7</color>-->
-    <!--<color name="purple_200">#CE93D8</color>-->
-    <!--<color name="purple_300">#BA68C8</color>-->
-    <!--<color name="purple_400">#AB47BC</color>-->
-    <!--<color name="purple_500">#9C27B0</color>-->
-    <!--<color name="purple_600">#8E24AA</color>-->
-    <!--<color name="purple_700">#7B1FA2</color>-->
-    <!--<color name="purple_800">#6A1B9A</color>-->
-    <!--<color name="purple_900">#4A148C</color>-->
-    <!--<color name="purple_A100">#EA80FC</color>-->
-    <!--<color name="purple_A200">#E040FB</color>-->
-    <!--<color name="purple_A400">#D500F9</color>-->
-    <!--<color name="purple_A700">#AA00FF</color>-->
+    <color name="purple_50">#F3E5F5</color>
+    <color name="purple_100">#E1BEE7</color>
+    <color name="purple_200">#CE93D8</color>
+    <color name="purple_300">#BA68C8</color>
+    <color name="purple_400">#AB47BC</color>
+    <color name="purple_500">#9C27B0</color>
+    <color name="purple_600">#8E24AA</color>
+    <color name="purple_700">#7B1FA2</color>
+    <color name="purple_800">#6A1B9A</color>
+    <color name="purple_900">#4A148C</color>
+    <color name="purple_A100">#EA80FC</color>
+    <color name="purple_A200">#E040FB</color>
+    <color name="purple_A400">#D500F9</color>
+    <color name="purple_A700">#AA00FF</color>

-    <!--<color name="blue_50">#E3F2FD</color>-->
-    <!--<color name="blue_100">#BBDEFB</color>-->
-    <!--<color name="blue_200">#90CAF9</color>-->
-    <!--<color name="blue_300">#64B5F6</color>-->
-    <!--<color name="blue_400">#42A5F5</color>-->
-    <!--<color name="blue_500">#2196F3</color>-->
-    <!--<color name="blue_600">#1E88E5</color>-->
+    <color name="blue_50">#E3F2FD</color>
+    <color name="blue_100">#BBDEFB</color>
+    <color name="blue_200">#90CAF9</color>
+    <color name="blue_300">#64B5F6</color>
+    <color name="blue_400">#42A5F5</color>
+    <color name="blue_500">#2196F3</color>
+    <color name="blue_600">#1E88E5</color>
    <color name="blue_700">#1976D2</color>
-    <!--<color name="blue_800">#1565C0</color>-->
-    <!--<color name="blue_900">#0D47A1</color>-->
-    <!--<color name="blue_A100">#82B1FF</color>-->
-    <!--<color name="blue_A200">#448AFF</color>-->
-    <!--<color name="blue_A400">#2979FF</color>-->
-    <!--<color name="blue_A700">#2962FF</color>-->
+    <color name="blue_800">#1565C0</color>
+    <color name="blue_900">#0D47A1</color>
+    <color name="blue_A100">#82B1FF</color>
+    <color name="blue_A200">#448AFF</color>
+    <color name="blue_A400">#2979FF</color>
+    <color name="blue_A700">#2962FF</color>

-    <!--<color name="teal_50">#E0F2F1</color>-->
-    <!--<color name="teal_100">#B2DFDB</color>-->
-    <!--<color name="teal_200">#80CBC4</color>-->
-    <!--<color name="teal_300">#4DB6AC</color>-->
-    <!--<color name="teal_400">#26A69A</color>-->
-    <!--<color name="teal_500">#009688</color>-->
-    <!--<color name="teal_600">#00897B</color>-->
-    <!--<color name="teal_700">#00796B</color>-->
-    <!--<color name="teal_800">#00695C</color>-->
-    <!--<color name="teal_900">#004D40</color>-->
-    <!--<color name="teal_A100">#A7FFEB</color>-->
-    <!--<color name="teal_A200">#64FFDA</color>-->
-    <!--<color name="teal_A400">#1DE9B6</color>-->
-    <!--<color name="teal_A700">#00BFA5</color>-->
+    <color name="teal_50">#E0F2F1</color>
+    <color name="teal_100">#B2DFDB</color>
+    <color name="teal_200">#80CBC4</color>
+    <color name="teal_300">#4DB6AC</color>
+    <color name="teal_400">#26A69A</color>
+    <color name="teal_500">#009688</color>
+    <color name="teal_600">#00897B</color>
+    <color name="teal_700">#00796B</color>
+    <color name="teal_800">#00695C</color>
+    <color name="teal_900">#004D40</color>
+    <color name="teal_A100">#A7FFEB</color>
+    <color name="teal_A200">#64FFDA</color>
+    <color name="teal_A400">#1DE9B6</color>
+    <color name="teal_A700">#00BFA5</color>

-    <!--<color name="lime_50">#F9FBE7</color>-->
-    <!--<color name="lime_100">#F0F4C3</color>-->
-    <!--<color name="lime_200">#E6EE9C</color>-->
-    <!--<color name="lime_300">#DCE775</color>-->
-    <!--<color name="lime_400">#D4E157</color>-->
-    <!--<color name="lime_500">#CDDC39</color>-->
-    <!--<color name="lime_600">#C0CA33</color>-->
-    <!--<color name="lime_700">#AFB42B</color>-->
-    <!--<color name="lime_800">#9E9D24</color>-->
-    <!--<color name="lime_900">#827717</color>-->
-    <!--<color name="lime_A100">#F4FF81</color>-->
-    <!--<color name="lime_A200">#EEFF41</color>-->
-    <!--<color name="lime_A400">#C6FF00</color>-->
-    <!--<color name="lime_A700">#AEEA00</color>-->
+    <color name="lime_50">#F9FBE7</color>
+    <color name="lime_100">#F0F4C3</color>
+    <color name="lime_200">#E6EE9C</color>
+    <color name="lime_300">#DCE775</color>
+    <color name="lime_400">#D4E157</color>
+    <color name="lime_500">#CDDC39</color>
+    <color name="lime_600">#C0CA33</color>
+    <color name="lime_700">#AFB42B</color>
+    <color name="lime_800">#9E9D24</color>
+    <color name="lime_900">#827717</color>
+    <color name="lime_A100">#F4FF81</color>
+    <color name="lime_A200">#EEFF41</color>
+    <color name="lime_A400">#C6FF00</color>
+    <color name="lime_A700">#AEEA00</color>

-    <!--<color name="orange_50">#FFF3E0</color>-->
-    <!--<color name="orange_100">#FFE0B2</color>-->
-    <!--<color name="orange_200">#FFCC80</color>-->
-    <!--<color name="orange_300">#FFB74D</color>-->
-    <!--<color name="orange_400">#FFA726</color>-->
-    <!--<color name="orange_500">#FF9800</color>-->
-    <!--<color name="orange_600">#FB8C00</color>-->
-    <!--<color name="orange_700">#F57C00</color>-->
-    <!--<color name="orange_800">#EF6C00</color>-->
-    <!--<color name="orange_900">#E65100</color>-->
-    <!--<color name="orange_A100">#FFD180</color>-->
-    <!--<color name="orange_A200">#FFAB40</color>-->
-    <!--<color name="orange_A400">#FF9100</color>-->
-    <!--<color name="orange_A700">#FF6D00</color>-->
+    <color name="orange_50">#FFF3E0</color>
+    <color name="orange_100">#FFE0B2</color>
+    <color name="orange_200">#FFCC80</color>
+    <color name="orange_300">#FFB74D</color>
+    <color name="orange_400">#FFA726</color>
+    <color name="orange_500">#FF9800</color>
+    <color name="orange_600">#FB8C00</color>
+    <color name="orange_700">#F57C00</color>
+    <color name="orange_800">#EF6C00</color>
+    <color name="orange_900">#E65100</color>
+    <color name="orange_A100">#FFD180</color>
+    <color name="orange_A200">#FFAB40</color>
+    <color name="orange_A400">#FF9100</color>
+    <color name="orange_A700">#FF6D00</color>

    <color name="grey_50">#FAFAFA</color>
    <color name="grey_100">#F5F5F5</color>
@@ -323,6 +346,13 @@
    <color name="grey_500">#9E9E9E</color>
    <color name="grey_600">#757575</color>
    <color name="grey_700">#616161</color>
+    <color name="grey_750">#525252</color>
    <color name="grey_800">#424242</color>
+    <color name="grey_850">#303030</color>
+    <color name="grey_875">#282828</color>
    <color name="grey_900">#212121</color>
+    <color name="grey_950">#101010</color>
+
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
 </resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -19,13 +19,15 @@

 <resources>
    <dimen name="baseSize">20dp</dimen>
-    <dimen name="check_square_size">42dp</dimen>
+    <dimen name="checkmarkWidth">42dp</dimen>
+    <dimen name="checkmarkHeight">48dp</dimen>
    <dimen name="history_editor_max_height">450dp</dimen>
    <dimen name="history_editor_padding">8dp</dimen>
    <dimen name="history_max_font_size">@dimen/regularTextSize</dimen>
    <dimen name="regularTextSize">16sp</dimen>
    <dimen name="smallTextSize">14sp</dimen>
-    <dimen name="tinyTextSize">10sp</dimen>
+    <dimen name="tinyTextSize">12sp</dimen>
+    <dimen name="habitNameWidth">160dp</dimen>

    <string-array name="snooze_interval_names">
        <item>@string/interval_15_minutes</item>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -156,4 +156,8 @@
    <string name="generate_bug_report">Generate bug report</string>
    <string name="troubleshooting">Troubleshooting</string>
    <string name="help_translate">Help translate this app</string>
+    <string name="night_mode">Night mode</string>
+    <string name="use_pure_black">Pure black for night mode</string>
+    <string name="pure_black_description">Use pure black instead of grey backgrounds in night mode. Reduces battery usage in phones with AMOLED display.</string>
+    <string name="interface_preferences">Interface</string>
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,8 +20,77 @@
 <resources>

    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
-        <item name="android:spinnerItemStyle">@style/dialogFormText</item>
-        <item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
+        <item name="selectedBackground">@drawable/selected_box_light</item>
+        <item name="headerBackground">@drawable/habits_list_header_light_background</item>
+        <item name="cardBackground">@drawable/card_light_background</item>
+        <item name="cardBackgroundColor">@color/white</item>
+        <item name="windowBackgroundColor">@color/grey_200</item>
+        <item name="headerBackgroundColor">@color/grey_200</item>
+
+        <item name="android:textColor">@color/grey_800</item>
+        <item name="useHabitColorAsPrimary">true</item>
+        <item name="palette">@array/lightPalette</item>
+
+        <item name="highContrastReverseTextColor">@color/white</item>
+        <item name="mediumContrastReverseTextColor">@color/grey_500</item>
+        <item name="lowContrastReverseTextColor">@color/grey_700</item>
+
+        <item name="highContrastTextColor">@color/grey_800</item>
+        <item name="mediumContrastTextColor">@color/grey_500</item>
+        <item name="lowContrastTextColor">@color/grey_300</item>
+
+        <item name="iconAdd">@drawable/ic_action_add_light</item>
+        <item name="iconArchive">@drawable/ic_action_archive_light</item>
+        <item name="iconEdit">@drawable/ic_action_edit_light</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_light</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_light</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
+
+        <item name="aboutScreenColor">@color/blue_700</item>
+    </style>
+
+    <style name="AppBaseThemeDark" parent="android:Theme.Holo">
+        <item name="selectedBackground">@drawable/selected_box_dark</item>
+        <item name="headerBackground">@drawable/habits_list_header_dark_background</item>
+        <item name="cardBackground">@drawable/card_dark_background</item>
+        <item name="cardBackgroundColor">@color/grey_850</item>
+        <item name="windowBackgroundColor">@color/grey_900</item>
+        <item name="headerBackgroundColor">@color/grey_900</item>
+
+        <item name="android:textColor">@color/grey_100</item>
+        <item name="useHabitColorAsPrimary">false</item>
+
+        <item name="highContrastTextColor">@color/grey_100</item>
+        <item name="mediumContrastTextColor">@color/grey_500</item>
+        <item name="lowContrastTextColor">@color/grey_800</item>
+
+        <item name="highContrastReverseTextColor">@color/grey_900</item>
+        <item name="mediumContrastReverseTextColor">@color/grey_700</item>
+        <item name="lowContrastReverseTextColor">@color/grey_300</item>
+
+        <item name="iconAdd">@drawable/ic_action_add_dark</item>
+        <item name="iconArchive">@drawable/ic_action_archive_dark</item>
+        <item name="iconEdit">@drawable/ic_action_edit_dark</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerDark</item>
+
+        <item name="palette">@array/darkPalette</item>
+
+        <item name="aboutScreenColor">@color/blue_300</item>
+    </style>
+
+    <style name="AppBaseThemeDark.PureBlack">
+        <item name="selectedBackground">@drawable/selected_box_amoled</item>
+        <item name="headerBackground">@drawable/habits_list_header_amoled_background</item>
+        <item name="cardBackground">@drawable/card_amoled_background</item>
+        <item name="cardBackgroundColor">@color/black</item>
+        <item name="windowBackgroundColor">@color/black</item>
+        <item name="headerBackgroundColor">@color/black</item>
+        <item name="lowContrastTextColor">@color/grey_900</item>
+        <item name="highContrastReverseTextColor">@color/black</item>
    </style>

    <style name="time_label">
@@ -38,14 +107,14 @@

    <style name="day_of_week_label_condensed"/>

-    <style name="cardsListStyle">
+    <style name="CardList">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@color/windowBackground</item>
+        <item name="android:background">?windowBackgroundColor</item>
        <item name="android:orientation">vertical</item>
    </style>

-    <style name="cardBasicStyle">
+    <style name="CardCommon">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:orientation">vertical</item>
@@ -56,33 +125,35 @@
        <item name="android:layout_marginBottom">3dp</item>
        <item name="android:layout_marginLeft">3dp</item>
        <item name="android:layout_marginRight">3dp</item>
+        <item name="android:background">?cardBackground</item>
    </style>

-    <style name="cardStyle" parent="cardBasicStyle">
-        <item name="android:background">@drawable/card_background</item>
+    <style name="Card" parent="CardCommon">
        <item name="android:layout_marginBottom">1dp</item>
    </style>

-    <style name="cardHeaderStyle">
+    <style name="CardHeader">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_marginBottom">12dp</item>
        <item name="android:textSize">@dimen/regularTextSize</item>
    </style>

-    <style name="cardRowStyle">
+    <style name="CardRow">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_marginBottom">4dp</item>
        <item name="android:layout_marginTop">4dp</item>
    </style>

-    <style name="cardLabelStyle">
+    <style name="CardLabel">
        <item name="android:layout_width">120dp</item>
        <item name="android:layout_height">wrap_content</item>
    </style>

-    <style name="aboutItemStyle">
+    <style name="About" />
+
+    <style name="About.Item">
        <item name="android:textSize">16sp</item>
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
@@ -90,17 +161,17 @@
        <item name="android:paddingBottom">6dp</item>
    </style>

-    <style name="aboutClickableItemStyle" parent="aboutItemStyle">
+    <style name="About.Item.Clickable">
        <item name="android:paddingBottom">12dp</item>
        <item name="android:paddingTop">12dp</item>
    </style>

-    <style name="smallDataViewStyle">
+    <style name="SmallDataView">
        <item name="android:layout_width">100dp</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_marginLeft">8dp</item>
        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:textColor">@color/fadedTextColor</item>
+        <item name="android:textColor">?mediumContrastTextColor</item>
    </style>

 </resources>
--- a/app/src/main/res/values/styles_dialog.xml
+++ b/app/src/main/res/values/styles_dialog.xml
@@ -45,19 +45,19 @@

    <style name="dialogFormText">
        <item name="android:textSize">@dimen/regularTextSize</item>
-        <item name="android:textColor">@color/secondaryTextColor</item>
+        <item name="android:textColor">?highContrastTextColor</item>
        <item name="android:layout_width">wrap_content</item>
        <item name="android:layout_height">wrap_content</item>
    </style>

    <style name="dialogFormSmallText">
        <item name="android:textSize">@dimen/smallTextSize</item>
-        <item name="android:textColor">@color/fadedTextColor</item>
+        <item name="android:textColor">?mediumContrastTextColor</item>
    </style>

    <style name="dialogFormSpinnerDropDown" parent="dialogFormText">
        <item name="android:padding">12dp</item>
-        <item name="android:textColor">@color/secondaryTextColor</item>
+        <item name="android:textColor">?highContrastTextColor</item>
    </style>

    <style name="dialogFormInput" parent="dialogFormText">
@@ -74,16 +74,25 @@
        <item name="android:minWidth">100dp</item>
        <item name="android:gravity">left</item>
        <item name="android:paddingLeft">6dp</item>
-        <item name="android:textColor">@color/fadedTextColor</item>
+        <item name="android:textColor">?mediumContrastTextColor</item>
    </style>

-    <style name="dialogFormSpinner" parent="android:Widget.DeviceDefault.Light.Spinner">
+    <style name="dialogFormSpinnerDark" parent="android:Widget.DeviceDefault.Spinner">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:paddingLeft">12dp</item>
        <item name="android:textSize">@dimen/regularTextSize</item>
        <item name="android:minWidth">400dp</item>
-        <item name="android:textColor">@color/secondaryTextColor</item>
+        <item name="android:textColor">?highContrastTextColor</item>
+    </style>
+
+    <style name="dialogFormSpinnerLight" parent="android:Widget.DeviceDefault.Light.Spinner">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:textSize">@dimen/regularTextSize</item>
+        <item name="android:minWidth">400dp</item>
+        <item name="android:textColor">?highContrastTextColor</item>
    </style>

    <style name="dialogFormRow">
--- a/app/src/main/res/values/styles_list_habits.xml
+++ b/app/src/main/res/values/styles_list_habits.xml
@@ -20,88 +20,66 @@

 <resources>

-    <style name="habitsListStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:divider">@color/windowBackground</item>
-        <item name="android:dividerHeight">1dp</item>
-        <item name="android:paddingTop">42dp</item>
-        <item name="android:background">@color/windowBackground</item>
+    <style name="ListHabits">
+        <item name="android:background">@color/transparent</item>
    </style>

-
-    <style name="habitsListHeaderBasicStyle">
+    <style name="ListHabits.Header">
+        <item name="android:background">?headerBackground</item>
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_alignParentTop">true</item>
        <item name="android:paddingRight">4dp</item>
    </style>

-    <style name="habitsListHeaderStyle" parent="habitsListHeaderBasicStyle">
-        <item name="android:background">@drawable/habits_list_header_background</item>
-    </style>
-
-    <style name="habitsListStarStyle">
+    <style name="ListHabits.Star">
+        <item name="android:paddingTop">2dp</item>
        <item name="android:layout_width">30dp</item>
        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_marginTop">0dp</item>
        <item name="android:gravity">center</item>
-        <item name="android:paddingTop">1dp</item>
        <item name="android:textSize">16sp</item>
+        <item name="android:background">@color/transparent</item>
    </style>

-    <style name="habitsListNameStyle">
+    <style name="ListHabits.Label">
        <item name="android:layout_width">0dp</item>
        <item name="android:layout_weight">1</item>
        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingBottom">6dp</item>
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">6dp</item>
-        <item name="android:paddingTop">10dp</item>
    </style>

-    <style name="habitsListButtonsPanelStyle">
+    <style name="ListHabits.CheckmarkPanel">
        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">42dp</item>
+        <item name="android:layout_height">wrap_content</item>
        <item name="android:gravity">center</item>
        <item name="android:orientation">horizontal</item>
    </style>

-    <style name="habitsListItemStyle">
+    <style name="ListHabits.Item">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@color/windowBackground</item>
+        <item name="android:background">@color/transparent</item>
        <item name="android:clipToPadding">false</item>
        <item name="android:orientation">horizontal</item>
    </style>

-    <style name="habitsListItemInnerPanelStyle" parent="cardStyle">
+    <style name="ListHabits.HabitCard" parent="Card">
        <item name="android:orientation">horizontal</item>
-        <item name="android:padding">3dp</item>
+        <item name="android:padding">0dp</item>
+        <item name="android:gravity">center_vertical</item>
    </style>

-    <style name="habitsListCheckBasicStyle">
+    <style name="ListHabits.CheckmarkCommon">
        <item name="android:focusable">false</item>
-        <item name="android:minHeight">@dimen/check_square_size</item>
-        <item name="android:minWidth">@dimen/check_square_size</item>
+        <item name="android:minHeight">@dimen/checkmarkHeight</item>
+        <item name="android:width">@dimen/checkmarkWidth</item>
        <item name="android:gravity">center</item>
    </style>

-    <style name="habitsListCheckStyle" parent="habitsListCheckBasicStyle">
-    </style>
-
-    <style name="habitsListHeaderCheckStyle" parent="habitsListCheckStyle">
-        <item name="android:layout_width">42dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:background">@color/transparent</item>
-        <item name="android:focusable">false</item>
-        <item name="android:textSize">10sp</item>
-        <item name="android:textColor">#606060</item>
+    <style name="ListHabits.Checkmark" parent="ListHabits.CheckmarkCommon">
    </style>


-    <style name="habitsListEmptyStyle">
+    <style name="ListHabits.EmptyState">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:gravity">center</item>
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -21,8 +21,8 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

    <PreferenceCategory
-        android:key="behaviorCategory"
-        android:title="@string/behavior">
+        android:key="interfaceCategory"
+        android:title="@string/interface_preferences">

        <CheckBoxPreference
            android:defaultValue="false"
@@ -30,6 +30,18 @@
            android:summary="@string/pref_toggle_description"
            android:title="@string/pref_toggle_title"/>

+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_pure_black"
+            android:summary="@string/pure_black_description"
+            android:title="@string/use_pure_black"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="reminderCategory"
+        android:title="@string/reminder">
+
        <ListPreference
            android:defaultValue="@string/snooze_interval_default"
            android:dialogTitle="@string/snooze_interval"