From c68235fcfc78efbd080bb691f0c4519c344b3bd3 Mon Sep 17 00:00:00 2001
From: Synced Synapse <synced.synapse@gmail.com>
Date: Sun, 19 May 2019 13:23:36 +0100
Subject: [PATCH] Tweak Themes

Use more consistent color Schemes
---
 .../ui/generic/NavigationDrawerFragment.java  |   2 +-
 .../ui/sections/video/MovieListFragment.java  |   2 +-
 .../video/TVShowEpisodeListFragment.java      |   3 +-
 .../ui/sections/video/TVShowListFragment.java |   6 +-
 .../video/TVShowProgressFragment.java         |   2 +-
 .../org/xbmc/kore/ui/widgets/ControlPad.java  |   2 +-
 .../xbmc/kore/ui/widgets/HighlightButton.java |   2 +-
 .../xbmc/kore/ui/widgets/PlaylistsBar.java    |   2 +-
 .../java/org/xbmc/kore/utils/UIUtils.java     |   6 +-
 app/src/main/res/layout/grid_item_cast.xml    |   3 +-
 .../res/layout/volume_controller_dialog.xml   |   2 +-
 app/src/main/res/values-ast/strings.xml       |   2 -
 app/src/main/res/values-bg/strings.xml        |   2 -
 app/src/main/res/values-ca/strings.xml        |   2 -
 app/src/main/res/values-cs/strings.xml        |   4 +-
 app/src/main/res/values-de/strings.xml        |   3 -
 app/src/main/res/values-es/strings.xml        |   2 -
 app/src/main/res/values-eu/strings.xml        |   4 +-
 app/src/main/res/values-fr/strings.xml        |   2 -
 app/src/main/res/values-hr/strings.xml        |   2 -
 app/src/main/res/values-hu/strings.xml        |   2 -
 app/src/main/res/values-it/strings.xml        |   2 -
 app/src/main/res/values-iw/strings.xml        |   4 +-
 app/src/main/res/values-ja/strings.xml        |   2 -
 app/src/main/res/values-lt/strings.xml        |   2 -
 app/src/main/res/values-nl/strings.xml        |   2 -
 app/src/main/res/values-pl/strings.xml        |   4 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   2 -
 app/src/main/res/values-pt/strings.xml        |   4 +-
 app/src/main/res/values-ru/strings.xml        |   2 -
 app/src/main/res/values-sl/strings.xml        |   2 -
 app/src/main/res/values-uk/strings.xml        |   2 -
 app/src/main/res/values-zh-rCN/strings.xml    |   2 -
 app/src/main/res/values/arrays.xml            |   6 +-
 app/src/main/res/values/attr.xml              |   2 +-
 app/src/main/res/values/colors.xml            | 167 +++++++++++-------
 app/src/main/res/values/strings.xml           |   4 +-
 app/src/main/res/values/themes.xml            | 146 ++++++++-------
 38 files changed, 197 insertions(+), 215 deletions(-)

diff --git a/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java b/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java
index 29b9f11..7081b12 100644
--- a/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java
@@ -475,7 +475,7 @@ public class NavigationDrawerFragment extends Fragment {
                             R.attr.textColorOverPrimary
                     });
             Resources resources = context.getResources();
-            selectedItemColor = styledAttributes.getColor(styledAttributes.getIndex(0), resources.getColor(R.color.accent_default));
+            selectedItemColor = styledAttributes.getColor(styledAttributes.getIndex(0), resources.getColor(R.color.default_accent));
             hostItemColor = styledAttributes.getColor(styledAttributes.getIndex(1), resources.getColor(R.color.white));
             styledAttributes.recycle();
         }
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
index ffb9776..a5dfa79 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
@@ -338,7 +338,7 @@ public class MovieListFragment extends AbstractCursorListFragment {
 
             });
 
-            themeAccentColor = styledAttributes.getColor(styledAttributes.getIndex(0), getResources().getColor(R.color.accent_default));
+            themeAccentColor = styledAttributes.getColor(styledAttributes.getIndex(0), getResources().getColor(R.color.default_accent));
             dimmedNeutralColor = styledAttributes.getColor(styledAttributes.getIndex(1), getResources().getColor(R.color.white_dim_26pct));
             styledAttributes.recycle();
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java
index 7ec2df3..fcdf0bf 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java
@@ -47,7 +47,6 @@ import org.xbmc.kore.service.library.LibrarySyncService;
 import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.ui.AbstractFragment;
 import org.xbmc.kore.ui.RecyclerViewCursorAdapter;
-import org.xbmc.kore.ui.sections.audio.SongsListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.MediaPlayerUtils;
 import org.xbmc.kore.utils.UIUtils;
@@ -230,7 +229,7 @@ public class TVShowEpisodeListFragment extends AbstractCursorListFragment {
             TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
                     R.attr.colorAccent
             });
-            themeAccentColor = styledAttributes.getColor(styledAttributes.getIndex(0), getResources().getColor(R.color.accent_default));
+            themeAccentColor = styledAttributes.getColor(styledAttributes.getIndex(0), getResources().getColor(R.color.default_accent));
             styledAttributes.recycle();
 
             hostManager = HostManager.getInstance(context);
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
index bb21e06..39f0c49 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
@@ -15,7 +15,6 @@
  */
 package org.xbmc.kore.ui.sections.video;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
@@ -47,7 +46,6 @@ import org.xbmc.kore.service.library.LibrarySyncService;
 import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.ui.AbstractInfoFragment;
 import org.xbmc.kore.ui.RecyclerViewCursorAdapter;
-import org.xbmc.kore.ui.sections.audio.SongsListFragment;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
@@ -321,11 +319,11 @@ public class TVShowListFragment extends AbstractCursorListFragment {
             Resources.Theme theme = context.getTheme();
             TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
                     R.attr.colorAccent,
-                    R.attr.colorinProgress,
+                    R.attr.colorInProgress,
                     R.attr.colorFinished
             });
 
-            themeAccentColor = styledAttributes.getColor(styledAttributes.getIndex(0), getResources().getColor(R.color.accent_default));
+            themeAccentColor = styledAttributes.getColor(styledAttributes.getIndex(0), getResources().getColor(R.color.default_accent));
             inProgressColor = styledAttributes.getColor(styledAttributes.getIndex(1), getResources().getColor(R.color.orange_500));
             finishedColor = styledAttributes.getColor(styledAttributes.getIndex(2), getResources().getColor(R.color.light_green_600));
             styledAttributes.recycle();
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java
index 0644c56..fda077c 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java
@@ -287,7 +287,7 @@ public class TVShowProgressFragment extends AbstractAdditionalInfoFragment imple
             // Get theme colors
             Resources.Theme theme = getActivity().getTheme();
             TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
-                    R.attr.colorinProgress,
+                    R.attr.colorInProgress,
                     R.attr.colorFinished
             });
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java b/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java
index a3836b9..82b9d42 100644
--- a/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java
+++ b/app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java
@@ -173,7 +173,7 @@ public class ControlPad extends SquareGridLayout
         Resources.Theme theme = getContext().getTheme();
         TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {R.attr.contentBackgroundColor});
         int remoteBackgroundColor = styledAttributes.getColor(styledAttributes.getIndex(0),
-                                                              getResources().getColor(R.color.dark_content_background_dim_70pct));
+                                                              getResources().getColor(R.color.dark_content_background_dim));
         styledAttributes.recycle();
 
         // On ICS the remote background isn't shown as the tinting isn't supported
diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java b/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java
index 6fa99a1..a7568f4 100644
--- a/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java
+++ b/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java
@@ -67,7 +67,7 @@ public class HighlightButton extends AppCompatImageButton {
                                                  .obtainStyledAttributes(new int[]{R.attr.colorAccent,
                                                                                    R.attr.defaultButtonColorFilter});
             highlightColor = styledAttributes.getColor(styledAttributes.getIndex(0),
-                                                       context.getResources().getColor(R.color.accent_default));
+                                                       context.getResources().getColor(R.color.default_accent));
             defaultColor = styledAttributes.getColor(styledAttributes.getIndex(1),
                                                      context.getResources().getColor(R.color.white));
             styledAttributes.recycle();
diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java b/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java
index 31b3e13..f19bf5d 100644
--- a/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java
+++ b/app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java
@@ -168,7 +168,7 @@ public class PlaylistsBar extends TabLayout {
                     .obtainStyledAttributes(new int[]{R.attr.colorAccent,
                             R.attr.defaultButtonColorFilter});
             highlightColor = styledAttributes.getColor(styledAttributes.getIndex(0),
-                                                       context.getResources().getColor(R.color.accent_default));
+                                                       context.getResources().getColor(R.color.default_accent));
             defaultColor = styledAttributes.getColor(styledAttributes.getIndex(1),
                                                      context.getResources().getColor(R.color.white));
             styledAttributes.recycle();
diff --git a/app/src/main/java/org/xbmc/kore/utils/UIUtils.java b/app/src/main/java/org/xbmc/kore/utils/UIUtils.java
index b28fc15..28182dd 100644
--- a/app/src/main/java/org/xbmc/kore/utils/UIUtils.java
+++ b/app/src/main/java/org/xbmc/kore/utils/UIUtils.java
@@ -405,9 +405,9 @@ public class UIUtils {
             case 2:
                 return R.style.MistTheme;
             case 3:
-                return R.style.SolarizedLightTheme;
+                return R.style.SunriseTheme;
             case 4:
-                return R.style.SolarizedDarkTheme;
+                return R.style.SunsetTheme;
             default:
                 return R.style.NightTheme;
         }
@@ -596,7 +596,7 @@ public class UIUtils {
                     R.attr.colorAccent});
             view.setColorFilter(
                     styledAttributes.getColor(styledAttributes.getIndex(0),
-                                              context.getResources().getColor(R.color.accent_default)));
+                                              context.getResources().getColor(R.color.default_accent)));
             styledAttributes.recycle();
         } else {
             view.clearColorFilter();
diff --git a/app/src/main/res/layout/grid_item_cast.xml b/app/src/main/res/layout/grid_item_cast.xml
index c9739dc..a8f7aa3 100644
--- a/app/src/main/res/layout/grid_item_cast.xml
+++ b/app/src/main/res/layout/grid_item_cast.xml
@@ -80,7 +80,8 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:src="?attr/iconOpenInNew"
-            android:contentDescription="@string/poster"/>
+            android:contentDescription="@string/poster"
+            android:tint="?attr/defaultButtonColorFilter"/>
         <TextView
             android:id="@+id/remaining_cast_count"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/volume_controller_dialog.xml b/app/src/main/res/layout/volume_controller_dialog.xml
index d3a2560..717b30a 100644
--- a/app/src/main/res/layout/volume_controller_dialog.xml
+++ b/app/src/main/res/layout/volume_controller_dialog.xml
@@ -7,7 +7,7 @@
     android:layout_height="wrap_content"
     android:background="?attr/contentBackgroundColor"
     android:minWidth="200dp"
-    tools:background="@color/dark_content_background_dim_70pct">
+    tools:background="@color/dark_content_background_dim">
 
     <org.xbmc.kore.ui.widgets.HighlightButton
         android:id="@+id/vcd_volume_mute"
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index a129b05..1c7916e 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -262,8 +262,6 @@ Primi <b><i>Finar</i></b> p\'apenzar a usar el mandu.
   <string name="theme_night">Nueche</string>
   <string name="theme_day">Día</string>
   <string name="theme_mist">Caín</string>
-  <string name="theme_solarized">Soleyeru</string>
-  <string name="theme_solarized_dark">Escuridá soleyero</string>
   <string name="switch_to_remote">Camudar al mandu dempués del aniciu de medios</string>
   <string name="keep_remote_above_lockscreen">Caltener el mandu enriba la pantalla de bloquéu</string>
   <string name="show_notification">Amosar avisu entrín se reproduz</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 1d16d93..8e7b549 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -320,8 +320,6 @@
     <string name="theme_night">Нощ</string>
     <string name="theme_day">Ден</string>
     <string name="theme_mist">Мъгла</string>
-    <string name="theme_solarized">Соларизирана</string>
-    <string name="theme_solarized_dark">Соларизирана (Тъмна)</string>
 
     <string name="switch_to_remote">Към дистанционното след стартиране</string>
     <string name="keep_remote_above_lockscreen">Показвай дистанционното над заключения екран</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index bdb1f3f..1ce028f 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -250,8 +250,6 @@
     <string name="theme_night">Nit</string>
     <string name="theme_day">Dia</string>
     <string name="theme_mist">Boira</string>
-    <string name="theme_solarized">Solaritzat</string>
-    <string name="theme_solarized_dark">Solaritzat fosc</string>
     <string name="switch_to_remote">Mostra al iniciar el dispositiu</string>
     <string name="keep_remote_above_lockscreen">Mostra sobre la pantalla de bloqueig</string>
     <string name="pref_keep_screen_on">Estigues pendent</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index f0798c2..99f2988 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -340,9 +340,7 @@
     <string name="theme_night">Noc</string>
     <string name="theme_day">Den</string>
     <string name="theme_mist">Mlha</string>
-    <string name="theme_solarized">Solarized</string>
-    <string name="theme_solarized_dark">Solarized Dark</string>
-	
+
     <string name="switch_to_remote">Show on media start</string>
     <string name="keep_remote_above_lockscreen">Show over lockscreen</string>
     <string name="pref_keep_screen_on">Zůstat vzhůru</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4bea17d..7af7636 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -334,14 +334,11 @@
     <string name="theme_night">Nacht</string>
     <string name="theme_day">Tag</string>
     <string name="theme_mist">Nebel</string>
-    <string name="theme_solarized">Solarized</string>
-    <string name="theme_solarized_dark">Solarized dunkel</string>
 
     <string name="switch_to_remote">Nach dem Abspielen eines Mediums zur Fernbedienung wechseln</string>
     <string name="keep_remote_above_lockscreen">Fernbedienung auf dem Sperrbildschirm anzeigen</string>
     <string name="pref_keep_screen_on">Bildschirm nicht während der Nutzung als Fernbedienung ausschalten</string>
     <string name="show_notification">Nachricht mit aktueller Wiedergabe anzeigen</string>
-    <string name="show_now_playing_panel"></string>
 	<string name="show_now_playing_panel_summary">Zeigt ein ausklappbares Feld am unteren Rand des Bildschirms an, während Medien wiedergegeben werden</string>
 	<string name="notification_seek_jump">Benutze Schritte zum Suchen</string>
 	<string name="notification_seek_jump_speed">Während des Suchens von einer Benachrichtigung die Wiedergabegeschwindigkeit ändern</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f2b9b49..9d2099e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -236,8 +236,6 @@
   <string name="theme_night">Noche</string>
   <string name="theme_day">Día</string>
   <string name="theme_mist">Niebla</string>
-  <string name="theme_solarized">Soleado</string>
-  <string name="theme_solarized_dark">Soleado oscuro</string>
   <string name="switch_to_remote">Cambiar a control remoto después de que inicie la reproducción</string>
   <string name="show_notification">Mostrar notificaciones durante la reproducción</string>
   <string name="use_hardware_volume_keys">Usar las teclas de volumen para el control de volumen</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 093873c..3b97efb 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -340,9 +340,7 @@
     <string name="theme_night">Gaua</string>
     <string name="theme_day">Eguna</string>
     <string name="theme_mist">Lanbroa</string>
-    <string name="theme_solarized">Alderantzikatua</string>
-    <string name="theme_solarized_dark">Alderantzikatu iluna</string>
-	
+
     <string name="switch_to_remote">Aldatu urrunekora multimedia hastean</string>
     <string name="keep_remote_above_lockscreen">Erakutsi blokeatutako pantailaren gainean</string>
     <string name="pref_keep_screen_on">Mantendu aktibo</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8c9cc91..bc8d3ce 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -342,8 +342,6 @@
     <string name="theme_night">Nuit</string>
     <string name="theme_day">Jour</string>
     <string name="theme_mist">Brouillard</string>
-    <string name="theme_solarized">Solarisé</string>
-    <string name="theme_solarized_dark">Solarisé Foncé</string>
 
     <string name="switch_to_remote">Basculer sur la télécommande après le début de la lecture</string>
     <string name="keep_remote_above_lockscreen">Conserver la télécommande sur l\'écran de déverrouillage</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 924f9ea..f6e99b8 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -321,8 +321,6 @@
     <string name="theme_night">Noć</string>
     <string name="theme_day">Dan</string>
     <string name="theme_mist">Izmaglica</string>
-    <string name="theme_solarized">Solarizirano</string>
-    <string name="theme_solarized_dark">Solarizirano Tamno</string>
 
     <string name="switch_to_remote">Prebaci na daljinski nakon pokretanja medija</string>
     <string name="keep_remote_above_lockscreen">Zadrži daljinski iznad zaslona zaključavanja</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 5846d08..6895c08 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -178,8 +178,6 @@
     <string name="text_to_send">Küldendő szöveg</string>
     <string name="theme_day">Nappal</string>
     <string name="theme_mist">Köd</string>
-    <string name="theme_solarized">Szolarizált</string>
-    <string name="theme_solarized_dark">Sötét szolarizált</string>
     <string name="thumbnail">Miniatűr</string>
     <string name="votes">%1$s szavazat</string>
     <string name="pull_to_refresh">Húzd lefelé a frissítéshez</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 25d14ee..c91c756 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -293,8 +293,6 @@
     <string name="theme_night">Notte</string>
     <string name="theme_day">Giorno</string>
     <string name="theme_mist">Nebbia</string>
-    <string name="theme_solarized">Solarized</string>
-    <string name="theme_solarized_dark">Solarized Dark</string>
 
     <string name="switch_to_remote">Cambia a remoto dopo l\'avvio del file</string>
     <string name="show_notification">Mostra le notifiche durante l\'esecuzione</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1e9a820..7bc995f 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -342,9 +342,7 @@
     <string name="theme_night">לילה</string>
     <string name="theme_day">יום</string>
     <string name="theme_mist">ערפל</string>
-    <string name="theme_solarized">זריחה</string>
-    <string name="theme_solarized_dark">זריחה כהה</string>
-	
+
     <string name="switch_to_remote">הצגה עם הפעלת המדיה</string>
     <string name="keep_remote_above_lockscreen">הצגה על גבי מסך הנעילה</string>
     <string name="pref_keep_screen_on">להשאיר את המסך דולק</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6f932b8..3109e58 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -326,8 +326,6 @@
     <string name="theme_night">夜間</string>
     <string name="theme_day">日中</string>
     <string name="theme_mist">ミスト</string>
-    <string name="theme_solarized">ソラリゼーション</string>
-    <string name="theme_solarized_dark">ソラリゼーションダーク</string>
 
     <string name="switch_to_remote">メディア開始時に表示</string>
     <string name="keep_remote_above_lockscreen">ロック画面上に表示</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 4abf9b0..44ec21f 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -326,8 +326,6 @@
     <string name="theme_night">Naktis</string>
     <string name="theme_day">Diena</string>
     <string name="theme_mist">Rūkas</string>
-    <string name="theme_solarized">Ryški</string>
-    <string name="theme_solarized_dark">Ryški tamsi</string>
 
     <string name="switch_to_remote">Atidaryti pultą paleidus media</string>
     <string name="keep_remote_above_lockscreen">Rodyti pultą užrakintame ekrane</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dc45b4d..5f16305 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -243,8 +243,6 @@
   <string name="theme_night">Nacht</string>
   <string name="theme_day">Dag</string>
   <string name="theme_mist">Mist</string>
-  <string name="theme_solarized">Zonnig</string>
-  <string name="theme_solarized_dark">Zonnig donker</string>
   <string name="switch_to_remote">Tonen bij starten van media</string>
   <string name="show_notification">Afspeelmelding tonen tijdens afspelen</string>
   <string name="use_hardware_volume_keys">Fysieke volumeknoppen gebruiken</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f48a9c9..fd0b694 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -341,9 +341,7 @@
     <string name="theme_night">Noc</string>
     <string name="theme_day">Dzień</string>
     <string name="theme_mist">Mgła</string>
-    <string name="theme_solarized">Prześwietlony</string>
-    <string name="theme_solarized_dark">Ciemny prześwietlony</string>
-	
+
     <string name="switch_to_remote">Przełącz do zdalnego sterowania po uruchomieniu odtwarzania</string>
     <string name="keep_remote_above_lockscreen">Pilot nad blokadą ekranu</string>
     <string name="pref_keep_screen_on">Nie wyłączaj ekranu podczas używania pilota</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bbe411e..9e9dca5 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -304,8 +304,6 @@
     <string name="theme_night">Noite</string>
     <string name="theme_day">Dia</string>
     <string name="theme_mist">Neblina</string>
-    <string name="theme_solarized">Solarized</string>
-    <string name="theme_solarized_dark">Solarized escuro</string>
 
     <string name="switch_to_remote">Mudar para o controle remoto ao iniciar reprodução</string>
     <string name="show_notification">Mostrar notificação enquanto estiver em reprodução</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b5489f5..21fdae7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -207,8 +207,8 @@ Pressione <b><i>Concluir</i></b> para usar o controlo remoto.]]></string>
   <string name="theme_night">Noite</string>
   <string name="theme_day">Dia</string>
   <string name="theme_mist">Neblina</string>
-  <string name="theme_solarized">Solarized</string>
-  <string name="theme_solarized_dark">Solarized escuro</string>
+  <string name="theme_sunrise">Madrugada</string>
+  <string name="theme_sunset">Crepúsculo</string>
   <string name="switch_to_remote">Mostrar ao iniciar reprodução</string>
   <string name="about">Sobre</string>
   <string name="about_desc"><![CDATA[
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b88caa5..bb3d1bd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -293,8 +293,6 @@
     <string name="theme_night">Ночь</string>
     <string name="theme_day">День</string>
     <string name="theme_mist">Туман</string>
-    <string name="theme_solarized">Solarized</string>
-    <string name="theme_solarized_dark">Solarized Dark</string>
 
     <string name="switch_to_remote">Переходить к управлению при старте воспроизведения</string>
     <string name="show_notification">Показывать уведомление при воспроизведении</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 6621cdc..091026f 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -246,8 +246,6 @@
     <string name="theme_night">Noč</string>
     <string name="theme_day">Dan</string>
     <string name="theme_mist">Megla</string>
-    <string name="theme_solarized">Solarizirano</string>
-    <string name="theme_solarized_dark">Solarizirano Temno</string>
     <string name="switch_to_remote">Prikaži ob pričetku medija</string>
     <string name="keep_remote_above_lockscreen">Pokaži nad zaklenjenim zaslonom</string>
     <string name="show_notification">Med predvajanjem prikaži obvestilo</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 4095b29..1064dfc 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -332,8 +332,6 @@
     <string name="theme_night">Ніч</string>
     <string name="theme_day">День</string>
     <string name="theme_mist">Туман</string>
-    <string name="theme_solarized">Solarized</string>
-    <string name="theme_solarized_dark">Solarized Dark</string>
 
     <string name="switch_to_remote">Відображати при початку відтворення</string>
     <string name="keep_remote_above_lockscreen">Відображати на екрані блокування</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e98cb8e..b6c3418 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -293,8 +293,6 @@
     <string name="theme_night">深夜风格</string>
     <string name="theme_day">晨间风格</string>
     <string name="theme_mist">迷雾风格</string>
-    <string name="theme_solarized">太阳能亮色调</string>
-    <string name="theme_solarized_dark">太阳能暗色调</string>
 
     <string name="switch_to_remote">媒体播放后切换到遥控器</string>
     <string name="show_notification">播放时显示通知</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 9e03bad..5023a04 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -30,15 +30,15 @@
         <item>@string/theme_night</item>
         <item>@string/theme_day</item>
         <item>@string/theme_mist</item>
-        <item>@string/theme_solarized</item>
-        <!--<item>@string/theme_solarized_dark</item>-->
+        <item>@string/theme_sunrise</item>
+        <item>@string/theme_sunset</item>
     </string-array>
     <string-array translatable="false" name="themes_values_array">
         <item>0</item>
         <item>1</item>
         <item>2</item>
         <item>3</item>
-        <!--<item>4</item>-->
+        <item>4</item>
     </string-array>
 
     <!-- Remote Bar items -->
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 0441ae4..3f544d7 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -40,7 +40,7 @@
 
     <attr name="fabLabelTextColor" format="reference|color" />
 
-    <attr name="colorinProgress" format="reference|color" />
+    <attr name="colorInProgress" format="reference|color" />
     <attr name="colorFinished" format="reference|color" />
 
     <attr name="separatorColor" format="reference|color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f178c5c..ce3cd2e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,90 +17,123 @@
 <resources>
     <color name="ic_launcher_background">#0BB1E6</color>
 
-	<color name="dark_background">#ff121314</color>
-    <color name="light_background">#ffeeeeee</color>
-    <!--<color name="blue_grey_background">#ff212b30</color>-->
-    <color name="blue_grey_background">#ff192227</color>
+    <!-- Night Theme colors -->
+    <color name="dark_background">#ff1b1b1b</color>
+    <color name="dark_content_background">#ff333333</color>
+    <color name="dark_content_background_dim">#b4333333</color>
+    <color name="dark_selected_content_background">#ff404040</color>
 
-    <!--<color name="accent_default">@color/light_green_A700</color>-->
-    <color name="accent_default">@color/orange_A400</color>
-    <color name="accent_default_dark">@color/orange_A700</color>
-    <color name="accent_default_light">@color/orange_A100</color>
+    <color name="default_accent_lighter">#FFB05F</color>
+    <color name="default_accent_light">#FF9A34</color>
+    <color name="default_accent">#FF8100</color>
+    <color name="default_accent_dark">#C66400</color>
+    <color name="default_accent_darker">#9C4F00</color>
 
-    <color name="white">#ffffffff</color>
+    <color name="estuary_blue_lighter">#499FB8</color>
+    <color name="estuary_blue_light">#278BA8</color>
+    <color name="estuary_blue">#0f85a5</color>
+    <color name="estuary_blue_dark">#04617B</color>
+    <color name="estuary_blue_darker">#024C61</color>
+
+    <!-- Day Theme colors -->
+    <color name="light_background">#ffebebeb</color>
+    <color name="light_content_background">#ffffffff</color>
+    <color name="light_content_background_dim">#c4ffffff</color>
+    <color name="light_selected_content_background">#fff3f3f3</color>
+
+    <color name="day_accent_lighter">#69BD57</color>
+    <color name="day_accent_light">#449F31</color>
+    <color name="day_accent">#2B8519</color>
+    <color name="day_accent_dark">#156604</color>
+    <color name="day_accent_darker">#0C4300</color>
+
+    <color name="day_primary_lighter">#DB6470</color>
+    <color name="day_primary_light">#B83945</color>
+    <color name="day_primary">#9A1C28</color>
+    <color name="day_primary_darker">#76040F</color>
+    <color name="day_primary_dark">#4D0007</color>
+    <!--<color name="day_primary">#b13956</color>-->
+    <!--<color name="day_primary_dark">#873349</color>-->
+
+    <!-- Mist Theme colors -->
+    <color name="mist_background">#ff192227</color>
+    <color name="mist_content_background">#ff263238</color>
+    <color name="mist_content_background_dim">#b4263238</color>
+    <color name="mist_selected_content_background">#ff43575d</color>
+
+    <color name="mist_accent_lighter">#FFE9CF</color>
+    <color name="mist_accent_light">#DEBC96</color>
+    <color name="mist_accent">#B99163</color>
+    <color name="mist_accent_dark">#966E40</color>
+    <color name="mist_accent_darker">#7A5021</color>
+
+    <color name="mist_primary_lighter">#8CA1AB</color>
+    <color name="mist_primary_light">#617E8C</color>
+    <color name="mist_primary">#416475</color>
+    <color name="mist_primary_dark">#2B4E5F</color>
+    <color name="mist_primary_darker">#173C4D</color>
+
+    <!-- Sunrise Theme colors -->
+    <color name="sunrise_background">#ffededed</color>
+    <color name="sunrise_content_background">#fffefefe</color>
+    <color name="sunrise_content_background_dim">#c4fefefe</color>
+    <color name="sunrise_selected_content_background">#fffefefe</color>
+
+    <color name="sunrise_primary">#FF813A</color>
+    <color name="sunrise_primary_dark">#ED5B09</color>
+    <!--<color name="sunrise_primary">#0085a0</color>-->
+    <!--<color name="sunrise_primary_dark">#005871</color>-->
+
+    <!--<color name="sunrise_accent_light">#e95379</color>-->
+    <color name="sunrise_accent_light">#44BA99</color>
+    <color name="sunrise_accent">#26A783</color>
+    <color name="sunrise_accent_dark">#069C72</color>
+
+    <!-- Sunset Theme colors -->
+    <color name="sunset_background">#ff1D2126</color>
+    <color name="sunset_content_background">#ff262C33</color>
+    <color name="sunset_content_background_dim">#b4262C33</color>
+    <color name="sunset_selected_content_background">#ff303740</color>
+    <!--<color name="sunset_background">#ff1c1e26</color>-->
+    <!--<color name="sunset_content_background">#ff232530</color>-->
+    <!--<color name="sunset_content_background_dim">#b4232530</color>-->
+    <!--<color name="sunset_selected_content_background">#ff2E303E</color>-->
+
+    <color name="sunset_primary">#995AC7</color>
+    <color name="sunset_primary_dark">#7E3AAF</color>
+    <!--<color name="sunset_primary">#9f68bf</color>-->
+    <!--<color name="sunset_primary_dark">#6f3b8e</color>-->
+
+    <color name="sunset_accent_light">#B3CB65</color>
+    <color name="sunset_accent">#89A236</color>
+    <color name="sunset_accent_dark">#627A14</color>
+    <!--<color name="sunset_accent_light">#ffffc5b3</color>-->
+    <!--<color name="sunset_accent">#ffF09483</color>-->
+    <!--<color name="sunset_accent_dark">#ffbb6556</color>-->
+
+    <!-- General colors -->
+    <color name="white">@android:color/white</color>
     <color name="white_dim_26pct">#43ffffff</color>
     <color name="white_dim_50pct">#88ffffff</color>
-    <color name="white_dim_70pct">#b3ffffff</color>
-
+    <color name="white_dim_70pct">#b4ffffff</color>
+    <color name="white_dim_87pct">#deffffff</color>
     <color name="black_dim_87pct">#de000000</color>
     <color name="black_dim_54pct">#8a000000</color>
     <color name="black_dim_26pct">#43000000</color>
 
-    <color name="estuary_default">#0f85a5</color>
-    <color name="estuary_default_light">#17cdff</color>
-    <color name="estuary_default_dark">#0a5b71</color>
-    <!--<color name="estuary_default">#147a96</color>-->
-    <!--<color name="estuary_default_dark">#0f4d5e</color>-->
-
-    <color name="day_accent">#e66000</color>
-    <color name="day_accent_dark">#cd5700</color>
-    <color name="day_primary">#b13956</color>
-    <color name="day_primary_dark">#873349</color>
-    <!--<color name="day_primary">#993a50</color>-->
-
-    <!--<color name="dark_content_background">#ff222326</color>-->
-    <!--<color name="dark_content_background_dim_70pct">#b4222326</color>-->
-    <color name="dark_content_background">#ff323232</color>
-    <color name="dark_content_background_dim_70pct">#b4323232</color>
-    <color name="dark_selected_content_background">#ff505050</color>
-
-    <color name="light_content_background">#ffffffff</color>
-    <color name="light_content_background_dim_70pct">#b4ffffff</color>
-    <color name="light_selected_content_background">#ffd1d1d1</color>
-
-    <color name="blue_grey_content_background">#ff263238</color>
-    <color name="blue_grey_content_background_dim_70pct">#b4263238</color>
-    <color name="blue_grey_selected_content_background">#ff43575d</color>
-
     <color name="dark_separator">#ff505050</color>
     <color name="light_separator">#ffafafaf</color>
 
     <color name="dark_fastscroll_handle">#ff505050</color>
     <color name="light_fastscroll_handle">#ff606060</color>
 
-    <!-- Drawer colors -->
-	<color name="dark_drawer_background">@color/dark_content_background</color>
-    <color name="light_drawer_background">@color/light_content_background</color>
-    <color name="blue_grey_drawer_background">@color/blue_grey_content_background</color>
+    <color name="dark_in_progress">#51cc93</color>
+    <color name="light_in_progress">#51cc93</color>
+    <!--<color name="dark_in_progress">@color/default_accent_light</color>-->
+    <!--<color name="light_in_progress">@color/day_accent_light</color>-->
 
     <color name="host_status_connecting">#ffff8800</color>
     <color name="host_status_available">#ff669900</color>
     <color name="host_status_unavailable">#ffcc0000</color>
 
-    <color name="solarized_base03">#ff002b36</color>
-    <color name="solarized_base02">#ff073642</color>
-    <color name="solarized_base01">#ff586e75</color>
-    <color name="solarized_base00">#ff657b83</color>
-    <color name="solarized_base0">#ff839496</color>
-    <color name="solarized_base1">#ff93a1a1</color>
-    <color name="solarized_base2">#ffeee8d5</color>
-    <color name="solarized_base3">#fffdf6e3</color>
-    <color name="solarized_yellow">#ffb58900</color>
-    <color name="solarized_orange">#ffcb4b16</color>
-    <color name="solarized_red">#ffdc322f</color>
-    <color name="solarized_magenta">#ffd33682</color>
-    <color name="solarized_violet">#ff6c71c4</color>
-    <color name="solarized_blue">#ff268bd2</color>
-    <color name="solarized_cyan">#ff2aa198</color>
-    <color name="solarized_green">#ff859900</color>
-
-    <color name="solarized_base03_dim70pct">#b4002b36</color>
-    <color name="solarized_base02_dim70pct">#b4073642</color>
-    <color name="solarized_base3_dim70pct">#b4fdf6e3</color>
-    <color name="solarized_base2_dim70pct">#b4eee8d5</color>
-
-    <color name="solarized_orange_dark">#ffc73a00</color>
-
-    <color name="notification_backgroup">@color/background_floating_material_dark</color>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3aea06..98fc809 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -341,8 +341,8 @@
     <string name="theme_night">Night</string>
     <string name="theme_day">Day</string>
     <string name="theme_mist">Mist</string>
-    <string name="theme_solarized">Solarized</string>
-    <string name="theme_solarized_dark">Solarized Dark</string>
+    <string name="theme_sunrise">Sunrise</string>
+    <string name="theme_sunset">Sunset</string>
 	
     <string name="switch_to_remote">Show on media start</string>
     <string name="keep_remote_above_lockscreen">Show over lockscreen</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 25a6252..a2b0b30 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -23,28 +23,18 @@
 		<item name="android:colorBackground">@color/dark_background</item>
         <item name="android:windowBackground">@color/dark_background</item>
         <!--<item name="android:windowActionBarOverlay">true</item>-->
+        <item name="android:navigationBarColor" tools:targetApi="21">@color/dark_background</item>
 
         <item name="preferenceTheme">@style/PrefTheme</item>
 
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
 
         <!-- Set AppCompat’s color theming attrs -->
-        <!--<item name="colorPrimary">@color/light_green_800</item>-->
-        <!--<item name="colorPrimaryDark">@color/light_green_900</item>-->
-        <!--<item name="colorPrimary">@color/teal_500</item>-->
-        <!--<item name="colorPrimaryDark">@color/teal_700</item>-->
-        <!--<item name="colorPrimary">@color/green_500</item>-->
-        <!--<item name="colorPrimaryDark">@color/green_700</item>-->
-        <!--<item name="colorPrimary">@color/orange_700</item>-->
-        <!--<item name="colorPrimaryDark">@color/orange_800</item>-->
-        <!--<item name="colorPrimary">@color/deep_orange_700</item>-->
-        <!--<item name="colorPrimaryDark">@color/deep_orange_900</item>-->
-        <!--<item name="colorPrimary">@color/blue_grey_500</item>-->
-        <!--<item name="colorPrimaryDark">@color/blue_grey_700</item>-->
-        <item name="colorPrimary">@color/estuary_default</item>
-        <item name="colorPrimaryDark">@color/estuary_default_dark</item>
+        <item name="colorPrimary">@color/estuary_blue</item>
+        <item name="colorPrimaryDark">@color/estuary_blue_dark</item>
 
-        <item name="colorAccent">@color/accent_default</item>
+        <item name="colorAccent">@color/default_accent</item>
+        <item name="colorAccentLight">@color/default_accent_light</item>
         <!--<item name="colorControlHighlight">@color/color_accent</item>-->
         <!--<item name="colorControlActivated">@color/color_accent</item>-->
 
@@ -54,36 +44,36 @@
         <item name="colorButtonNormal">?attr/colorPrimary</item>
 
         <item name="appTextColorPrimary">@color/white</item>
-        <item name="appTextColorSecondary">@color/white_dim_50pct</item>
+        <item name="appTextColorSecondary">@color/white_dim_70pct</item>
 
         <item name="textColorOverPrimary">@color/white</item>
         <item name="buttonColorOverPrimary">@color/white</item>
 
         <item name="fabColorNormal">?attr/colorPrimary</item>
         <item name="fabColorPressed">?attr/colorPrimaryDark</item>
-        <item name="fabColorFocused">@color/estuary_default_light</item>
+        <item name="fabColorFocused">?attr/colorPrimary</item>
 
         <item name="fabLabelColorNormal">?attr/colorPrimary</item>
         <item name="fabLabelColorPressed">?attr/colorPrimaryDark</item>
-        <item name="fabLabelColorFocused">@color/estuary_default_light</item>
+        <item name="fabLabelColorFocused">?attr/colorPrimary</item>
 
         <item name="fabLabelTextColor">@color/white</item>
 
-        <item name="colorinProgress">@color/yellow_800</item>
-        <item name="colorFinished">@color/green_600</item>
+        <item name="colorInProgress">@color/default_accent</item>
+        <item name="colorFinished">@color/default_accent_darker</item>
 
         <!-- Toolbar bar -->
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
-        <item name="contentBackgroundColor">@color/dark_content_background_dim_70pct</item>
+        <item name="contentBackgroundColor">@color/dark_content_background_dim</item>
         <item name="appCardBackgroundColor">@color/dark_content_background</item>
         <item name="appSelectedCardBackgroundColor">@color/dark_selected_content_background</item>
         <!--<item name="myCardBackgroundDrawable">@drawable/card_background_dark</item>-->
-        <item name="buttonBarBackgroundColor">@color/dark_content_background_dim_70pct</item>
+        <item name="buttonBarBackgroundColor">@color/dark_content_background_dim</item>
 
         <!-- Color for the Navigation Drawer -->
-		<item name="drawerBackgroundColor">@color/dark_drawer_background</item>
+		<item name="drawerBackgroundColor">@color/dark_background</item>
 
         <item name="separatorColor">@color/dark_separator</item>
         <item name="fastscrollHandleColor">@color/dark_fastscroll_handle</item>
@@ -180,6 +170,7 @@
 
         <item name="android:colorBackground">@color/light_background</item>
         <item name="android:windowBackground">@color/light_background</item>
+        <item name="android:navigationBarColor" tools:targetApi="21">@color/light_background</item>
 
         <item name="preferenceTheme">@style/PrefTheme</item>
 
@@ -188,7 +179,9 @@
         <!-- Set AppCompat’s color theming attrs -->
         <item name="colorPrimary">@color/day_primary</item>
         <item name="colorPrimaryDark">@color/day_primary_dark</item>
+
         <item name="colorAccent">@color/day_accent</item>
+        <item name="colorAccentLight">@color/day_accent_light</item>
          <!--<item name="colorControlHighlight">@color/color_accent</item>-->
         <!--<item name="colorControlActivated">@color/color_accent</item>-->
 
@@ -207,29 +200,29 @@
 
         <item name="fabColorNormal">?attr/colorPrimary</item>
         <item name="fabColorPressed">?attr/colorPrimaryDark</item>
-        <item name="fabColorFocused">@color/accent_default_light</item>
+        <item name="fabColorFocused">?attr/colorPrimary</item>
 
         <item name="fabLabelColorNormal">?attr/colorPrimary</item>
         <item name="fabLabelColorPressed">?attr/colorPrimaryDark</item>
-        <item name="fabLabelColorFocused">@color/accent_default_light</item>
+        <item name="fabLabelColorFocused">?attr/colorPrimary</item>
 
         <item name="fabLabelTextColor">@color/white</item>
 
-        <item name="colorinProgress">@color/yellow_800</item>
-        <item name="colorFinished">@color/light_green_600</item>
+        <item name="colorInProgress">@color/day_accent</item>
+        <item name="colorFinished">@color/day_accent_dark</item>
 
         <!-- Toolbar bar -->
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
-        <item name="contentBackgroundColor">@color/light_content_background_dim_70pct</item>
+        <item name="contentBackgroundColor">@color/light_content_background_dim</item>
         <item name="appCardBackgroundColor">@color/light_content_background</item>
         <item name="appSelectedCardBackgroundColor">@color/light_selected_content_background</item>
         <!--<item name="myCardBackgroundDrawable">@drawable/card_background_light</item>-->
-        <item name="buttonBarBackgroundColor">@color/light_content_background_dim_70pct</item>
+        <item name="buttonBarBackgroundColor">@color/light_content_background_dim</item>
 
         <!-- Color for the Navigation Drawer -->
-        <item name="drawerBackgroundColor">@color/light_drawer_background</item>
+        <item name="drawerBackgroundColor">@color/light_content_background</item>
 
         <item name="separatorColor">@color/light_separator</item>
         <item name="fastscrollHandleColor">@color/light_fastscroll_handle</item>
@@ -334,75 +327,76 @@
 
     <!-- Blue Grey theme. -->
     <style name="MistTheme" parent="NightTheme">
-        <item name="android:colorBackground">@color/blue_grey_background</item>
-        <item name="android:windowBackground">@color/blue_grey_background</item>
+        <item name="android:colorBackground">@color/mist_background</item>
+        <item name="android:windowBackground">@color/mist_background</item>
+        <item name="android:navigationBarColor" tools:targetApi="21">@color/mist_background</item>
 
-        <!-- Set AppCompat’s color theming attrs -->
         <!--<item name="colorPrimary">@color/light_blue_700</item>-->
         <!--<item name="colorPrimaryDark">@color/light_blue_800</item>-->
-        <item name="colorPrimary">@color/blue_grey_500</item>
-        <item name="colorPrimaryDark">@color/blue_grey_700</item>
-        <item name="colorAccent">@color/light_blue_A400</item>
+        <item name="colorPrimary">@color/mist_primary</item>
+        <item name="colorPrimaryDark">@color/mist_primary_dark</item>
 
-        <item name="contentBackgroundColor">@color/blue_grey_content_background_dim_70pct</item>
-        <item name="appCardBackgroundColor">@color/blue_grey_content_background</item>
-        <item name="appSelectedCardBackgroundColor">@color/blue_grey_selected_content_background</item>
-        <item name="buttonBarBackgroundColor">@color/blue_grey_content_background_dim_70pct</item>
+        <item name="colorAccent">@color/mist_accent</item>
+        <item name="colorAccentLight">@color/mist_accent_light</item>
 
-        <!-- Color for the Navigation Drawer -->
-        <item name="drawerBackgroundColor">@color/blue_grey_drawer_background</item>
+        <item name="contentBackgroundColor">@color/mist_content_background_dim</item>
+        <item name="appCardBackgroundColor">@color/mist_content_background</item>
+        <item name="appSelectedCardBackgroundColor">@color/mist_selected_content_background</item>
+        <item name="buttonBarBackgroundColor">@color/mist_content_background_dim</item>
 
+        <item name="drawerBackgroundColor">@color/mist_background</item>
+
+        <item name="colorInProgress">@color/mist_accent</item>
+        <item name="colorFinished">@color/mist_accent_darker</item>
         <!--<item name="remoteBackgroundColorFilter">@color/blue_grey_content_background</item>-->
         <!--<item name="separatorColor">@color/dark_separator</item>-->
     </style>
 
-    <!-- Solarized Light theme. -->
-    <style name="SolarizedLightTheme" parent="DayTheme">
-        <item name="android:colorBackground">@color/solarized_base2</item>
-        <item name="android:windowBackground">@color/solarized_base2</item>
+    <!-- Sunrise theme. -->
+    <style name="SunriseTheme" parent="DayTheme">
+        <item name="android:colorBackground">@color/sunrise_background</item>
+        <item name="android:windowBackground">@color/sunrise_background</item>
+        <item name="android:navigationBarColor" tools:targetApi="21">@color/sunrise_background</item>
 
-        <!-- Set AppCompat’s color theming attrs -->
-        <item name="colorPrimary">@color/solarized_orange</item>
-        <item name="colorPrimaryDark">@color/solarized_orange_dark</item>
-        <item name="colorAccent">@color/solarized_blue</item>
+        <item name="colorPrimary">@color/sunrise_primary</item>
+        <item name="colorPrimaryDark">@color/sunrise_primary_dark</item>
 
-        <item name="contentBackgroundColor">@color/solarized_base3_dim70pct</item>
-        <item name="appCardBackgroundColor">@color/solarized_base3</item>
-        <item name="appSelectedCardBackgroundColor">@color/white</item>
-        <item name="buttonBarBackgroundColor">@color/solarized_base3_dim70pct</item>
+        <item name="colorAccent">@color/sunrise_accent</item>
+        <item name="colorAccentLight">@color/sunrise_accent_light</item>
 
-        <!-- Color for the Navigation Drawer -->
-        <item name="drawerBackgroundColor">@color/solarized_base2</item>
+        <item name="contentBackgroundColor">@color/sunrise_content_background_dim</item>
+        <item name="appCardBackgroundColor">@color/sunrise_content_background</item>
+        <item name="buttonBarBackgroundColor">@color/sunrise_content_background_dim</item>
+        <item name="appSelectedCardBackgroundColor">@color/sunrise_selected_content_background</item>
 
-        <item name="appTextColorPrimary">@color/solarized_base01</item>
-        <item name="appTextColorSecondary">@color/solarized_base0</item>
+        <item name="drawerBackgroundColor">@color/sunrise_background</item>
 
-        <!--<item name="remoteBackgroundColorFilter">@color/solarized_base3</item>-->
+        <item name="colorInProgress">@color/sunrise_accent_dark</item>
+        <item name="colorFinished">@color/sunrise_accent_light</item>
         <!--<item name="separatorColor">@color/dark_separator</item>-->
     </style>
 
-    <!-- Solarized Dark theme. -->
-    <style name="SolarizedDarkTheme" parent="NightTheme">
-        <item name="android:colorBackground">@color/solarized_base03</item>
+    <!-- Sunset theme. -->
+    <style name="SunsetTheme" parent="NightTheme">
+        <item name="android:colorBackground">@color/sunset_background</item>
+        <item name="android:windowBackground">@color/sunset_background</item>
+        <item name="android:navigationBarColor" tools:targetApi="21">@color/sunset_background</item>
 
-        <!-- Set AppCompat’s color theming attrs -->
-        <item name="colorPrimary">@color/solarized_orange</item>
-        <item name="colorPrimaryDark">@color/solarized_orange_dark</item>
-        <item name="colorAccent">@color/solarized_blue</item>
+        <item name="colorPrimary">@color/sunset_primary</item>
+        <item name="colorPrimaryDark">@color/sunset_primary_dark</item>
 
-        <item name="contentBackgroundColor">@color/solarized_base02_dim70pct</item>
-        <item name="appCardBackgroundColor">@color/solarized_base02</item>
-        <item name="buttonBarBackgroundColor">@color/solarized_base02_dim70pct</item>
-        <item name="appSelectedCardBackgroundColor">@color/solarized_base01</item>
+        <item name="colorAccentLight">@color/sunset_accent_light</item>
+        <item name="colorAccent">@color/sunset_accent</item>
 
-        <!-- Color for the Navigation Drawer -->
-        <item name="drawerBackgroundColor">@color/solarized_base02</item>
+        <item name="contentBackgroundColor">@color/sunset_content_background_dim</item>
+        <item name="appCardBackgroundColor">@color/sunset_content_background</item>
+        <item name="buttonBarBackgroundColor">@color/sunset_content_background_dim</item>
+        <item name="appSelectedCardBackgroundColor">@color/sunset_selected_content_background</item>
 
-        <item name="appTextColorPrimary">@color/solarized_base1</item>
-        <item name="appTextColorSecondary">@color/solarized_base00</item>
-
-        <item name="textColorOverPrimary">@color/white</item>
+        <item name="drawerBackgroundColor">@color/sunset_background</item>
 
+        <item name="colorInProgress">@color/sunset_accent_light</item>
+        <item name="colorFinished">@color/sunset_accent_dark</item>
         <!--<item name="separatorColor">@color/dark_separator</item>-->
     </style>