From ec59370dd453c2438d194610dbba2b1435ba35f8 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 22 Jun 2015 18:16:31 -0700
Subject: Theme update

---
 .../main/res/layout/abstract_fragment_activity.xml |  27 +++---
 app/src/main/res/layout/actionbar_spinner.xml      |  21 +++--
 app/src/main/res/layout/album_list_header.xml      |   5 +-
 app/src/main/res/layout/album_list_item.xml        |   6 +-
 app/src/main/res/layout/basic_choice_item.xml      |   3 +-
 app/src/main/res/layout/basic_count_item.xml       |   4 +-
 app/src/main/res/layout/basic_header.xml           |   2 +-
 app/src/main/res/layout/basic_list_item.xml        |   3 +-
 app/src/main/res/layout/change_email.xml           |   3 +-
 app/src/main/res/layout/change_password.xml        |   3 +-
 app/src/main/res/layout/chat_item.xml              |  11 ++-
 app/src/main/res/layout/chat_item_reverse.xml      |  11 ++-
 app/src/main/res/layout/complex_list_item.xml      |  14 +--
 app/src/main/res/layout/confirm_password.xml       |   3 +-
 app/src/main/res/layout/create_bookmark.xml        |   3 +-
 app/src/main/res/layout/create_podcast.xml         |   3 +-
 app/src/main/res/layout/create_user.xml            |   9 +-
 app/src/main/res/layout/download_playlist.xml      |   3 +-
 app/src/main/res/layout/edit_play_action.xml       |  15 ++-
 app/src/main/res/layout/equalizer_bar.xml          |  55 ++++++-----
 app/src/main/res/layout/genre_list_item.xml        |   9 +-
 app/src/main/res/layout/jukebox_volume.xml         |  46 ----------
 app/src/main/res/layout/lyrics.xml                 | 101 ++++++++++-----------
 app/src/main/res/layout/progress.xml               |  30 +++---
 app/src/main/res/layout/save_playlist.xml          |  25 ++---
 app/src/main/res/layout/search_buttons.xml         |  73 ---------------
 app/src/main/res/layout/seekbar_preference.xml     |   3 +-
 app/src/main/res/layout/select_album_header.xml    |  15 ++-
 app/src/main/res/layout/select_artist_header.xml   |   6 +-
 app/src/main/res/layout/settings_activity.xml      |  33 ++++---
 app/src/main/res/layout/shuffle_dialog.xml         |   9 +-
 app/src/main/res/layout/song_list_item.xml         |  29 +++---
 app/src/main/res/layout/start_timer.xml            |   3 +-
 app/src/main/res/layout/sync_dialog.xml            |   3 +-
 app/src/main/res/layout/tab_progress.xml           |   3 +-
 app/src/main/res/layout/update_playlist.xml        |   9 +-
 app/src/main/res/layout/update_share.xml           |   9 +-
 app/src/main/res/layout/user_header.xml            |   6 +-
 app/src/main/res/layout/user_list_item.xml         |   3 +-
 app/src/main/res/menu/select_album.xml             |   2 +-
 app/src/main/res/menu/select_album_list.xml        |   2 +-
 app/src/main/res/menu/select_song.xml              |   2 +-
 app/src/main/res/menu/select_song_offline.xml      |   2 +-
 app/src/main/res/menu/similar_artists.xml          |   2 +-
 app/src/main/res/values-v16/themes.xml             |  15 ---
 app/src/main/res/values/attrs.xml                  |   9 ++
 app/src/main/res/values/colors.xml                 |  15 ++-
 app/src/main/res/values/styles.xml                 |  32 -------
 app/src/main/res/values/themes.xml                 |  74 ++++++++-------
 49 files changed, 349 insertions(+), 425 deletions(-)
 delete mode 100644 app/src/main/res/layout/jukebox_volume.xml
 delete mode 100644 app/src/main/res/layout/search_buttons.xml
 delete mode 100644 app/src/main/res/values-v16/themes.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index 74a94111..bf8d9640 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -1,6 +1,7 @@
 <com.sothree.slidinguppanel.SlidingUpPanelLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:sothree="http://schemas.android.com/apk/res-auto"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/slide_up_panel"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -18,7 +19,9 @@
 			android:layout_height="?attr/actionBarSize"
 			android:layout_width="match_parent"
 			android:background="?attr/colorPrimary"
-			android:elevation="4dp"/>
+			android:elevation="4dp"
+			android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+			app:popupTheme="?attr/actionbarPopupStyle"/>
 
 		<include layout="@layout/abstract_fragment_container"/>
 	</FrameLayout>
@@ -39,7 +42,9 @@
 				android:layout_height="?attr/actionBarSize"
 				android:layout_width="match_parent"
 				android:elevation="4dp"
-				android:visibility="gone"/>
+				android:visibility="gone"
+				app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+				app:popupTheme="?attr/actionbarPopupStyle"/>
 
 			<LinearLayout
 				android:id="@+id/bottom_bar"
@@ -68,16 +73,14 @@
 						android:id="@+id/track_name"
 						android:layout_height="wrap_content"
 						android:layout_width="wrap_content"
-						android:textColor="?android:textColorPrimary"
 						android:singleLine="true"
-						android:textAppearance="?android:attr/textAppearanceSmall"
-						android:textSize="@dimen/BottomBar.Text.Major"
 						android:text="@string/main.title"
 						android:ellipsize="marquee"
 						android:marqueeRepeatLimit="marquee_forever"
 						android:scrollHorizontally="true"
 						android:focusable="true"
-						android:focusableInTouchMode="true">
+						android:focusableInTouchMode="true"
+						style="?attr/actionbarTitleStyle">
 
 						<requestFocus android:focusable="true"
 							android:focusableInTouchMode="true"
@@ -88,11 +91,9 @@
 						android:id="@+id/artist_name"
 						android:layout_height="wrap_content"
 						android:layout_width="wrap_content"
-						android:textColor="?android:textColorSecondary"
 						android:singleLine="true"
-						android:textAppearance="?android:attr/textAppearanceSmall"
-						android:textSize="@dimen/BottomBar.Text.Minor"
-						android:text="@string/main.artist"/>
+						android:text="@string/main.artist"
+						style="?attr/actionbarSubtitleStyle"/>
 				</LinearLayout>
 
 
@@ -104,21 +105,21 @@
 					<ImageButton
 						style="@style/PlaybackControl.Match"
 						android:id="@+id/download_previous"
-						android:src="?attr/media_button_backward"
+						android:src="?attr/actionbar_backward"
 						android:layout_width="0dp"
 						android:layout_weight="1"/>
 
 					<ImageButton
 						style="@style/PlaybackControl.Match"
 						android:id="@+id/download_start"
-						android:src="?attr/media_button_start"
+						android:src="?attr/actionbar_start"
 						android:layout_width="0dp"
 						android:layout_weight="1"/>
 
 					<ImageButton
 						style="@style/PlaybackControl.Match"
 						android:id="@+id/download_next"
-						android:src="?attr/media_button_forward"
+						android:src="?attr/actionbar_forward"
 						android:layout_width="0dp"
 						android:layout_weight="1"/>
 				</LinearLayout>
diff --git a/app/src/main/res/layout/actionbar_spinner.xml b/app/src/main/res/layout/actionbar_spinner.xml
index 22055901..4d9f95a4 100644
--- a/app/src/main/res/layout/actionbar_spinner.xml
+++ b/app/src/main/res/layout/actionbar_spinner.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="fill_horizontal" >
-    <Spinner 
-        android:id="@+id/spinner"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:prompt="@string/common.appname"
-    />
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:gravity="fill_horizontal" >
+
+	<Spinner
+		android:id="@+id/spinner"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:prompt="@string/common.appname"
+		android:background="@drawable/abc_spinner_mtrl_am_alpha"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/album_list_header.xml b/app/src/main/res/layout/album_list_header.xml
index 58af3353..e78d0ace 100644
--- a/app/src/main/res/layout/album_list_header.xml
+++ b/app/src/main/res/layout/album_list_header.xml
@@ -11,7 +11,7 @@
 		android:layout_height="wrap_content"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:background="@android:color/transparent"
-		android:textColor="@color/cyan"
+		android:textColor="?attr/colorAccent"
 		android:textStyle="bold"
 		android:paddingLeft="6dp"
 		android:paddingRight="6dp"
@@ -24,5 +24,6 @@
 		android:layout_height="wrap_content"
 		android:text="@string/main.albums_per_folder"
 		android:layout_marginRight="6dp"
-		android:layout_gravity="right"/>
+		android:layout_gravity="right"
+		android:textColor="?android:textColorPrimary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
index c43e52a8..150cbd8f 100644
--- a/app/src/main/res/layout/album_list_item.xml
+++ b/app/src/main/res/layout/album_list_item.xml
@@ -44,14 +44,16 @@
 			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:singleLine="true"
 			android:ellipsize="marquee"
-			android:paddingBottom="6dip"/>
+			android:paddingBottom="6dip"
+			android:textColor="?android:textColorPrimary"/>
 
 		<TextView
 			android:id="@+id/album_artist"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:singleLine="true"/>
+			android:singleLine="true"
+			android:textColor="?android:textColorSecondary"/>
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/layout/basic_choice_item.xml b/app/src/main/res/layout/basic_choice_item.xml
index 00a45be4..e2dc2204 100644
--- a/app/src/main/res/layout/basic_choice_item.xml
+++ b/app/src/main/res/layout/basic_choice_item.xml
@@ -14,7 +14,8 @@
 		android:gravity="left|center_vertical"
 		android:paddingLeft="6dip"
 		android:paddingRight="6dip"
-		android:background="@android:color/transparent"/>
+		android:background="@android:color/transparent"
+		android:textColor="?android:textColorPrimary"/>
 
 	<CheckBox
 		android:id="@+id/item_checkbox"
diff --git a/app/src/main/res/layout/basic_count_item.xml b/app/src/main/res/layout/basic_count_item.xml
index 7f71c5a6..ce1aa800 100644
--- a/app/src/main/res/layout/basic_count_item.xml
+++ b/app/src/main/res/layout/basic_count_item.xml
@@ -14,7 +14,8 @@
 		android:paddingLeft="6dip"
 		android:paddingRight="6dip"
 		android:background="@android:color/transparent"
-		android:text="Text"/>
+		android:text="Text"
+		android:textColor="?android:textColorPrimary"/>
 
 	<TextView
 		android:id="@+id/basic_count_count"
@@ -31,5 +32,6 @@
 		android:textSize="11sp"
 		android:gravity="right|center_vertical"
 		android:layout_gravity="center_vertical"
+		android:textColor="?android:textColorPrimary"
 		android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/basic_header.xml b/app/src/main/res/layout/basic_header.xml
index b5ae900a..b1f94b33 100644
--- a/app/src/main/res/layout/basic_header.xml
+++ b/app/src/main/res/layout/basic_header.xml
@@ -5,7 +5,7 @@
 	android:layout_height="wrap_content"
 	android:textAppearance="?android:attr/textAppearanceMedium"
 	android:background="@android:color/transparent"
-	android:textColor="@color/cyan"
+	android:textColor="?attr/colorAccent"
 	android:textStyle="bold"
 	android:paddingLeft="6dp"
 	android:paddingRight="6dp"
diff --git a/app/src/main/res/layout/basic_list_item.xml b/app/src/main/res/layout/basic_list_item.xml
index 88d8ca20..04fdfe06 100644
--- a/app/src/main/res/layout/basic_list_item.xml
+++ b/app/src/main/res/layout/basic_list_item.xml
@@ -15,7 +15,8 @@
 		android:paddingLeft="6dip"
 		android:paddingRight="6dip"
 		android:minHeight="50dip"
-		android:background="@android:color/transparent"/>
+		android:background="@android:color/transparent"
+		android:textColor="?android:textColorPrimary"/>
 
 	<ImageButton
 		android:id="@+id/item_star"
diff --git a/app/src/main/res/layout/change_email.xml b/app/src/main/res/layout/change_email.xml
index 18ffc765..87d297be 100644
--- a/app/src/main/res/layout/change_email.xml
+++ b/app/src/main/res/layout/change_email.xml
@@ -15,7 +15,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/admin.change_email_label" />
+			android:text="@string/admin.change_email_label"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/new_email"
 			android:inputType="textEmailAddress"
diff --git a/app/src/main/res/layout/change_password.xml b/app/src/main/res/layout/change_password.xml
index 1a382a6b..d8043c05 100644
--- a/app/src/main/res/layout/change_password.xml
+++ b/app/src/main/res/layout/change_password.xml
@@ -15,7 +15,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/admin.change_password_label" />
+			android:text="@string/admin.change_password_label"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/new_password"
 			android:inputType="textPassword"
diff --git a/app/src/main/res/layout/chat_item.xml b/app/src/main/res/layout/chat_item.xml
index f31f7988..bf5d81ca 100644
--- a/app/src/main/res/layout/chat_item.xml
+++ b/app/src/main/res/layout/chat_item.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
 	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground">
 
 	<github.daneren2005.dsub.view.RecyclingImageView
 		android:id="@+id/chat_avatar"
@@ -34,7 +35,7 @@
 				android:singleLine="true"
 				android:text="User"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textColor="?android:textColorSecondary"/>
+				android:textColor="?android:textColorPrimary"/>
 
 			<TextView
 				android:id="@+id/chat_time"
@@ -43,7 +44,8 @@
 				android:layout_marginLeft="6dip"
 				android:singleLine="true"
 				android:text="00:00"
-				android:textAppearance="?android:attr/textAppearanceSmall" />
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:textColor="?android:textColorSecondary"/>
 		</LinearLayout>
 
 		<TextView
@@ -56,6 +58,7 @@
 			android:linksClickable="true"
 			android:singleLine="false"
 			android:text="Message Text Goes Here"
-			android:textAppearance="?android:attr/textAppearanceMedium" />
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:textColor="?android:textColorSecondary"/>
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_item_reverse.xml b/app/src/main/res/layout/chat_item_reverse.xml
index b8102193..31875208 100644
--- a/app/src/main/res/layout/chat_item_reverse.xml
+++ b/app/src/main/res/layout/chat_item_reverse.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
 	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground">
 
 	<LinearLayout
 		android:layout_width="0dip"
@@ -24,7 +25,8 @@
 				android:layout_marginRight="6dip"
 				android:singleLine="true"
 				android:text="00:00"
-				android:textAppearance="?android:attr/textAppearanceSmall" />
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:textColor="?android:textColorSecondary"/>
 
 			<TextView
 				android:id="@+id/chat_username"
@@ -35,7 +37,7 @@
 				android:singleLine="true"
 				android:text="User"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textColor="?android:textColorSecondary"/>
+				android:textColor="?android:textColorPrimary"/>
 		</LinearLayout>
 
 		<TextView
@@ -49,7 +51,8 @@
 			android:singleLine="false"
 			android:text="Chat message"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:layout_gravity="right"/>
+			android:layout_gravity="right"
+			android:textColor="?android:textColorSecondary"/>
 	</LinearLayout>
 
 	<github.daneren2005.dsub.view.RecyclingImageView
diff --git a/app/src/main/res/layout/complex_list_item.xml b/app/src/main/res/layout/complex_list_item.xml
index 67851eca..2aec9451 100644
--- a/app/src/main/res/layout/complex_list_item.xml
+++ b/app/src/main/res/layout/complex_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
-			  android:layout_width="fill_parent"
-			  android:layout_height="?android:attr/listPreferredItemHeight"
-			  android:background="@android:color/transparent">
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="?android:attr/listPreferredItemHeight"
+	android:background="?attr/selectableItemBackground">
 
 	<LinearLayout android:orientation="vertical"
 		android:layout_width="0dip"
@@ -19,14 +19,16 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:background="@android:color/transparent"/>
+			android:background="@android:color/transparent"
+			android:textColor="?android:textColorPrimary"/>
 
 		<TextView
 			android:id="@+id/item_description"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:background="@android:color/transparent"/>
+			android:background="@android:color/transparent"
+			android:textColor="?android:textColorSecondary"/>
 	</LinearLayout>
 
 	<ImageButton
diff --git a/app/src/main/res/layout/confirm_password.xml b/app/src/main/res/layout/confirm_password.xml
index 27ee04ea..9ec61c0a 100644
--- a/app/src/main/res/layout/confirm_password.xml
+++ b/app/src/main/res/layout/confirm_password.xml
@@ -15,7 +15,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/admin.add_user_password" />
+			android:text="@string/admin.add_user_password"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/password"
 			android:inputType="textPassword"
diff --git a/app/src/main/res/layout/create_bookmark.xml b/app/src/main/res/layout/create_bookmark.xml
index f72b39d8..d6f077c3 100644
--- a/app/src/main/res/layout/create_bookmark.xml
+++ b/app/src/main/res/layout/create_bookmark.xml
@@ -14,7 +14,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/common.comment" />
+			android:text="@string/common.comment"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/comment_text"
 			android:inputType="text"
diff --git a/app/src/main/res/layout/create_podcast.xml b/app/src/main/res/layout/create_podcast.xml
index 5a2ec970..04e74ec3 100644
--- a/app/src/main/res/layout/create_podcast.xml
+++ b/app/src/main/res/layout/create_podcast.xml
@@ -14,7 +14,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/select_podcasts.add_url"/>
+			android:text="@string/select_podcasts.add_url"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/create_podcast_url"
 			android:inputType="textUri"
diff --git a/app/src/main/res/layout/create_user.xml b/app/src/main/res/layout/create_user.xml
index e2f6c4eb..b2d8f6e0 100644
--- a/app/src/main/res/layout/create_user.xml
+++ b/app/src/main/res/layout/create_user.xml
@@ -22,7 +22,8 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_marginLeft="4dp" />
+			android:layout_marginLeft="4dp"
+			android:textColor="?android:textColorPrimary"/>
 	</LinearLayout>
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -43,7 +44,8 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_marginLeft="4dp" />
+			android:layout_marginLeft="4dp"
+			android:textColor="?android:textColorPrimary"/>
 	</LinearLayout>
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -64,7 +66,8 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_marginLeft="4dp" />
+			android:layout_marginLeft="4dp"
+			android:textColor="?android:textColorPrimary"/>
 	</LinearLayout>
 
 	<android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml
index afb46081..b37b6469 100644
--- a/app/src/main/res/layout/download_playlist.xml
+++ b/app/src/main/res/layout/download_playlist.xml
@@ -16,7 +16,8 @@
         android:text="@string/download.empty"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="10dip"/>
+        android:padding="10dip"
+        android:textColor="?android:textColorPrimary"/>
 
     <android.support.v7.widget.RecyclerView
 		android:id="@+id/download_list"
diff --git a/app/src/main/res/layout/edit_play_action.xml b/app/src/main/res/layout/edit_play_action.xml
index a1115da6..95a3d7ff 100644
--- a/app/src/main/res/layout/edit_play_action.xml
+++ b/app/src/main/res/layout/edit_play_action.xml
@@ -14,7 +14,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/tasker.edit_shuffle_mode" />
+			android:text="@string/tasker.edit_shuffle_mode"
+			android:textColor="?android:textColorPrimary"/>
 		<CheckBox
 			android:id="@+id/edit_shuffle_checkbox"
 			android:layout_width="wrap_content"
@@ -33,7 +34,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/tasker.edit_shuffle_start_year" />
+			android:text="@string/tasker.edit_shuffle_start_year"
+			android:textColor="?android:textColorPrimary"/>
 
 		<CheckBox
 			android:id="@+id/edit_start_year_checkbox"
@@ -61,7 +63,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/tasker.edit_shuffle_end_year" />
+			android:text="@string/tasker.edit_shuffle_end_year"
+			android:textColor="?android:textColorPrimary"/>
 
 		<CheckBox
 			android:id="@+id/edit_end_year_checkbox"
@@ -89,7 +92,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/tasker.edit_shuffle_genre"/>
+			android:text="@string/tasker.edit_shuffle_genre"
+			android:textColor="?android:textColorPrimary"/>
 
 		<Button
 			android:id="@+id/edit_genre_spinner"
@@ -109,7 +113,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/tasker.edit_server_offline"/>
+			android:text="@string/tasker.edit_server_offline"
+			android:textColor="?android:textColorPrimary"/>
 
 		<Spinner
 			android:id="@+id/edit_offline_spinner"
diff --git a/app/src/main/res/layout/equalizer_bar.xml b/app/src/main/res/layout/equalizer_bar.xml
index 6dc91565..9e3fab5c 100644
--- a/app/src/main/res/layout/equalizer_bar.xml
+++ b/app/src/main/res/layout/equalizer_bar.xml
@@ -1,36 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content">
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content">
 
-    <TextView
-            android:id="@+id/equalizer.frequency"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_alignParentLeft="true"
-            />
-
-    <TextView
-            android:id="@+id/equalizer.level"
-            android:text="0 dB"
-            android:textSize="12sp"
-            android:gravity="right"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_alignParentRight="true"
-            android:layout_toRightOf="@+id/equalizer.frequency"
-            />
-
-    <SeekBar
-            android:id="@+id/equalizer.bar"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/equalizer.frequency"
-            />
+	<TextView
+		android:id="@+id/equalizer.frequency"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:layout_alignParentLeft="true"
+		android:textColor="?android:textColorPrimary"/>
 
+	<TextView
+		android:id="@+id/equalizer.level"
+		android:text="0 dB"
+		android:textSize="12sp"
+		android:gravity="right"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:layout_alignParentRight="true"
+		android:layout_toRightOf="@+id/equalizer.frequency"
+		android:textColor="?android:textColorSecondary"/>
 
+	<SeekBar
+		android:id="@+id/equalizer.bar"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/equalizer.frequency"/>
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/genre_list_item.xml b/app/src/main/res/layout/genre_list_item.xml
index a6a34c52..fb30e167 100644
--- a/app/src/main/res/layout/genre_list_item.xml
+++ b/app/src/main/res/layout/genre_list_item.xml
@@ -17,7 +17,8 @@
 		android:minHeight="50dip"
 		android:singleLine="true"
 		android:ellipsize="marquee"
-		android:background="@android:color/transparent"/>
+		android:background="@android:color/transparent"
+		android:textColor="?android:textColorPrimary"/>
 
 	<LinearLayout
 		android:layout_width="wrap_content"
@@ -31,12 +32,14 @@
 			android:id="@+id/genre_songs"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"/>
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:textColor="?android:textColorSecondary"/>
 
 		<TextView
 			android:id="@+id/genre_albums"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"/>
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:textColor="?android:textColorSecondary"/>
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/jukebox_volume.xml b/app/src/main/res/layout/jukebox_volume.xml
deleted file mode 100644
index 0c49f634..00000000
--- a/app/src/main/res/layout/jukebox_volume.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout
-		android:background="@drawable/toast_frame"
-		android:padding="20dip"
-		android:layout_height="fill_parent"
-		android:layout_width="fill_parent"
-		android:orientation="vertical"
-		android:id="@+id/toast_layout_root"
-		xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<TextView
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:id="@+id/jukebox_volume_title"
-		android:paddingBottom="12dp"
-		android:paddingRight="32dp"
-		android:paddingLeft="32dp"
-		android:shadowRadius="2.75"
-		android:shadowColor="#bb000000"
-		android:textColor="#ffffffff"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:text="@string/download.jukebox_volume"
-		android:gravity="center_horizontal"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentRight="true"
-		android:layout_alignParentLeft="true"/>
-
-	<ImageView
-		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"
-		android:id="@+id/jukebox_volume_image"
-		android:paddingRight="12dip"
-		android:layout_alignParentLeft="true"
-		android:layout_below="@+id/jukebox_volume_title"
-		android:src="@drawable/ic_action_volume_dark"/>
-
-	<SeekBar
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:id="@+id/jukebox_volume_progress_bar"
-		android:paddingBottom="3dp"
-		android:layout_alignParentRight="true"
-		android:layout_below="@+id/jukebox_volume_title"
-		android:layout_toRightOf="@+id/jukebox_volume_image"
-		android:indeterminate="false"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lyrics.xml b/app/src/main/res/layout/lyrics.xml
index 747727bd..f2aa7c7f 100644
--- a/app/src/main/res/layout/lyrics.xml
+++ b/app/src/main/res/layout/lyrics.xml
@@ -1,55 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent">
-
-    <include layout="@layout/tab_progress"/>
-
-    <ScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1.0">
-
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-            <TextView
-                    android:id="@+id/lyrics_artist"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:gravity="center_horizontal"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dip"
-                    android:paddingRight="10dip"
-                    android:paddingTop="10dip"
-                    android:paddingBottom="4dip"
-                    />
-
-            <TextView
-                    android:id="@+id/lyrics_title"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:gravity="center_horizontal"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dip"
-                    android:paddingRight="10dip"
-                    />
-
-            <TextView
-                    android:id="@+id/lyrics_text"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:gravity="center_horizontal"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dip"
-                    android:paddingRight="10dip"
-                    />
-
-        </LinearLayout>
-
-    </ScrollView>
-
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<include layout="@layout/tab_progress"/>
+
+	<ScrollView
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0">
+
+		<LinearLayout
+			android:orientation="vertical"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent">
+
+			<TextView
+				android:id="@+id/lyrics_artist"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:gravity="center_horizontal"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="10dip"
+				android:paddingRight="10dip"
+				android:paddingTop="10dip"
+				android:paddingBottom="4dip"
+				android:textColor="?android:textColorPrimary"/>
+
+			<TextView
+				android:id="@+id/lyrics_title"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:gravity="center_horizontal"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="10dip"
+				android:paddingRight="10dip"
+				android:paddingBottom="12dip"
+				android:textColor="?android:textColorPrimary"/>
+
+			<TextView
+				android:id="@+id/lyrics_text"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:gravity="center_horizontal"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="10dip"
+				android:paddingRight="10dip"
+				android:textColor="?android:textColorSecondary"/>
+		</LinearLayout>
+	</ScrollView>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/progress.xml b/app/src/main/res/layout/progress.xml
index a1904c11..8a299d63 100644
--- a/app/src/main/res/layout/progress.xml
+++ b/app/src/main/res/layout/progress.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_weight="1"
-              android:layout_width="0dip"
-              android:layout_height="fill_parent"
-              android:padding="10dp">
+	android:orientation="horizontal"
+	android:layout_weight="1"
+	android:layout_width="0dip"
+	android:layout_height="fill_parent"
+	android:padding="10dp">
 
-    <ProgressBar
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_marginRight="10dp"/>
-
-    <TextView
-            android:id="@+id/progress_message"
-            android:text="@string/progress.wait"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"/>
+	<ProgressBar
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_marginRight="10dp"/>
 
+	<TextView
+		android:id="@+id/progress_message"
+		android:text="@string/progress.wait"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:textColor="?android:textColorPrimary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/save_playlist.xml b/app/src/main/res/layout/save_playlist.xml
index 8bb21748..9a85d24c 100644
--- a/app/src/main/res/layout/save_playlist.xml
+++ b/app/src/main/res/layout/save_playlist.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/save_playlist_root"
-              android:padding="10dip"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent">
+	android:id="@+id/save_playlist_root"
+	android:padding="10dip"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
 
-    <EditText
-            android:id="@+id/save_playlist_name"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:inputType="text"
-            android:singleLine="true"/>
+	<EditText
+			android:id="@+id/save_playlist_name"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:inputType="text"
+			android:singleLine="true"/>
 
 	<CheckBox
 			android:id="@+id/save_playlist_overwrite"
@@ -20,7 +20,8 @@
 			android:text="@string/playlist.overwrite"
 			android:layout_marginLeft="4dp"
 			android:checked="false"
-			android:visibility="gone"/>
+			android:visibility="gone"
+			android:textColor="?android:textColorPrimary"/>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/search_buttons.xml b/app/src/main/res/layout/search_buttons.xml
deleted file mode 100644
index 699ad341..00000000
--- a/app/src/main/res/layout/search_buttons.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content">
-
-    <TextView
-            android:id="@+id/search_artists"
-            android:text="@string/search.artists"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#EFEFEF"
-            android:textStyle="bold"
-            android:background="#A5A5A5"
-            android:gravity="center_vertical"
-            android:paddingLeft="4dp"/>
-
-    <TextView
-            android:id="@+id/search_albums"
-            android:text="@string/search.albums"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#EFEFEF"
-            android:textStyle="bold"
-            android:background="#A5A5A5"
-            android:gravity="center_vertical"
-            android:paddingLeft="4dp"/>
-
-    <TextView
-            android:id="@+id/search_songs"
-            android:text="@string/search.songs"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#EFEFEF"
-            android:textStyle="bold"
-            android:background="#A5A5A5"
-            android:gravity="center_vertical"
-            android:paddingLeft="4dp"/>
-
-    <TextView
-            android:id="@+id/search_more_artists"
-            android:text="@string/search.more"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:gravity="center"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"/>
-
-    <TextView
-            android:id="@+id/search_more_albums"
-            android:text="@string/search.more"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:gravity="center"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"/>
-
-    <TextView
-            android:id="@+id/search_more_songs"
-            android:text="@string/search.more"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:gravity="center"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/seekbar_preference.xml b/app/src/main/res/layout/seekbar_preference.xml
index 030b608b..74dad4cd 100644
--- a/app/src/main/res/layout/seekbar_preference.xml
+++ b/app/src/main/res/layout/seekbar_preference.xml
@@ -9,7 +9,8 @@
 		android:padding="5dip"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:gravity="right" />
+		android:gravity="right"
+		android:textColor="?android:textColorPrimary"/>
 	<SeekBar
 		android:id="@+id/seek_bar"
 		android:padding="15dip"
diff --git a/app/src/main/res/layout/select_album_header.xml b/app/src/main/res/layout/select_album_header.xml
index e3a09443..6d5795e6 100644
--- a/app/src/main/res/layout/select_album_header.xml
+++ b/app/src/main/res/layout/select_album_header.xml
@@ -30,7 +30,8 @@
 				android:marqueeRepeatLimit="marquee_forever"
 				android:scrollHorizontally="true"
 				android:focusable="true"
-				android:focusableInTouchMode="true">
+				android:focusableInTouchMode="true"
+				android:textColor="?android:textColorPrimary">
 
 				<requestFocus android:focusable="true"
 					android:focusableInTouchMode="true"
@@ -44,7 +45,8 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				android:singleLine="true"
-				android:ellipsize="end"/>
+				android:ellipsize="end"
+				android:textColor="?android:textColorPrimary"/>
 
 			<TextView
 				android:text="XX SONGS"
@@ -54,7 +56,8 @@
 				android:paddingTop="14dip"
 				android:textAppearance="?android:attr/textAppearanceSmall"
 				android:singleLine="true"
-				android:ellipsize="none"/>
+				android:ellipsize="none"
+				android:textColor="?android:textColorSecondary"/>
 
 			<TextView
 				android:text="0:00"
@@ -63,7 +66,8 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="?android:attr/textAppearanceSmall"
 				android:singleLine="true"
-				android:ellipsize="none"/>
+				android:ellipsize="none"
+				android:textColor="?android:textColorSecondary"/>
 
 		</LinearLayout>
 
@@ -145,7 +149,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_horizontal"
-				android:textAppearance="?android:attr/textAppearanceMedium"/>
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:textColor="?android:textColorPrimary"/>
 		</LinearLayout>
 	</FrameLayout>
 
diff --git a/app/src/main/res/layout/select_artist_header.xml b/app/src/main/res/layout/select_artist_header.xml
index 168120d9..47e42694 100644
--- a/app/src/main/res/layout/select_artist_header.xml
+++ b/app/src/main/res/layout/select_artist_header.xml
@@ -32,13 +32,15 @@
 					  android:layout_height="wrap_content"
 					  android:layout_marginLeft="10dip"
 					  android:layout_marginTop="6dip"
-					  android:textAppearance="?android:attr/textAppearanceLarge"/>
+					  android:textAppearance="?android:attr/textAppearanceLarge"
+					  android:textColor="?attr/colorAccent"/>
 
 			<TextView android:id="@+id/select_artist_folder_2"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content"
 					  android:layout_marginLeft="10dip"
-					  android:textAppearance="?android:attr/textAppearanceSmall"/>
+					  android:textAppearance="?android:attr/textAppearanceSmall"
+					  android:textColor="?android:textColorSecondary"/>
 
 		</LinearLayout>
 	</LinearLayout>
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
index 89355cb7..c77528b2 100644
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -1,16 +1,21 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/main_toolbar"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_width="match_parent"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"/>
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/main_toolbar"
+		android:layout_height="?attr/actionBarSize"
+		android:layout_width="match_parent"
+		android:background="?attr/colorPrimary"
+		android:elevation="4dp"
+		app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+		app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-    <FrameLayout
-         android:id="@+id/fragment_container"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
+	<FrameLayout
+		android:id="@+id/fragment_container"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/shuffle_dialog.xml b/app/src/main/res/layout/shuffle_dialog.xml
index 295f57cb..63778ed7 100644
--- a/app/src/main/res/layout/shuffle_dialog.xml
+++ b/app/src/main/res/layout/shuffle_dialog.xml
@@ -14,7 +14,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/shuffle.startYear" />
+			android:text="@string/shuffle.startYear"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/start_year"
 			android:inputType="number"
@@ -36,7 +37,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/shuffle.endYear" />
+			android:text="@string/shuffle.endYear"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/end_year"
 			android:inputType="number"
@@ -66,7 +68,8 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:layout_marginLeft="4dp"
-			android:hint="@string/shuffle.genre"/>
+			android:hint="@string/shuffle.genre"
+			android:textColor="?android:textColorPrimary"/>
 
 		<Button
 			android:id="@+id/genre_combo"
diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml
index 9be27192..419f9524 100644
--- a/app/src/main/res/layout/song_list_item.xml
+++ b/app/src/main/res/layout/song_list_item.xml
@@ -26,17 +26,18 @@
                       android:layout_gravity="center_vertical">
 
             <TextView
-                    android:id="@+id/song_title"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_gravity="left|center_vertical"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:singleLine="true"
-                    android:ellipsize="marquee"
-                    android:drawablePadding="6dip"
-                    android:paddingLeft="6dip"
-                    android:paddingRight="6dip"/>
+				android:id="@+id/song_title"
+				android:layout_width="0dip"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:layout_gravity="left|center_vertical"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:singleLine="true"
+				android:ellipsize="marquee"
+				android:drawablePadding="6dip"
+				android:paddingLeft="6dip"
+				android:paddingRight="6dip"
+				android:textColor="?android:textColorPrimary"/>
 
 			<ImageButton
 				android:id="@+id/song_bookmark"
@@ -92,7 +93,8 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:singleLine="true"
                     android:ellipsize="middle"
-                    android:paddingLeft="6dip"/>
+                    android:paddingLeft="6dip"
+					android:textColor="?android:textColorSecondary"/>
 
 			<RatingBar
 				android:id="@+id/song_rating"
@@ -112,7 +114,8 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:singleLine="true"
                     android:paddingLeft="3dip"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="4dip"
+					android:textColor="?android:textColorSecondary"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/start_timer.xml b/app/src/main/res/layout/start_timer.xml
index 9736a31d..59bd60e3 100644
--- a/app/src/main/res/layout/start_timer.xml
+++ b/app/src/main/res/layout/start_timer.xml
@@ -11,7 +11,8 @@
 		android:layout_marginLeft="8dp"
 		android:textSize="20dp"
 		android:paddingRight="10px"
-		android:layout_gravity="center"/>
+		android:layout_gravity="center"
+		android:textColor="?android:textColorPrimary"/>
 
 	<SeekBar
 		android:id="@+id/timer_length_bar"
diff --git a/app/src/main/res/layout/sync_dialog.xml b/app/src/main/res/layout/sync_dialog.xml
index 5133b753..fc657186 100644
--- a/app/src/main/res/layout/sync_dialog.xml
+++ b/app/src/main/res/layout/sync_dialog.xml
@@ -8,5 +8,6 @@
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
 		android:checked="false"
-		android:text="@string/offline.sync_dialog_default"/>
+		android:text="@string/offline.sync_dialog_default"
+        android:textColor="?android:textColorPrimary"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_progress.xml b/app/src/main/res/layout/tab_progress.xml
index f6d326ca..7423777f 100644
--- a/app/src/main/res/layout/tab_progress.xml
+++ b/app/src/main/res/layout/tab_progress.xml
@@ -26,6 +26,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:textAppearance="?android:attr/textAppearanceMedium"/>
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:textColor="?android:textColorPrimary"/>
 	</LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/update_playlist.xml b/app/src/main/res/layout/update_playlist.xml
index 7354ef5c..cc7e5ee6 100644
--- a/app/src/main/res/layout/update_playlist.xml
+++ b/app/src/main/res/layout/update_playlist.xml
@@ -22,7 +22,8 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:layout_marginLeft="4dp"
-			android:hint="@string/common.name" />
+			android:hint="@string/common.name"
+			android:textColor="?android:textColorPrimary"/>
 	</LinearLayout>
 		
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -36,7 +37,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/common.comment" />
+			android:text="@string/common.comment"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/get_playlist_comment"
 			android:inputType="text"
@@ -58,7 +60,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/common.public" />
+			android:text="@string/common.public"
+			android:textColor="?android:textColorPrimary"/>
 		<CheckBox
 			android:id="@+id/get_playlist_public"
 			android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/update_share.xml b/app/src/main/res/layout/update_share.xml
index 92b7137b..ef44e304 100644
--- a/app/src/main/res/layout/update_share.xml
+++ b/app/src/main/res/layout/update_share.xml
@@ -14,7 +14,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/common.name" />
+			android:text="@string/common.name"
+			android:textColor="?android:textColorPrimary"/>
 		<EditText
 			android:id="@+id/get_share_name"
 			android:inputType="text"
@@ -36,7 +37,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/share.expiration" />
+			android:text="@string/share.expiration"
+			android:textColor="?android:textColorPrimary"/>
 		<DatePicker
 			android:id="@+id/get_share_expire"
 			android:layout_width="fill_parent"
@@ -57,7 +59,8 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
 			android:textSize="20dp"
-			android:text="@string/share.no_expiration" />
+			android:text="@string/share.no_expiration"
+			android:textColor="?android:textColorPrimary"/>
 		<CheckBox
 			android:id="@+id/get_share_no_expire"
 			android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/user_header.xml b/app/src/main/res/layout/user_header.xml
index a9ff4bee..04f5285d 100644
--- a/app/src/main/res/layout/user_header.xml
+++ b/app/src/main/res/layout/user_header.xml
@@ -34,7 +34,8 @@
 			android:marqueeRepeatLimit="marquee_forever"
 			android:scrollHorizontally="true"
 			android:focusable="true"
-			android:focusableInTouchMode="true">
+			android:focusableInTouchMode="true"
+			android:textColor="?android:textColorPrimary">
 
 			<requestFocus android:focusable="true"
 				android:focusableInTouchMode="true"
@@ -49,7 +50,8 @@
 			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:singleLine="true"
 			android:ellipsize="end"
-			android:autoLink="email"/>
+			android:autoLink="email"
+			android:textColor="?android:textColorSecondary"/>
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/layout/user_list_item.xml b/app/src/main/res/layout/user_list_item.xml
index aa2d13c9..aa198578 100644
--- a/app/src/main/res/layout/user_list_item.xml
+++ b/app/src/main/res/layout/user_list_item.xml
@@ -22,7 +22,8 @@
 		android:paddingLeft="12dip"
 		android:paddingRight="6dip"
 		android:minHeight="50dip"
-		android:background="@android:color/transparent"/>
+		android:background="@android:color/transparent"
+		android:textColor="?android:textColorPrimary"/>
 
 	<ImageButton
 		android:id="@+id/item_star"
diff --git a/app/src/main/res/menu/select_album.xml b/app/src/main/res/menu/select_album.xml
index 3d2228e8..c94a4a3f 100644
--- a/app/src/main/res/menu/select_album.xml
+++ b/app/src/main/res/menu/select_album.xml
@@ -3,7 +3,7 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
-		android:icon="?media_button_start"
+		android:icon="?actionbar_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 
diff --git a/app/src/main/res/menu/select_album_list.xml b/app/src/main/res/menu/select_album_list.xml
index a9196d1c..17148a51 100644
--- a/app/src/main/res/menu/select_album_list.xml
+++ b/app/src/main/res/menu/select_album_list.xml
@@ -3,7 +3,7 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
-		android:icon="?media_button_start"
+		android:icon="?actionbar_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 		
diff --git a/app/src/main/res/menu/select_song.xml b/app/src/main/res/menu/select_song.xml
index fc4494cb..d47ad933 100644
--- a/app/src/main/res/menu/select_song.xml
+++ b/app/src/main/res/menu/select_song.xml
@@ -3,7 +3,7 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
-		android:icon="?attr/media_button_start"
+		android:icon="?attr/actionbar_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 		
diff --git a/app/src/main/res/menu/select_song_offline.xml b/app/src/main/res/menu/select_song_offline.xml
index c45405fb..7a4a5407 100644
--- a/app/src/main/res/menu/select_song_offline.xml
+++ b/app/src/main/res/menu/select_song_offline.xml
@@ -3,7 +3,7 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
-		android:icon="?attr/media_button_start"
+		android:icon="?attr/actionbar_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 		
diff --git a/app/src/main/res/menu/similar_artists.xml b/app/src/main/res/menu/similar_artists.xml
index 771555b6..f6c30fb2 100644
--- a/app/src/main/res/menu/similar_artists.xml
+++ b/app/src/main/res/menu/similar_artists.xml
@@ -4,7 +4,7 @@
 
 	<item
 		android:id="@+id/menu_play_now"
-		android:icon="?media_button_start"
+		android:icon="?actionbar_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 
diff --git a/app/src/main/res/values-v16/themes.xml b/app/src/main/res/values-v16/themes.xml
deleted file mode 100644
index a14b6a1b..00000000
--- a/app/src/main/res/values-v16/themes.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
-		<item name="android:fontFamily">sans-serif</item>
-	</style>
-
-	<style name="DSub.TextViewStyle.Bold" parent="android:Widget.TextView">
-		<item name="android:fontFamily">sans-serif</item>
-		<item name="android:textStyle">bold</item>
-	</style>
-
-	<style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button">
-		<item name="android:fontFamily">sans-serif-light</item>
-	</style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3db670e6..2d2ebd7d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,10 +7,16 @@
     <attr name="media_button_repeat_off" format="reference"/>
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
+	<attr name="actionbar_backward" format="reference"/>
+	<attr name="actionbar_forward" format="reference"/>
+	<attr name="actionbar_pause" format="reference"/>
+	<attr name="actionbar_start" format="reference"/>
+	<attr name="actionbar_stop" format="reference"/>
 	<attr name="chat_send" format="reference"/>
 	<attr name="add" format="reference"/>
 	<attr name="download_none" format="reference"/>
 	<attr name="shuffle" format="reference"/>
+	<attr name="shuffle_button" format="reference"/>
 	<attr name="refresh" format="reference"/>
 	<attr name="search" format="reference"/>
 	<attr name="remove" format="reference"/>
@@ -37,6 +43,9 @@
 	<attr name="drawerAdmin" format="reference"/>
 	<attr name="drawerDownloading" format="reference"/>
 	<attr name="drawerSettings" format="reference"/>
+	<attr name="actionbarTitleStyle" format="reference"/>
+	<attr name="actionbarSubtitleStyle" format="reference"/>
+	<attr name="actionbarPopupStyle" format="reference"/>
 
 	<declare-styleable name="SeekBarPreference">
 		<attr name="min" format="integer"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b1422ad6..d3f9bcb2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="lightBackground">#F1F0E6</color>
     <color name="dividerColor">#FF33B5E5</color>
     <color name="appwidget_text">#FFFFFF</color>
     <color name="notificationArtist">#434343</color>
     <color name="notificationTitle">#000000</color>
-	<color name="background_holo_light">#ff33b5e5</color>
 	<color name="overlayColor">#80000000</color>
-	<color name="ics_opaque">#8033b5e5</color>
 	<color name="cyan">#ff0099cc</color>
 
 	<color name="holo_blue_light">#ff33b5e5</color>
 	<color name="holo_orange_light">#ffffbb33</color>
 	<color name="holo_green_light">#ff99cc00</color>
 	<color name="holo_red_light">#ffff4444</color>
+
+	<color name="lightPrimary">#2196f3</color>
+	<color name="lightPrimaryDark">#1e88e5</color>
+	<color name="lightAccent">#448aff</color>
+
+	<color name="darkPrimary">#f44336</color>
+	<color name="darkPrimaryDark">#e53935</color>
+	<color name="darkAccent">#ff5252</color>
+
+	<color name="holoPrimary">#009688</color>
+	<color name="holoPrimaryDark">#00897b</color>
+	<color name="holoAccent">#64ffda</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cfe446f3..83fa4a42 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -29,15 +29,6 @@
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_width">wrap_content</item>
 	</style>
-	
-	<style name="MenuBarButton" parent="@style/BasicButton">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">45dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
-		<item name="android:textColor">?android:textColorPrimary</item>
-    </style>
 
 	<style name="DownloadActionButton" parent="@style/BasicButton">
 		<item name="android:layout_width">wrap_content</item>
@@ -58,27 +49,4 @@
 		<item name="android:paddingRight">16dip</item>
 		<item name="android:paddingLeft">16dip</item>
 	</style>
-
-	<style name="MainAlbumButton">
-		<item name="android:drawablePadding">6dip</item>
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:paddingLeft">6dip</item>
-		<item name="android:paddingRight">6dip</item>
-		<item name="android:minHeight">46dip</item>
-	</style>
-
-	<style name="MainAlbumButtonLabel">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-		<item name="android:textColor">@color/cyan</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:paddingLeft">6dp</item>
-		<item name="android:textAllCaps">true</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">16sp</item>
-	</style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ecba7592..fb47af81 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light">
+	<style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
 		<item name="offline_icon">@drawable/main_offline_light</item>
 		<item name="media_button_backward">@drawable/media_backward_light</item>
 		<item name="media_button_forward">@drawable/media_forward_light</item>
@@ -8,25 +8,31 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
 		<item name="media_button_start">@drawable/media_start_light</item>
 		<item name="media_button_stop">@drawable/media_stop_light</item>
+		<item name="actionbar_backward">@drawable/media_backward_dark</item>
+		<item name="actionbar_forward">@drawable/media_forward_dark</item>
+		<item name="actionbar_pause">@drawable/media_pause_dark</item>
+		<item name="actionbar_start">@drawable/media_start_dark</item>
+		<item name="actionbar_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_light</item>
-		<item name="add">@drawable/ic_action_add_light</item>
+		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_light</item>
-		<item name="shuffle">@drawable/ic_menu_shuffle_light</item>
-		<item name="refresh">@drawable/ic_menu_refresh_light</item>
-		<item name="search">@drawable/ic_menu_search_light</item>
-		<item name="remove">@drawable/ic_menu_remove_light</item>
-		<item name="save">@drawable/ic_menu_save_light</item>
+		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
+		<item name="shuffle_button">@drawable/ic_menu_shuffle_light</item>
+		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
+		<item name="search">@drawable/ic_menu_search_dark</item>
+		<item name="remove">@drawable/ic_menu_remove_dark</item>
+		<item name="save">@drawable/ic_menu_save_dark</item>
 		<item name="volume">@drawable/ic_action_volume_light</item>
 		<item name="toggle_list">@drawable/action_toggle_list_light</item>
 		<item name="select_server">@drawable/main_select_server_light</item>
 		<item name="downloading">@drawable/downloading_light</item>
 		<item name="bookmark">@drawable/ic_menu_bookmark_light</item>
 		<item name="share">@drawable/ic_menu_share_light</item>
-		<item name="add_person">@drawable/ic_menu_add_person_light</item>
-		<item name="password">@drawable/ic_menu_password_light</item>
+		<item name="add_person">@drawable/ic_menu_add_person_dark</item>
+		<item name="password">@drawable/ic_menu_password_dark</item>
 		<item name="rating_bad">@drawable/ic_action_rating_bad_light</item>
 		<item name="rating_good">@drawable/ic_action_rating_good_light</item>
-		<item name="radio">@drawable/ic_menu_radio_light</item>
+		<item name="radio">@drawable/ic_menu_radio_dark</item>
 		<item name="drawerHome">@drawable/main_offline_light</item>
 		<item name="drawerLibrary">@drawable/ic_menu_library_light</item>
 		<item name="drawerPlaylists">@drawable/ic_menu_playlist_light</item>
@@ -37,12 +43,14 @@
 		<item name="drawerAdmin">@drawable/ic_menu_admin_light</item>
 		<item name="drawerDownloading">@drawable/ic_menu_download_light</item>
 		<item name="drawerSettings">@drawable/ic_menu_settings_light</item>
-		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
 		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
-		<item name="colorPrimary">@color/cyan</item>
-		<item name="colorPrimaryDark">@color/cyan</item>
-		<item name="colorAccent">@color/cyan</item>
+		<item name="colorPrimary">@color/lightPrimary</item>
+		<item name="colorPrimaryDark">@color/lightPrimaryDark</item>
+		<item name="colorAccent">@color/lightAccent</item>
+		<item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item>
+		<item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item>
+		<item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Light</item>
+		<item name="android:spinnerItemStyle">@style/DarkSpinnerItem</item>
 	</style>
 	<style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat">
 		<item name="offline_icon">@drawable/main_offline_dark</item>
@@ -52,10 +60,16 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
 		<item name="media_button_start">@drawable/media_start_dark</item>
 		<item name="media_button_stop">@drawable/media_stop_dark</item>
+		<item name="actionbar_backward">@drawable/media_backward_dark</item>
+		<item name="actionbar_forward">@drawable/media_forward_dark</item>
+		<item name="actionbar_pause">@drawable/media_pause_dark</item>
+		<item name="actionbar_start">@drawable/media_start_dark</item>
+		<item name="actionbar_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
 		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_dark</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
+		<item name="shuffle_button">@drawable/ic_menu_shuffle_dark</item>
 		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
 		<item name="search">@drawable/ic_menu_search_dark</item>
 		<item name="remove">@drawable/ic_menu_remove_dark</item>
@@ -81,12 +95,13 @@
 		<item name="drawerAdmin">@drawable/ic_menu_admin_dark</item>
 		<item name="drawerDownloading">@drawable/ic_menu_download_dark</item>
 		<item name="drawerSettings">@drawable/ic_menu_settings_dark</item>
-		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
-		<item name="colorPrimary">@color/cyan</item>
-		<item name="colorPrimaryDark">@color/cyan</item>
-		<item name="colorAccent">@color/cyan</item>
+		<item name="colorPrimary">@color/darkPrimary</item>
+		<item name="colorPrimaryDark">@color/darkPrimaryDark</item>
+		<item name="colorAccent">@color/darkAccent</item>
+		<item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
+		<item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item>
+		<item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Dark</item>
 	</style>
 	<style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
 	</style>
@@ -97,6 +112,9 @@
 	</style>
 	<style name="Theme.DSub.Holo" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@drawable/background</item>
+		<item name="colorPrimary">@color/holoPrimary</item>
+		<item name="colorPrimaryDark">@color/holoPrimaryDark</item>
+		<item name="colorAccent">@color/holoAccent</item>
 	</style>
 
 	<style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light">
@@ -116,19 +134,11 @@
 		<item name="windowNoTitle">true</item>
 	</style>
 
-	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
-	</style>
-
-	<style name="DSub.TextViewStyle.Bold" parent="android:Widget.TextView">
-		<item name="android:textStyle">bold</item>
-	</style>
-
-	<style name="DSub.ButtonStyle.Dark" parent="android:Widget.Holo.Button">
-	</style>
-	<style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button">
-	</style>
-
 	<style name="DSub.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle">
 		<item name="spinBars">true</item>
 	</style>
+
+	<style name="DarkSpinnerItem" parent="Widget.AppCompat.TextView.SpinnerItem">
+		<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+	</style>
 </resources>
-- 
cgit v1.2.3