diff --git a/.classpath b/.classpath
index d992108..c354ffb 100644
--- a/.classpath
+++ b/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="dialog"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c6db40..72ed04f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
     <application
         android:allowTaskReparenting="true"
@@ -31,16 +31,15 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:process=":main"
-        android:taskAffinity="apollo.task.music"
-        android:theme="@style/ApolloTheme" >
+        android:taskAffinity="apollo.task.music" >
         <meta-data
             android:name="android.app.default_searchable"
-            android:value=".activities.QueryBrowserActivity" />
+            android:value=".ui.activities.QueryBrowserActivity" />
         <!-- Serach -->
         <activity
-            android:name=".activities.QueryBrowserActivity"
+            android:name="com.andrew.apolloMod.ui.activities.QueryBrowserActivity"
             android:exported="true"
-            android:theme="@style/ApolloTheme" >
+            android:theme="@style/ApolloTheme.Light" >
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <action android:name="android.intent.action.MEDIA_SEARCH" />
@@ -56,9 +55,10 @@
 
         <!-- Main Activity -->
         <activity
-            android:name=".activities.MusicLibrary"
+            android:name="com.andrew.apolloMod.ui.activities.MusicLibrary"
             android:label="@string/app_name"
-        	android:logo="@drawable/ic_logo"
+            android:logo="@drawable/ic_logo"
+            android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -76,7 +76,7 @@
         </activity>
         <!-- Now Playing -->
         <activity
-            android:name=".activities.AudioPlayerHolder"
+            android:name="com.andrew.apolloMod.ui.activities.AudioPlayerHolder"
             android:clearTaskOnLaunch="true"
             android:excludeFromRecents="true"
             android:label="@string/nowplaying"
@@ -97,13 +97,13 @@
         </activity>
         <!-- Play External File -->
         <activity
-            android:name=".activities.PlayExternal"
+            android:name="com.andrew.apolloMod.ui.activities.PlayExternal"
             android:clearTaskOnLaunch="true"
             android:excludeFromRecents="true"
-            android:noHistory="true"
+            android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.Light.Translucent"
-            android:label="@string/app_name" >
+            android:noHistory="true"
+            android:theme="@style/Light.Translucent" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -118,7 +118,7 @@
         </activity>
         <!-- Track browser -->
         <activity
-            android:name=".activities.TracksBrowser"
+            android:name="com.andrew.apolloMod.ui.activities.TracksBrowser"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
@@ -131,7 +131,7 @@
 
         <!-- Quickly show the queue -->
         <activity
-            android:name=".activities.QuickQueue"
+            android:name="com.andrew.apolloMod.ui.activities.QuickQueue"
             android:excludeFromRecents="true"
             android:launchMode="singleTop"
             android:noHistory="true"
@@ -139,19 +139,18 @@
             android:windowSoftInputMode="stateUnchanged" />
         <!-- Settings -->
         <activity
-            android:name=".preferences.SettingsHolder"
-        	android:logo="@drawable/ic_logo"
-            android:label="@string/settings" />
+            android:name="com.andrew.apolloMod.preferences.SettingsHolder"
+            android:label="@string/settings"
+            android:logo="@drawable/ic_logo" />
         <!-- Simple EQ -->
         <activity
-            android:name=".activities.SimpleEq"
+            android:name="com.andrew.apolloMod.ui.activities.SimpleEq"
             android:excludeFromRecents="true"
             android:label="@string/simple_eq_page_title"
-            android:windowSoftInputMode="adjustPan" 
-        	android:parentActivityName=".activities.MusicLibrary" />
-
+            android:parentActivityName=".activities.MusicLibrary"
+            android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".menu.PlaylistDialog"
+            android:name="com.andrew.apolloMod.ui.activities.dialogs.PlaylistDialog"
             android:label="@string/rename_playlist"
             android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" >
             <intent-filter>
@@ -166,7 +165,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.andrew.apolloMod.menu.PlaylistPicker"
+            android:name="com.andrew.apolloMod.ui.activities.dialogs.PlaylistPicker"
             android:icon="@drawable/ic_launcher"
             android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" >
             <intent-filter>
@@ -177,7 +176,7 @@
         </activity>
         <!-- 1x1 App Widget -->
         <receiver
-            android:name="com.andrew.apolloMod.app.widgets.AppWidget11"
+            android:name="com.andrew.apolloMod.appwidgets.AppWidget11"
             android:label="@string/apollo_1x1" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -189,7 +188,7 @@
         </receiver>
         <!-- 4x1 App Widget -->
         <receiver
-            android:name="com.andrew.apolloMod.app.widgets.AppWidget41"
+            android:name="com.andrew.apolloMod.appwidgets.AppWidget41"
             android:label="@string/apollo_4x1" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -201,7 +200,7 @@
         </receiver>
         <!-- 4x2 App Widget -->
         <receiver
-            android:name="com.andrew.apolloMod.app.widgets.AppWidget42"
+            android:name="com.andrew.apolloMod.appwidgets.AppWidget42"
             android:label="@string/apollo_4x2" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -223,6 +222,13 @@
             android:name="com.andrew.apolloMod.service.ApolloService"
             android:label="@string/app_name"
             android:process=":main" />
+
+        <provider
+            android:name="com.andrew.apolloMod.providers.HistoryStore"
+            android:authorities="com.andrew.apolloMod.recents"
+            android:enabled="true"
+            android:exported="true" >
+        </provider>
     </application>
 
 </manifest>
diff --git a/res/color/tab_text_color_dark.xml b/res/color/tab_text_color_dark.xml
new file mode 100644
index 0000000..7c6d8f9
--- /dev/null
+++ b/res/color/tab_text_color_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="@color/selected_tabtext_dark" />
+    <item android:color="@color/unselected_tabtext_dark" />
+</selector>
diff --git a/res/drawable-hdpi/btn_drag_sort_dark.png b/res/drawable-hdpi/btn_drag_sort_dark.png
new file mode 100644
index 0000000..b068ef2
Binary files /dev/null and b/res/drawable-hdpi/btn_drag_sort_dark.png differ
diff --git a/res/drawable-hdpi/btn_switch_queue_dark.png b/res/drawable-hdpi/btn_switch_queue_dark.png
new file mode 100644
index 0000000..15e6e47
Binary files /dev/null and b/res/drawable-hdpi/btn_switch_queue_dark.png differ
diff --git a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
new file mode 100644
index 0000000..ced7555
Binary files /dev/null and b/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png differ
diff --git a/res/drawable-hdpi/scrubber_track_holo_dark_dark.9.png b/res/drawable-hdpi/scrubber_track_holo_dark_dark.9.png
new file mode 100644
index 0000000..6f27cf9
Binary files /dev/null and b/res/drawable-hdpi/scrubber_track_holo_dark_dark.9.png differ
diff --git a/res/drawable-hdpi/transparent_black.9.png b/res/drawable-hdpi/transparent_black.9.png
new file mode 100644
index 0000000..90c0762
Binary files /dev/null and b/res/drawable-hdpi/transparent_black.9.png differ
diff --git a/res/drawable-hdpi/view_more_album.png b/res/drawable-hdpi/view_more_album.png
index 1b5ed67..113f5fe 100644
Binary files a/res/drawable-hdpi/view_more_album.png and b/res/drawable-hdpi/view_more_album.png differ
diff --git a/res/drawable-hdpi/view_more_now.png b/res/drawable-hdpi/view_more_now.png
new file mode 100644
index 0000000..8911a35
Binary files /dev/null and b/res/drawable-hdpi/view_more_now.png differ
diff --git a/res/drawable-hdpi/view_more_now_dark.png b/res/drawable-hdpi/view_more_now_dark.png
new file mode 100644
index 0000000..5b9911a
Binary files /dev/null and b/res/drawable-hdpi/view_more_now_dark.png differ
diff --git a/res/drawable-hdpi/view_more_song.png b/res/drawable-hdpi/view_more_song.png
index d383742..2a06a77 100644
Binary files a/res/drawable-hdpi/view_more_song.png and b/res/drawable-hdpi/view_more_song.png differ
diff --git a/res/drawable-mdpi/btn_drag_sort_dark.png b/res/drawable-mdpi/btn_drag_sort_dark.png
new file mode 100644
index 0000000..c96bc64
Binary files /dev/null and b/res/drawable-mdpi/btn_drag_sort_dark.png differ
diff --git a/res/drawable-mdpi/btn_switch_queue_dark.png b/res/drawable-mdpi/btn_switch_queue_dark.png
new file mode 100644
index 0000000..6ce7a86
Binary files /dev/null and b/res/drawable-mdpi/btn_switch_queue_dark.png differ
diff --git a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
new file mode 100644
index 0000000..99b0e6d
Binary files /dev/null and b/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png differ
diff --git a/res/drawable-mdpi/scrubber_track_holo_dark.9.png b/res/drawable-mdpi/scrubber_track_holo_dark.9.png
index fe7b881..874c4a5 100644
Binary files a/res/drawable-mdpi/scrubber_track_holo_dark.9.png and b/res/drawable-mdpi/scrubber_track_holo_dark.9.png differ
diff --git a/res/drawable-mdpi/scrubber_track_holo_dark_dark.9.png b/res/drawable-mdpi/scrubber_track_holo_dark_dark.9.png
new file mode 100644
index 0000000..adb8774
Binary files /dev/null and b/res/drawable-mdpi/scrubber_track_holo_dark_dark.9.png differ
diff --git a/res/drawable-mdpi/view_more_album.png b/res/drawable-mdpi/view_more_album.png
index a394a70..63d3e7f 100644
Binary files a/res/drawable-mdpi/view_more_album.png and b/res/drawable-mdpi/view_more_album.png differ
diff --git a/res/drawable-mdpi/view_more_now.png b/res/drawable-mdpi/view_more_now.png
new file mode 100644
index 0000000..df50dc2
Binary files /dev/null and b/res/drawable-mdpi/view_more_now.png differ
diff --git a/res/drawable-mdpi/view_more_now_dark.png b/res/drawable-mdpi/view_more_now_dark.png
new file mode 100644
index 0000000..91347cf
Binary files /dev/null and b/res/drawable-mdpi/view_more_now_dark.png differ
diff --git a/res/drawable-mdpi/view_more_song.png b/res/drawable-mdpi/view_more_song.png
index f493d5b..fba8c49 100644
Binary files a/res/drawable-mdpi/view_more_song.png and b/res/drawable-mdpi/view_more_song.png differ
diff --git a/res/drawable-nodpi/no_art_normal_dark.png b/res/drawable-nodpi/no_art_normal_dark.png
new file mode 100644
index 0000000..8a9ccf4
Binary files /dev/null and b/res/drawable-nodpi/no_art_normal_dark.png differ
diff --git a/res/drawable-nodpi/no_art_small_dark.png b/res/drawable-nodpi/no_art_small_dark.png
new file mode 100644
index 0000000..5bd9fb1
Binary files /dev/null and b/res/drawable-nodpi/no_art_small_dark.png differ
diff --git a/res/drawable-xhdpi/btn_drag_sort_dark.png b/res/drawable-xhdpi/btn_drag_sort_dark.png
new file mode 100644
index 0000000..9e6ff1a
Binary files /dev/null and b/res/drawable-xhdpi/btn_drag_sort_dark.png differ
diff --git a/res/drawable-xhdpi/btn_switch_queue_dark.png b/res/drawable-xhdpi/btn_switch_queue_dark.png
new file mode 100644
index 0000000..75defd7
Binary files /dev/null and b/res/drawable-xhdpi/btn_switch_queue_dark.png differ
diff --git a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
new file mode 100644
index 0000000..5b8a080
Binary files /dev/null and b/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png differ
diff --git a/res/drawable-xhdpi/scrubber_track_holo_dark_dark.9.png b/res/drawable-xhdpi/scrubber_track_holo_dark_dark.9.png
new file mode 100644
index 0000000..7ea86b2
Binary files /dev/null and b/res/drawable-xhdpi/scrubber_track_holo_dark_dark.9.png differ
diff --git a/res/drawable-xhdpi/view_more_album.png b/res/drawable-xhdpi/view_more_album.png
index b002e2d..654954b 100644
Binary files a/res/drawable-xhdpi/view_more_album.png and b/res/drawable-xhdpi/view_more_album.png differ
diff --git a/res/drawable-xhdpi/view_more_now.png b/res/drawable-xhdpi/view_more_now.png
new file mode 100644
index 0000000..a775611
Binary files /dev/null and b/res/drawable-xhdpi/view_more_now.png differ
diff --git a/res/drawable-xhdpi/view_more_now_dark.png b/res/drawable-xhdpi/view_more_now_dark.png
new file mode 100644
index 0000000..e55148c
Binary files /dev/null and b/res/drawable-xhdpi/view_more_now_dark.png differ
diff --git a/res/drawable-xhdpi/view_more_song.png b/res/drawable-xhdpi/view_more_song.png
index f3f00ac..0cae9e8 100644
Binary files a/res/drawable-xhdpi/view_more_song.png and b/res/drawable-xhdpi/view_more_song.png differ
diff --git a/res/drawable/audio_player_seekbar_dark.xml b/res/drawable/audio_player_seekbar_dark.xml
new file mode 100644
index 0000000..e37b4ad
--- /dev/null
+++ b/res/drawable/audio_player_seekbar_dark.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2012 Andrew Neal
+ 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+       http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/scrubber_track_holo_dark_dark"/>
+    <item android:id="@android:id/secondaryProgress">
+        <scale
+            android:drawable="@drawable/scrubber_secondary_holo"
+            android:scaleWidth="100%" />
+    </item>
+    <item android:id="@android:id/progress">
+        <scale
+            android:drawable="@drawable/scrubber_primary_holo"
+            android:scaleWidth="100%" />
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/gridview_item_background_dark.xml b/res/drawable/gridview_item_background_dark.xml
new file mode 100644
index 0000000..dc1bb94
--- /dev/null
+++ b/res/drawable/gridview_item_background_dark.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#454545" />
+
+        </shape>
+    </item>
+    <item android:top="1dp" >
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#111111" />
+
+        </shape>
+    </item>
+
+    <item android:top="1dp" android:bottom="1dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/light_grey_dark" />
+
+            <padding android:bottom="8dp"
+                android:left="8dp"
+                android:right="8dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/listview_item_background_dark.xml b/res/drawable/listview_item_background_dark.xml
new file mode 100644
index 0000000..d315565
--- /dev/null
+++ b/res/drawable/listview_item_background_dark.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#454545" />
+
+        </shape>
+    </item>
+    <item android:top="1dp" >
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#1a1a1a" />
+
+        </shape>
+    </item>
+
+    <item android:top="1dp" android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/light_grey_dark" />
+
+            <padding android:bottom="8dp"
+                android:left="8dp"
+                android:right="8dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/recent_header_background.xml b/res/drawable/recent_header_background.xml
new file mode 100644
index 0000000..95b6ad5
--- /dev/null
+++ b/res/drawable/recent_header_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#ccc" />
+
+        </shape>
+    </item>
+
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/listview_item_bg_color" />
+
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/recent_header_background_dark.xml b/res/drawable/recent_header_background_dark.xml
new file mode 100644
index 0000000..fd11e77
--- /dev/null
+++ b/res/drawable/recent_header_background_dark.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#454545" />
+
+        </shape>
+    </item>
+    <item android:top="1dp" >
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#1a1a1a" />
+
+        </shape>
+    </item>
+
+    <item android:top="1dp" android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/light_grey_dark" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/shuffle_background_dark.xml b/res/drawable/shuffle_background_dark.xml
new file mode 100644
index 0000000..691971e
--- /dev/null
+++ b/res/drawable/shuffle_background_dark.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:example="http://schemas.android.com/apk/res/com.charlesharley.example.android.customdrawablestates"
+    >
+     
+    <!--
+    We make the pressed and focused selector items transparent so the ListView's own selector states show through.
+    -->
+     
+    <item android:state_pressed="true"
+    android:drawable="@color/holo_blue_dark"
+    />
+     
+    <item android:state_focused="true"
+    android:drawable="@color/holo_blue_dark"
+    />
+     
+    <item 
+    android:drawable="@color/background_grey_dark"
+    />
+     
+    </selector>
diff --git a/res/drawable/view_more.xml b/res/drawable/view_more.xml
deleted file mode 100644
index 34f0f8e..0000000
--- a/res/drawable/view_more.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/transparent_black" />
-    <stroke android:width="1dp" android:color="@color/transparent_black" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/res/layout/audio_controls.xml b/res/layout/audio_controls.xml
index cfe0147..32495ab 100644
--- a/res/layout/audio_controls.xml
+++ b/res/layout/audio_controls.xml
@@ -1,77 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/audio_player_seek_bar_padding" >
-
-        <SeekBar
-            android:id="@android:id/progress"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/audio_player_seek_bar_padding"    
-            android:progressDrawable="@drawable/audio_player_seekbar" 
-            android:thumb="@null" />
-
+        android:paddingTop="@dimen/audio_player_text_padding_top" 
+        android:paddingLeft="@dimen/audio_player_text_padding_left" >
+    
         <TextView
-            android:id="@+id/audio_player_current_time"
-            style="@style/AudioPlayerText"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@android:id/progress"
-            android:paddingLeft="@dimen/audio_player_info_container_padding"
-            android:paddingRight="@dimen/audio_player_info_container_padding"
-            android:textColor="@color/transparent_black"
-            android:textSize="@dimen/text_size_small"
-            android:textStyle="bold" />
-
+            android:id="@+id/audio_player_artist_text"
+            style="?AudioPlayerArtistAlbumText"
+            android:text="@string/artist_page_title"/>        
         <TextView
-            android:id="@+id/audio_player_total_time"
-            style="@style/AudioPlayerText"
-            android:layout_alignParentRight="true"
-            android:layout_below="@android:id/progress"
-            android:paddingLeft="@dimen/audio_player_info_container_padding"
-            android:paddingRight="@dimen/audio_player_info_container_padding"
-            android:textColor="@color/transparent_black"
-            android:textSize="@dimen/text_size_small"
-            android:textStyle="bold" />
+            android:id="@+id/audio_player_artist"
+            android:layout_toRightOf="@id/audio_player_artist_text"
+            style="?AudioPlayerInfoText"/>
+        
+        <TextView
+            android:id="@+id/audio_player_album_text"
+            android:layout_below="@id/audio_player_artist_text"
+            style="?AudioPlayerArtistAlbumText"
+            android:text="@string/album_page_title"/>        
+        <TextView
+            android:id="@+id/audio_player_album"
+            android:layout_toRightOf="@id/audio_player_album_text"
+            android:layout_alignBottom="@id/audio_player_album_text"
+            style="?AudioPlayerInfoText"/>
+        
+        <ImageButton
+            android:id="@+id/view_more"
+            style="?AudioPlayerViewMore"/>
+        
     </RelativeLayout>
-
+        
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/audio_player_controls_height"
         android:layout_gravity="bottom"
         android:orientation="horizontal"
-        android:paddingBottom="@dimen/audio_player_button_container_padding" >
-
-        <ImageButton
-            android:id="@+id/audio_player_repeat"
-            style="@style/AudioPlayerButton"
-            android:contentDescription="@string/cd_repeat"
-            android:src="@drawable/apollo_holo_light_repeat_normal" />
-
-        <com.andrew.apolloMod.ui.widgets.RepeatingImageButton
+        android:paddingTop="@dimen/audio_player_button_container_padding" > 
+        
+        <com.andrew.apolloMod.ui.views.RepeatingImageButton
             android:id="@+id/audio_player_prev"
-            style="@style/AudioPlayerButton"
-            android:src="@drawable/apollo_holo_light_previous" />
+            style="?AudioPlayerPrevious"/>
 
         <ImageButton
             android:id="@+id/audio_player_play"
-            style="@style/AudioPlayerButton"
-            android:contentDescription="@string/cd_play"
-            android:src="@drawable/apollo_holo_light_pause" />
+            style="?AudioPlayerPlay"/>
 
-        <com.andrew.apolloMod.ui.widgets.RepeatingImageButton
+        <com.andrew.apolloMod.ui.views.RepeatingImageButton
             android:id="@+id/audio_player_next"
-            style="@style/AudioPlayerButton"
-            android:src="@drawable/apollo_holo_light_next" />
+            style="?AudioPlayerNext"/>
+
+        <ImageButton
+            android:id="@+id/audio_player_repeat"
+            style="?AudioPlayerRepeat"/>
 
         <ImageButton
             android:id="@+id/audio_player_shuffle"
-            style="@style/AudioPlayerButton"
-            android:contentDescription="@string/cd_shuffle"
-            android:src="@drawable/apollo_holo_light_shuffle_normal" />
+            style="?AudioPlayerShuffle" />
     </LinearLayout>
+    
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/audio_player_seek_padding_top_bottom" 
+        android:paddingBottom="@dimen/audio_player_seek_padding_top_bottom" >
+
+        <TextView
+            android:id="@+id/audio_player_current_time"
+            style="?AudioPlayerTimeText"
+            android:layout_alignParentLeft="true"
+            android:paddingLeft="@dimen/audio_player_info_container_padding"/>
+        
+        <TextView
+            android:id="@+id/audio_player_total_time"
+            style="?AudioPlayerTimeText"
+            android:layout_alignParentRight="true"
+            android:paddingRight="@dimen/audio_player_info_container_padding"/>
+        
+        <SeekBar
+            android:id="@android:id/progress"
+            style="?AudioPlayerSeek"/>
+
+    </RelativeLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml
index 13df2bc..aed45c6 100644
--- a/res/layout/audio_player.xml
+++ b/res/layout/audio_player.xml
@@ -18,31 +18,30 @@
         
    	 	<include layout="@layout/shadow" />
    	 	
-        <com.andrew.apolloMod.ui.widgets.VisualizerView
+        <com.andrew.apolloMod.ui.views.VisualizerView
             android:id="@+id/visualizerView"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
-            android:layout_above="@+id/audio_player_text_border" />
-       
+            android:layout_above="@+id/audio_player_nowplaying_text" />
+		
+        <TextView
+            android:id="@+id/audio_player_nowplaying_text"
+            style="?AudioPlayerNowPlayingText"/>
+        
    </RelativeLayout>
+   
    <RelativeLayout
         android:id="@+id/audio_player_queue_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/background_grey"
-        android:visibility="gone" >
+        android:visibility="gone" 
+        style="?AudioPlayerQueueBG">
    </RelativeLayout>
     
     <FrameLayout 
 	    android:id="@+id/colorstrip_bottom"
-	    android:layout_width="match_parent"
-	    android:layout_height="@dimen/colorstrip_height"
-        android:background="@color/holo_blue_dark" />
+		style="?Colorstrip"/>
+    
 	<View
-	    android:layout_width="match_parent"
-	    android:layout_height="@dimen/colorstrip_height"
-	    android:background="@drawable/colorstrip_shadow" 
-	    />		
+	    style="?AudioPlayerColorstripShadow"/>	
+	    	
     <include layout="@layout/audio_controls" />
 </LinearLayout>
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index c3b8a80..c584efd 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -2,27 +2,22 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_action_bar_container"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/bottom_action_bar_height"
-    android:layout_gravity="bottom"
-    android:orientation="vertical" >
+    style="?BottomActionBarWrapper">
 
     <ImageView
         android:id="@+id/bottom_action_bar_info_divider"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_action_bar_divider_height"
-        android:background="@color/holo_blue_dark"
+	    style="?BottomActionBarDivider"
         tools:ignore="ContentDescription" />
 
-    <com.andrew.apolloMod.ui.widgets.BottomActionBar
+    <com.andrew.apolloMod.ui.views.BottomActionBar
         android:id="@+id/bottom_action_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/holo_selector"
-	    android:paddingLeft="@dimen/bottom_action_bar_padding_left"
-	    android:paddingRight="@dimen/bottom_action_bar_padding_left"
-        android:orientation="horizontal" >
+		style="?BottomActionBar">
 
+        <ImageButton
+            android:id="@+id/bottom_action_bar_favorites"
+            style="?BottomActionBarFavorites" 
+            android:visibility="gone"/>        
+            
         <RelativeLayout
         	android:id="@+id/bottom_action_bar_dragview"
 	        android:layout_width="0dp"
@@ -38,50 +33,46 @@
 	            android:contentDescription="@string/cd_bottom_action_bar_album_art"
 	            android:scaleType="fitXY" />
 	
+	
+	            <TextView
+	                android:id="@+id/bottom_action_bar_track_name_only"
+	                style="?BottomActionBarText"
+	                android:gravity="center"
+	                android:layout_width="match_parent"
+	                android:paddingLeft="0dp"
+	                android:visibility="gone"
+	                android:textStyle="bold" />
+	            
 	            <TextView
 	                android:id="@+id/bottom_action_bar_track_name"
-	                style="@style/BottomActionBarText"
+	                style="?BottomActionBarText"
 	                android:layout_toRightOf="@+id/bottom_action_bar_album_art"
-	                android:paddingLeft="@dimen/bottom_action_bar_padding_left"
-	                android:textColor="@color/transparent_black"
-	                android:textSize="@dimen/text_size_micro"
 	                android:textStyle="bold" />
 	
 	            <TextView
 	                android:id="@+id/bottom_action_bar_artist_name"
-	                style="@style/BottomActionBarText"
-	                android:paddingLeft="@dimen/bottom_action_bar_padding_left"
+	                style="?BottomActionBarText"
 	                android:layout_below="@+id/bottom_action_bar_track_name"
-	                android:layout_toRightOf="@+id/bottom_action_bar_album_art"
-	                android:textSize="@dimen/text_size_micro"
-	                android:textColor="@color/transparent_black" />
+	                android:layout_toRightOf="@+id/bottom_action_bar_album_art" />
 	    </RelativeLayout>
         
         <ImageButton
             android:id="@+id/bottom_action_bar_previous"
-            style="@style/BottomActionBarItem"
-            android:contentDescription="@string/cd_previous"
-            android:src="@drawable/apollo_holo_light_previous" />
+            style="?BottomActionBarPrevious"/>
 
         <ImageButton
             android:id="@+id/bottom_action_bar_play"
-            style="@style/BottomActionBarItem"
-            android:contentDescription="@string/cd_play"
-            android:src="@drawable/apollo_holo_light_play" />
+            style="?BottomActionBarPlay" />
 
         <ImageButton
             android:id="@+id/bottom_action_bar_next"
-            style="@style/BottomActionBarItem"
-            android:contentDescription="@string/cd_next"
-            android:src="@drawable/apollo_holo_light_next" />      
+            style="?BottomActionBarNext"/>      
               
         <ImageButton
             android:id="@+id/bottom_action_bar_switch_queue"
-            style="@style/BottomActionBarItem"
-            android:visibility="gone" 
-            android:contentDescription="@string/cd_next"
-            android:src="@drawable/btn_switch_queue" />        
+            style="?BottomActionBarItem"
+            android:visibility="gone"/>"
         
-    </com.andrew.apolloMod.ui.widgets.BottomActionBar>
+    </com.andrew.apolloMod.ui.views.BottomActionBar>
 
 </LinearLayout>
diff --git a/res/layout/context_menu.xml b/res/layout/context_menu.xml
index 4682936..6c84058 100644
--- a/res/layout/context_menu.xml
+++ b/res/layout/context_menu.xml
@@ -10,18 +10,10 @@
 
     <ImageView
         android:id="@+id/quick_context_line"
-        android:layout_width="@dimen/quick_context_line_width"
-        android:layout_height="@dimen/quick_context_line_height"
-        android:layout_gravity="center|left"
-        android:background="@color/transparent_black" />
+        style="?ContextMenuLine" />
 
     <ImageView
         android:id="@+id/quick_context_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:layout_marginRight="@dimen/quick_context_margin_right"
-        android:scaleType="centerInside"
-        android:src="@drawable/dropdown_ic_arrow_normal_holo_light" />
+        style="?ContextMenuArrow"/>
 
 </FrameLayout>
diff --git a/res/layout/custom_action_bar.xml b/res/layout/custom_action_bar.xml
deleted file mode 100644
index 9389ad5..0000000
--- a/res/layout/custom_action_bar.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/action_bar_layout"
-    android:layout_width="96dp"
-    android:layout_height="wrap_content"
-    android:layout_gravity="right|center"
-    android:background="@drawable/holo_selector"
-    android:clickable="true"
-    android:focusable="true" >
-
-    <ImageView
-        android:id="@+id/action_bar_album_art"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/action_bar_track_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/action_bar_album_art"
-        android:ellipsize="end"
-        android:paddingRight="5dp"
-        android:paddingTop="10dp"
-        android:singleLine="true"
-        android:textColor="@color/transparent_black"
-        android:textSize="@dimen/text_size_micro"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/action_bar_album_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/action_bar_track_name"
-        android:layout_toLeftOf="@+id/action_bar_album_art"
-        android:ellipsize="end"
-        android:paddingRight="5dp"
-        android:singleLine="true"
-        android:textColor="@color/transparent_black"
-        android:textSize="@dimen/text_size_micro" />
-
-</RelativeLayout>
diff --git a/res/layout/dragsort_listview.xml b/res/layout/dragsort_listview.xml
index e44ccf3..f36019e 100644
--- a/res/layout/dragsort_listview.xml
+++ b/res/layout/dragsort_listview.xml
@@ -12,20 +12,7 @@
     <com.mobeta.android.dslv.DragSortListView
     	xmlns:dslv="http://schemas.android.com/apk/lib/com.mobeta.android.dslv"
 	    android:id="@+id/list_view"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:cacheColorHint="@color/transparent"
-        android:drawSelectorOnTop="false"
-        android:fastScrollAlwaysVisible="false"
-        android:fastScrollEnabled="false"
-        android:scrollbars="none"
-        android:listSelector="@drawable/holo_selector"
-        android:background="@color/background_grey"
-  		android:divider="@android:color/transparent"
-  		android:dividerHeight="@dimen/listview_items_padding_top_bottom"
-        android:paddingRight="@dimen/listview_items_padding_top_bottom" 
-        android:paddingLeft="@dimen/listview_items_padding_top_bottom"
+	    style="?ListviewDragWrapper"
 	    dslv:drag_enabled="true"
     	dslv:drag_handle_id="@+id/listview_drag_handle"
 	    dslv:collapsed_height="2dp"
diff --git a/res/layout/dragsort_listview_items.xml b/res/layout/dragsort_listview_items.xml
index 58840b0..97fc965 100644
--- a/res/layout/dragsort_listview_items.xml
+++ b/res/layout/dragsort_listview_items.xml
@@ -1,56 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/listview_item_height"
-    android:paddingTop="@dimen/listview_items_padding_top_bottom" 
-    android:paddingBottom="@dimen/listview_items_padding_top_bottom"
-	android:background="@drawable/listview_item_background" 
-    android:layout_gravity="center_vertical" >
+    style="?ListviewItemWrapper" >
  
     <ImageView
         android:id="@+id/listview_drag_handle"
-        android:layout_width="@dimen/listview_drag_width"
-        android:layout_height="@dimen/listview_drag_height"
-        android:layout_alignParentLeft="true"
-        android:scaleType="center"
-	    android:src="@drawable/btn_drag_sort"/>
+        style="?ListviewDragHandle"/>
  
     <ImageView
         android:id="@+id/listview_item_image"
-        android:layout_width="@dimen/listview_album_art"
-        android:layout_height="@dimen/listview_album_art"
         android:layout_toRightOf="@+id/listview_drag_handle"
-        android:layout_margin="@dimen/listview_album_margin"
-        android:scaleType="centerCrop" 
-	    android:background="@drawable/no_art_small"/>
+        android:layout_alignParentLeft="false"
+        style="?ListviewItemArt"/>
 
     <!-- Padding may be set on via code for some tabs -->
 
     <TextView
         android:id="@+id/listview_item_line_one"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="marquee"
-        android:maxLength="29"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_top_bottom"
-        android:singleLine="true"
-        android:textSize="@dimen/text_size_medium" />
+        style="?ListviewItemLineOne"/>
 
     <TextView
         android:id="@+id/listview_item_line_two"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/listview_item_line_one"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="end"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_small_top"
-        android:singleLine="true"
-        android:textSize="@dimen/text_size_small" />
+        style="?ListviewItemLineTwo"/>
 
     <include layout="@layout/context_menu" />
 
diff --git a/res/layout/gridview.xml b/res/layout/gridview.xml
index 1003a51..771b003 100644
--- a/res/layout/gridview.xml
+++ b/res/layout/gridview.xml
@@ -8,16 +8,7 @@
     <include layout="@layout/shadow" />
 
     <GridView
-        android:id="@+id/gridview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-    	android:paddingLeft="@dimen/gridview_item_padding_right_left_outer"
-    	android:paddingRight="@dimen/gridview_item_padding_right_left_outer"
-        android:cacheColorHint="@color/transparent"
-        android:drawSelectorOnTop="true"
-        android:numColumns="@integer/gridview_columns"
-        android:background="@color/background_grey"
-        android:scrollbars="none" />
+        android:id="@+id/gridview" 
+        style="?Gridview"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/gridview_items.xml b/res/layout/gridview_items.xml
index ecf8dc3..d69a914 100644
--- a/res/layout/gridview_items.xml
+++ b/res/layout/gridview_items.xml
@@ -5,17 +5,13 @@
     	android:paddingLeft="@dimen/gridview_item_padding_right_left"
     	android:paddingRight="@dimen/gridview_item_padding_right_left"
     	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+    	
 		<RelativeLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-			android:background="@drawable/gridview_item_background" >
+		    style="?GridviewItemWrapper">
 		
-		    <com.andrew.apolloMod.views.TrackBrowserImageView
+		    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
 		        android:id="@+id/gridview_image"
-		        android:layout_width="@dimen/gridview_image_width"
-		        android:layout_height="@dimen/gridview_image_height"
-		        android:scaleType="centerCrop" 
-			    android:background="@drawable/no_art_small"/>
+		        style="?GridviewItemArt"/>
 		     
 		    <LinearLayout
 				android:id="@+id/gridview_outershell"
@@ -25,28 +21,19 @@
 		        android:gravity="center_vertical"
 		        android:orientation="vertical">
 		  		       
-				<View
-				    android:id="@+id/gridview_text_border"
-				    style="@style/Topborderline"
-				    />
+				
 				<LinearLayout
 			        android:id="@+id/gridview_info_holder"
-			        android:layout_width="match_parent"
-			        android:layout_height="@dimen/gridview_item_ccontainer_height"
-			        android:background="@color/transparent_black"
-			        android:gravity="center_vertical"
-			        android:orientation="vertical"
-				    android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
-		        	android:paddingRight="@dimen/gridview_item_ccontainer_padding_right" 
-				    >
+            		style="?GridviewItemTextWrapper" >
+            		
 			        <TextView
 			            android:id="@+id/gridview_line_one"
-			            style="@style/GridviewShadowedText"
+			            style="?ShadowedText"
 			            android:textStyle="bold" />
 			
 			        <TextView
 			            android:id="@+id/gridview_line_two"
-			            style="@style/GridviewShadowedText" />
+			            style="?ShadowedText" />
 		        </LinearLayout>
 		    </LinearLayout>
 		
diff --git a/res/layout/gridview_items_recent.xml b/res/layout/gridview_items_recent.xml
new file mode 100644
index 0000000..ea9a4aa
--- /dev/null
+++ b/res/layout/gridview_items_recent.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    	android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+    	android:paddingLeft="@dimen/gridview_item_padding_right_left"
+    	android:paddingRight="@dimen/gridview_item_padding_right_left"
+    	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+	<RelativeLayout
+	    style="?GridviewRecentsWrapper">
+	 
+	    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
+	        android:id="@+id/gridview_image"
+	        style="?GridviewRecentsArt"/>
+	
+	    <!-- Padding may be set on via code for some tabs -->
+	
+	    <TextView
+	        android:id="@+id/gridview_line_one"
+			style="?GridviewRecentsShadowedText"/>
+	
+	    <TextView
+	        android:id="@+id/gridview_line_two"
+	        style="?GridviewRecentsText"/>
+	
+	    <ImageView
+	        android:id="@+id/peak_two"
+	        style="@style/PeakMeter"
+            android:layout_alignBottom="@+id/gridview_line_two"
+	        android:layout_height="26dp"
+            android:layout_marginRight="8dp"
+		    android:layout_toLeftOf="@+id/peak_one"/>
+	
+	    <ImageView
+	        android:id="@+id/peak_one"
+	        style="@style/PeakMeter"
+	        android:layout_height="26dp"
+            android:layout_alignBottom="@+id/gridview_line_two"
+            android:layout_alignParentRight="true"/>
+	
+	</RelativeLayout>
+</LinearLayout>
+    
\ No newline at end of file
diff --git a/res/layout/half_and_half.xml b/res/layout/half_and_half.xml
index 2cc6fd3..48000bb 100644
--- a/res/layout/half_and_half.xml
+++ b/res/layout/half_and_half.xml
@@ -6,32 +6,24 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/colorstrip"
         android:baselineAligned="false"
         android:orientation="horizontal" >
 
         <RelativeLayout
             android:id="@+id/artist_half_container"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
 			
-            <com.andrew.apolloMod.views.TrackBrowserImageView
+            <com.andrew.apolloMod.ui.views.TrackBrowserImageView
                 android:id="@+id/half_artist_image"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/half_and_half_imageheight"
-                android:scaleType="centerCrop" />
+                android:scaleType="matrix" />
 
 			<RelativeLayout
 		        android:id="@+id/half_artist_info_holder"
-		        android:layout_width="match_parent"
-		        android:layout_height="@dimen/half_and_half_text_wrap_height"
-	            android:layout_alignBottom="@+id/half_artist_image"
-		        android:background="@color/transparent_black"
-		        android:paddingTop="@dimen/gridview_item_ccontainer_padding_left"
-		        android:paddingBottom="@dimen/gridview_item_ccontainer_padding_left"
-			    android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
-	        	android:paddingRight="@dimen/gridview_item_ccontainer_padding_right">
+		        style="?HalfTextWrapper">
 		        <TextView
 		            android:layout_alignParentLeft="true"
 		            android:id="@+id/half_artist_image_text"
@@ -40,18 +32,11 @@
         			android:singleLine="true"
 			        android:ellipsize="end"
 			        android:maxLength="22"
-		            style="@style/GridviewShadowedText"
+		            style="?ShadowedText"
 		            android:textStyle="bold"/>
 		        <ImageButton
 		            android:id="@+id/view_more"
-		            style="@style/GridviewShadowedText"
-		            android:layout_alignParentRight="true"
-		            android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"
-			        android:visibility="gone"
-			        android:padding="@dimen/half_and_half_imagebutton_padding"
-					android:src="@drawable/view_more_album"
-		            android:background="@drawable/view_more"/>
+		            style="?HalfTextViewMore"/>
 		
 		        <TextView
 		            android:layout_alignParentLeft="true"
@@ -59,15 +44,13 @@
         			android:layout_height="wrap_content"
 			        android:layout_below="@+id/half_artist_image_text"
 		            android:id="@+id/half_artist_image_text_line_two"
-		            style="@style/GridviewShadowedText"/>
+		            style="?ShadowedText"/>
 	        </RelativeLayout>
 	        
 		    <RelativeLayout
-		        android:layout_width="fill_parent"
 		        android:id="@+id/bottom_colorstrip"
 	            android:layout_alignBottom="@+id/half_artist_image"
-				android:layout_height="@dimen/colorstrip_height"
-		        android:background="@color/holo_blue_dark" />
+		        style="?Colorstrip"/>
 		            
         </RelativeLayout>        
     </LinearLayout>
diff --git a/res/layout/library_browser.xml b/res/layout/library_browser.xml
index b73e9a7..55df23f 100644
--- a/res/layout/library_browser.xml
+++ b/res/layout/library_browser.xml
@@ -10,35 +10,22 @@
 	    android:gravity="bottom">
 	
 	    <LinearLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:orientation="vertical"
-		    android:paddingTop="?android:attr/actionBarSize"
-		    android:clickable="true"
-			android:focusable="false"
-        	android:background="@color/background_grey"
-			android:focusableInTouchMode="true" >
+	        style="?LibraryWrapper" >
 		
-		    <com.andrew.apolloMod.ui.widgets.ScrollableTabView
+		    <com.andrew.apolloMod.ui.views.ScrollableTabView
 		        android:id="@+id/scrollingTabs"
-		        android:layout_width="match_parent"
-        		android:background="@color/white"
-		        android:layout_height="@dimen/tab_height"/>
+		        style="?LibraryTabsWrapper"/>
 		
 		    <android.support.v4.view.ViewPager
 		        android:id="@+id/viewPager"
 		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:layout_below="@+id/scrollingTabs" />
+		    
 		</LinearLayout>
 	
 	    <LinearLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-			android:orientation="vertical" 
-        	android:background="@color/white"
-			android:clickable="true"
-			android:focusable="false" >
+	        style="?BottomActionBarOuter" >
 	        <LinearLayout 
 				    android:id="@+id/bottom_action_bar_container2"
 				    android:layout_width="match_parent"
diff --git a/res/layout/listview.xml b/res/layout/listview.xml
index 26d212e..e470ad5 100644
--- a/res/layout/listview.xml
+++ b/res/layout/listview.xml
@@ -11,20 +11,7 @@
     
     <ListView
         android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:cacheColorHint="@color/transparent"
-        android:drawSelectorOnTop="false"
-        android:fastScrollAlwaysVisible="false"
-        android:fastScrollEnabled="false"
-        android:scrollbars="none"
-        android:listSelector="@drawable/holo_selector"
-        android:background="@color/background_grey"
-  		android:divider="@android:color/transparent"
-  		android:dividerHeight="@dimen/listview_items_padding_top_bottom"
-        android:paddingRight="@dimen/listview_items_padding_top_bottom" 
-        android:paddingLeft="@dimen/listview_items_padding_top_bottom"  />
+        style="?Listview"  />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/listview_items.xml b/res/layout/listview_items.xml
index debdbef..3870f2d 100644
--- a/res/layout/listview_items.xml
+++ b/res/layout/listview_items.xml
@@ -1,48 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/listview_item_height"
-    android:paddingTop="@dimen/listview_items_padding_top_bottom" 
-    android:paddingBottom="@dimen/listview_items_padding_top_bottom"
-	android:background="@drawable/listview_item_background" 
-    android:layout_gravity="center_vertical" >
+    style="?ListviewItemWrapper" >
  
     <ImageView
         android:id="@+id/listview_item_image"
-        android:layout_width="@dimen/listview_album_art"
-        android:layout_height="@dimen/listview_album_art"
-        android:layout_alignParentLeft="true"
-        android:layout_margin="@dimen/listview_album_margin"
-        android:scaleType="centerCrop" 
-	    android:background="@drawable/no_art_small"/>
-
-    <!-- Padding may be set on via code for some tabs -->
+        style="?ListviewItemArt"/>
 
     <TextView
         android:id="@+id/listview_item_line_one"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="marquee"
-        android:maxLength="29"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_top_bottom"
-        android:singleLine="true"
-        android:textSize="@dimen/text_size_medium" />
+        style="?ListviewItemLineOne"/>
 
     <TextView
         android:id="@+id/listview_item_line_two"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/listview_item_line_one"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="end"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_small_top"
-        android:singleLine="true"
-        android:textSize="@dimen/text_size_small" />
+        style="?ListviewItemLineTwo"/>
 
     <include layout="@layout/context_menu" />
 
diff --git a/res/layout/listview_items_search.xml b/res/layout/listview_items_search.xml
new file mode 100644
index 0000000..637c18b
--- /dev/null
+++ b/res/layout/listview_items_search.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="?ListviewItemWrapper" >
+ 
+    <TextView
+        android:id="@+id/listview_item_line_one"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:maxLength="29"
+        android:paddingLeft="@dimen/listview_items_padding_left_top"
+        android:paddingRight="@dimen/listview_items_padding_right"
+        android:paddingTop="@dimen/listview_items_padding_left_top"
+        android:singleLine="true"
+        android:textSize="@dimen/text_size_small_medium"
+        style="?ListviewItemLineOne"/>
+
+    <TextView
+        android:id="@+id/listview_item_line_two"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/listview_items_padding_left_top"
+        android:paddingRight="@dimen/listview_items_padding_right"
+        android:paddingTop="@dimen/listview_items_padding_small_top"
+        android:singleLine="true"
+        android:layout_below="@+id/listview_item_line_one"
+        android:ellipsize="end"
+        android:textSize="@dimen/text_size_small" 
+        style="?ListviewItemLineTwo"/>
+
+</RelativeLayout>
diff --git a/res/layout/nowplaying_album_art.xml b/res/layout/nowplaying_album_art.xml
index 5d8661f..a38c01c 100644
--- a/res/layout/nowplaying_album_art.xml
+++ b/res/layout/nowplaying_album_art.xml
@@ -4,11 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-	<ImageView
+	<com.andrew.apolloMod.ui.views.TrackBrowserImageView
             android:id="@+id/audio_player_album_art"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/no_art_normal"
-            android:scaleType="fitXY" />
+            style="?AudioPlayerAlbumArt"/>
 	
 </LinearLayout>
diff --git a/res/layout/playlist_dialog.xml b/res/layout/playlist_dialog.xml
new file mode 100644
index 0000000..e550fc3
--- /dev/null
+++ b/res/layout/playlist_dialog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    style="?PlaylistDialog" >
+
+</LinearLayout>
diff --git a/res/layout/recently_added_heading.xml b/res/layout/recently_added_heading.xml
new file mode 100644
index 0000000..6497c13
--- /dev/null
+++ b/res/layout/recently_added_heading.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"	
+    android:id="@+id/recents_heading"
+	android:clickable="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+	<RelativeLayout
+	    android:id="@+id/recently_added_wrapper"
+	    style="?RecentlyAddedWrapper"
+	    android:clickable="true"
+	    android:layout_marginTop="0dp" 
+	    android:layout_marginLeft="6dp" 
+	    android:layout_marginRight="6dp" 
+	    android:layout_marginBottom="8dp">
+	
+	
+	    <TextView
+	        android:id="@+id/recents_textview"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentLeft="true"
+	        android:ellipsize="end"
+	        android:maxLength="29"
+	        android:paddingRight="@dimen/listview_items_padding_right"
+	    	android:layout_marginTop="20dp" 
+	    	android:layout_marginLeft="8dp" 
+	        android:singleLine="true"
+	        android:textSize="@dimen/text_size_medium"
+	        android:text="@string/recents_added" />
+	    
+	    
+	    <TextView
+	        android:id="@+id/recents_viewmore"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentRight="true"
+	        android:ellipsize="end"
+	        android:maxLength="29"
+	        android:padding="5dp"
+	    	android:layout_marginTop="16dp" 
+	    	android:layout_marginRight="8dp" 
+	        android:singleLine="true"
+	        android:textSize="@dimen/text_size_small"
+	        android:textColor="@color/white"
+	        android:background="@color/holo_blue_dark"
+	        android:text="View More" />
+	
+	</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/recents_main.xml b/res/layout/recents_main.xml
new file mode 100644
index 0000000..b27134c
--- /dev/null
+++ b/res/layout/recents_main.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"			    
	android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:id="@+id/recents_scrollview" >
+        <LinearLayout
+            android:id="@+id/recents_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/recents_root_fragment.xml b/res/layout/recents_root_fragment.xml
new file mode 100644
index 0000000..feaa64f
--- /dev/null
+++ b/res/layout/recents_root_fragment.xml
@@ -0,0 +1,7 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/root_frame" >
+
+</FrameLayout>
diff --git a/res/layout/recents_row.xml b/res/layout/recents_row.xml
new file mode 100644
index 0000000..7f8ee86
--- /dev/null
+++ b/res/layout/recents_row.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"	
+    android:id="@+id/recents_row"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    
+	<LinearLayout 
+		    android:layout_height="wrap_content"
+		    android:layout_width="0dp"
+			android:layout_weight="1"
+		    android:id="@+id/recent_column1"
+		    android:visibility="invisible"
+		    android:orientation="horizontal"
+	    	android:paddingLeft="@dimen/gridview_item_padding_right_left"
+	    	android:paddingRight="@dimen/gridview_item_padding_right_left"
+	    	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+		<RelativeLayout
+		    style="?GridviewRecentsWrapper"
+		    android:orientation="vertical">				 
+		    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
+		        android:id="@+id/recent_image1"
+		        style="?GridviewRecentsArt"/>
+		    <TextView
+		        android:id="@+id/recent_line_one1"
+				style="?GridviewRecentsShadowedText"
+				android:layout_alignBottom="@+id/recent_image1" />
+		
+		    <TextView
+		        android:id="@+id/recent_line_two1"
+		        style="?GridviewRecentsText"
+        		android:layout_below="@+id/recent_image1" />
+		
+		</RelativeLayout>
+	</LinearLayout>
+	
+	<LinearLayout 
+		    android:layout_height="wrap_content"
+		    android:layout_width="0dp"
+			android:layout_weight="1"
+		    android:id="@+id/recent_column2"
+		    android:visibility="invisible"
+		    android:orientation="horizontal"
+	    	android:paddingLeft="@dimen/gridview_item_padding_right_left"
+	    	android:paddingRight="@dimen/gridview_item_padding_right_left"
+	    	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+		<RelativeLayout
+		    style="?GridviewRecentsWrapper"
+		    android:orientation="vertical">				 
+		    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
+		        android:id="@+id/recent_image2"
+		        style="?GridviewRecentsArt"/>
+		    <TextView
+		        android:id="@+id/recent_line_one2"
+				style="?GridviewRecentsShadowedText"
+				android:layout_alignBottom="@+id/recent_image2" />
+		
+		    <TextView
+		        android:id="@+id/recent_line_two2"
+		        style="?GridviewRecentsText"
+        		android:layout_below="@+id/recent_image2" />
+		
+		</RelativeLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/shuffle_all.xml b/res/layout/shuffle_all.xml
index dc0e35b..b5a3dd5 100644
--- a/res/layout/shuffle_all.xml
+++ b/res/layout/shuffle_all.xml
@@ -1,25 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/shuffle_wrapper"
-    android:layout_width="match_parent"
-    android:layout_height="55dp"
-    android:paddingRight="10dp" 
-    android:paddingLeft="10dp" 
-    android:paddingBottom="13dp"
-  	android:layout_gravity="center_vertical"
-  	android:background="@drawable/shuffle_background">
+    style="?ShuffleWrapper">
 
     <ImageView
         android:id="@+id/shuffle_imageview"
-        android:layout_width="25dp"
-        android:layout_height="25dp"
-        android:layout_alignParentLeft="true"
-        android:scaleType="centerCrop" 
-    	android:layout_marginTop="13dp" 
-    	android:layout_marginLeft="16dp" 
-	    android:background="@drawable/apollo_holo_light_shuffle_normal"/>
-
-    <!-- Padding may be set on via code for some tabs -->
+        tools:ignore="ContentDescription" 
+        style="?ShuffleImage"/>
 
     <TextView
         android:id="@+id/shuffle_textview"
@@ -28,11 +16,11 @@
         android:layout_toRightOf="@+id/shuffle_imageview"
         android:ellipsize="end"
         android:maxLength="29"
-        android:text="Shuffle All"
         android:paddingRight="@dimen/listview_items_padding_right"
     	android:layout_marginTop="14dp" 
     	android:layout_marginLeft="31dp" 
         android:singleLine="true"
-        android:textSize="@dimen/text_size_medium" />
+        android:textSize="@dimen/text_size_medium"
+        android:text="@string/shuffle_all" />
 
 </RelativeLayout>
diff --git a/res/layout/simple_eq.xml b/res/layout/simple_eq.xml
index c3b34e4..526430c 100644
--- a/res/layout/simple_eq.xml
+++ b/res/layout/simple_eq.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
+    
     <CheckBox 
         android:id="@+id/simple_eq_bass"
         android:text="@string/simple_eq_bass"
@@ -14,6 +15,7 @@
         android:layout_marginLeft="@dimen/simple_eq_margin_left_right"
         android:layout_marginRight="@dimen/simple_eq_margin_left_right"
         android:checked="false"/>
+    
 	<SeekBar
 	    android:id="@+id/simple_eq_bassboost"
 	    android:layout_width="fill_parent"
@@ -60,7 +62,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band0_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -84,7 +86,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band1_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -108,7 +110,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band2_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -132,7 +134,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band3_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -156,7 +158,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band4_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -180,7 +182,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band5_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -190,10 +192,7 @@
 	    		android:max="100"
 	    		android:progress="100"/>
         </LinearLayout>
-	    
-	    
-	    
-	    
+        
 	</LinearLayout>
 	
 </LinearLayout>
diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
index 67b2c19..bc619dd 100644
--- a/res/layout/tabs.xml
+++ b/res/layout/tabs.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabs"
-    style="@style/Tabs" />
+    style="?Tabs" />
diff --git a/res/layout/track_browser.xml b/res/layout/track_browser.xml
index e1af2cd..ab9b679 100644
--- a/res/layout/track_browser.xml
+++ b/res/layout/track_browser.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:background="@color/background_grey"
-    android:layout_height="match_parent">
+    style="?TracksBrowserWrapper" >
+    
 	<com.sothree.slidinguppanel.SlidingUpPanelLayout
 	    android:id="@+id/sliding_layout"
 	    android:layout_width="match_parent"
@@ -28,12 +27,7 @@
 		</RelativeLayout>
 		
 	    <LinearLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-			android:orientation="vertical" 
-        	android:background="@color/white"
-			android:clickable="true"
-			android:focusable="false" >
+	        style="?BottomActionBarOuter" >
 	        <LinearLayout 
 				    android:id="@+id/bottom_action_bar_container2"
 				    android:layout_width="match_parent"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 158ea6e..2aaf0b6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -11,13 +11,25 @@
         <item>@string/tab_genres</item>
     </string-array>
     
+    
+     <string-array name="theme_types">
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark</item>
+        <item>@string/theme_black</item>
+    </string-array>
+    
+     <string-array name="recents_types">
+        <item>@string/recents_added</item>
+        <item>@string/recents_played</item>
+        <item>@string/recents_split</item>
+    </string-array>
+    
      <string-array name="visualization_types">
         <item>@string/visual_none</item>
         <item>@string/visual_bargraph</item>
         <item>@string/visual_solidbargraph</item>
         <item>@string/visual_waveform</item>
-    </string-array>
-    
+    </string-array>   
      
      <string-array name="widget_style_types">
         <item>@string/widget_style_dark</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 0000000..2fe693b
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+		<declare-styleable name="ApolloTheme">
+			<attr name="PlaylistDialog" format="reference" />
+			<attr name="Tabs" format="reference" />
+    		<attr name="BottomActionBarItem" format="reference" />
+    		<attr name="BottomActionBarText" format="reference" />
+    		<attr name="BottomActionBarDivider" format="reference" />
+    		<attr name="BottomActionBar" format="reference" />
+    		<attr name="BottomActionBarWrapper" format="reference" />
+    		<attr name="BottomActionBarOuter" format="reference" />
+    		<attr name="BottomActionBarFavorites" format="reference" />
+    		<attr name="BottomActionBarPrevious" format="reference" />
+    		<attr name="BottomActionBarPlay" format="reference" />
+    		<attr name="BottomActionBarNext" format="reference" />
+    		<attr name="BottomActionBarNowQueue" format="reference" />    		
+    		<attr name="AudioPlayerAlbumArt" format="reference" />   		
+    		<attr name="AudioPlayerText" format="reference" />
+    		<attr name="AudioPlayerArtistAlbumText" format="reference" />
+    		<attr name="AudioPlayerInfoText" format="reference" />
+    		<attr name="AudioPlayerViewMore" format="reference" />
+    		<attr name="AudioPlayerButton" format="reference" />
+    		<attr name="AudioPlayerTimeText" format="reference" />
+    		<attr name="AudioPlayerNowPlayingText" format="reference" />
+    		<attr name="AudioPlayerQueueBG" format="reference" />
+    		<attr name="AudioPlayerColorstrip" format="reference" />
+    		<attr name="AudioPlayerColorstripShadow" format="reference" />
+    		<attr name="AudioPlayerPrevious" format="reference" />
+    		<attr name="AudioPlayerPlay" format="reference" />
+    		<attr name="AudioPlayerNext" format="reference" />
+    		<attr name="AudioPlayerRepeat" format="reference" />
+    		<attr name="AudioPlayerShuffle" format="reference" />
+    		<attr name="AudioPlayerSeek" format="reference" />
+    		<attr name="ContextMenuLine" format="reference" />
+    		<attr name="ContextMenuArrow" format="reference" />
+    		<attr name="ListviewItemWrapper" format="reference" />
+    		<attr name="ListviewItemArt" format="reference" />
+    		<attr name="ListviewItemLineOne" format="reference" />
+    		<attr name="ListviewItemLineTwo" format="reference" />
+    		<attr name="ListviewDragHandle" format="reference" />
+    		<attr name="ListviewDragWrapper" format="reference" />
+    		<attr name="Listview" format="reference" />
+    		<attr name="Gridview" format="reference" />
+    		<attr name="GridviewItemWrapper" format="reference" />
+    		<attr name="GridviewItemArt" format="reference" />
+    		<attr name="GridviewItemTextWrapper" format="reference" />
+    		<attr name="GridviewRecentsWrapper" format="reference" />
+    		<attr name="GridviewRecentsArt" format="reference" />
+    		<attr name="GridviewRecentsShadowedText" format="reference" />
+    		<attr name="GridviewRecentsText" format="reference" />
+    		<attr name="ShadowedText" format="reference" />
+    		<attr name="Colorstrip" format="reference" />
+    		<attr name="HalfTextWrapper" format="reference" />
+    		<attr name="HalfTextViewMore" format="reference" />
+    		<attr name="LibraryWrapper" format="reference" />
+    		<attr name="LibraryTabsWrapper" format="reference" />
+    		<attr name="ShuffleWrapper" format="reference" />
+    		<attr name="ShuffleImage" format="reference" />
+    		<attr name="RecentlyAddedWrapper" format="reference" />
+    		<attr name="TracksBrowserWrapper" format="reference" />
+    		
+    		<!-- Resources needed to be grabbed by app directly from themes -->
+    		<attr name="AlbumArtNormal" format="reference" />
+    		<attr name="AlbumArtSmall" format="reference" />
+    		<attr name="AudioPauseButton" format="reference" />
+    		<attr name="AudioPlayButton" format="reference" />
+    		<attr name="AudioShuffleButton" format="reference" />
+    		<attr name="AudioRepeatButton" format="reference" />
+    		<attr name="AudioFavoritesButton" format="reference" />
+    		<attr name="AudioQueueButton" format="reference" />
+    		<attr name="AudioTextColor" format="reference" />
+    		
+		</declare-styleable>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cae3bdc..e66f1ca 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -4,12 +4,20 @@
     <!-- A transparent black -->
     <color name="transparent_black">#aa000000</color>
     
+    <color name="transparent_white">#aaffffff</color>
+    
     <!-- selected tab text -->
     <color name="selected_tabtext">#bb000000</color>
     
     <!-- non selected tab text -->
     <color name="unselected_tabtext">#77000000</color>
 
+    <!-- selected tab text -->
+    <color name="selected_tabtext_dark">#bbffffff</color>
+    
+    <!-- non selected tab text -->
+    <color name="unselected_tabtext_dark">#77ffffff</color>
+    
     <!-- A semi-transparent dark Holo shade of blue -->
     <color name="holo_blue_dark">#ff0099cc</color>
     
@@ -17,6 +25,10 @@
 
     <color name="background_grey">#ffdedede</color>
     
+    <color name="background_grey_dark">#ff1a1a1a</color>
+    
+    <color name="light_grey_dark">#ff262626</color>
+    
     <!-- Transparent -->
     <color name="transparent">#00000000</color>
 
@@ -26,6 +38,9 @@
     <!-- White -->
     <color name="white">#ffffffff</color>
     
+    <!-- Light Grey Text -->
+    <color name="light_grey">#ff888888</color>
+    
     <!-- Quick Queue line seperator -->
     <color name="actionbar_text">#eeffffff</color>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 90d5d7b..8edbf74 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -5,6 +5,7 @@
     <dimen name="text_size_extra_micro">10sp</dimen>
     <dimen name="text_size_micro">12sp</dimen>
     <dimen name="text_size_small">14sp</dimen>
+    <dimen name="text_size_small_medium">15sp</dimen>
     <dimen name="text_size_medium">16sp</dimen>
     <dimen name="text_size_large">18sp</dimen>
 
@@ -36,8 +37,8 @@
     <!-- ListView items -->
     <dimen name="listview_item_height">74dp</dimen>
     <dimen name="listview_items_padding_left_top">9dp</dimen>
-    <dimen name="listview_items_padding_small_top">4dp</dimen>
-    <dimen name="listview_items_padding_gp_top">16dp</dimen>
+    <dimen name="listview_items_padding_small_top">3dp</dimen>
+    <dimen name="listview_items_padding_gp_top">18dp</dimen>
     <dimen name="listview_items_padding_right">50dp</dimen>
     <dimen name="listview_items_padding_top_bottom">5dp</dimen>
     <dimen name="listview_items_padding_left_right">10dp</dimen>
@@ -77,6 +78,8 @@
     <dimen name="header_text_padding_left">15dp</dimen>
 
     <!-- GridView items -->
+    <dimen name="gridview_recent_album_art">67dp</dimen>
+    <dimen name="gridview_recent_item_height">100dp</dimen>
     <dimen name="gridview_image_width">152dp</dimen>
     <dimen name="gridview_image_height">132dp</dimen>
     <dimen name="gridview_item_fullheight">168dp</dimen>
@@ -96,8 +99,13 @@
     <dimen name="audio_player_info_container_padding">16dp</dimen>
     <dimen name="audio_player_artwork_padding">20dp</dimen>
     <dimen name="audio_player_controls_height">56dp</dimen>
-    <dimen name="audio_player_seek_bar_padding">10dp</dimen>
-    <dimen name="audio_player_button_container_padding">2dp</dimen>
+    <dimen name="audio_player_seek_bar_padding">3dp</dimen>
+    <dimen name="audio_player_button_container_padding">20dp</dimen>
+    <dimen name="audio_player_text_padding_top">10dp</dimen>
+    <dimen name="audio_player_text_padding_left">15dp</dimen>
+    <dimen name="audio_player_seek_padding_top_bottom">20dp</dimen>
+    <dimen name="audio_player_nowplaying_padding_top_bottom">12dp</dimen>
+    <dimen name="audio_player_nowplaying_padding_left">17dp</dimen>
 
     <!-- Recent Applications parameters -->
     <!-- How far the thumbnail for a recent app appears from left edge -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d484d2c..8dfcbe7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,9 +15,10 @@
     <string name="cd_play">Play and pause</string>
     <string name="cd_next">Skip forwards</string>
     <string name="cd_shuffle">Shuffle tracks</string>
+    <string name="cd_show_queue">Show now playing queue</string>
 
     <!-- AudioPlayer title -->
-    <string name="nowplaying">Now playing</string>
+    <string name="nowplaying">Now Playing</string>
 
     <!-- Used to indicate the number of albums for an artist -->
     <plurals name="Nalbums">
@@ -54,7 +55,7 @@
 
     <!-- Options MenuItems -->
     <string name="settings">Settings</string>
-    <string name="shuffle_all">Shuffle all</string>
+    <string name="shuffle_all">Shuffle All</string>
     <string name="share">Share</string>
     <string name="play_store">Play Store</string>
 
@@ -112,16 +113,18 @@
     <string name="eqalizer">Equalizer</string>
     <string name="header_interface">Interface</string>
     <string name="settings_storage_category">Storage</string>
-    <string name="themes">Themes</string>
-    <string name="apollo_themes">Select theme for Apollo</string>
-    <string name="select_theme">Select your theme</string>
+    <string name="themes">Theme Chooser</string>
+    <string name="themes_title">Theme Chooser</string>
+    <string name="themes_subtitle">Select theme for ApolloMod</string>
     <string name="version">ApolloMod Version</string>
     <string name="tab_visibility_title">Tab visibility</string>
     <string name="tab_visibility_summary">Choose which tabs are displayed</string>
     <string name="settings_delete_cache_title">Delete cache</string>
     <string name="settings_delete_cache_summary">Remove all cached images</string>
     <string name="delete_warning">This will permanently delete the cached image entries</string>
-    <string name="visualizer_title">Audio visualizer</string>
+    <string name="recents_title">Recents View Type</string>
+    <string name="recents_summary">Choose to the type of recents display to show</string>
+	<string name="visualizer_title">Audio visualizer</string>
     <string name="visualizer_summary">Choose to display audio visualizations during playback</string>
 	<string name="widget_style_title">Widget Style</string>
     <string name="widget_style_summary">Choose the widget design</string>
@@ -142,11 +145,12 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     
     <!-- Settings keys -->
     <string name="key_themes" translatable="false">themepreview</string>
-    <string name="key_themes_package" translatable="false">themePackageName</string>
+    <string name="key_current_theme" translatable="false">current_theme</string>
     <string name="key_themes_preferences" translatable="false">themePrefences</string>
     <string name="key_build_version" translatable="false">build_version</string>
     <string name="key_build_depends" translatable="false">build_depends</string>
     <string name="key_tabs_enabled" translatable="false">tabs_enabled</string>
+    <string name="key_recents_type" translatable="false">recents_type</string>
     <string name="key_visualization_type" translatable="false">visualization_type</string>
     <string name="key_widget_style" translatable="false">widget_type</string>
     <string name="key_delete_cache" translatable="false">delete_cache</string>
@@ -171,12 +175,22 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     <string name="tab_playlists">Playlists</string>
     <string name="tab_genres">Genres</string>
     
+    <!-- Recents -->
+    <string name="recents_added">Recently Added</string>
+    <string name="recents_played">Recently Played</string>
+    <string name="recents_split">Splitscreen</string>
+    
     <!-- Visualizations -->
     <string name="visual_none">None</string>
     <string name="visual_bargraph">Bar Graph</string>
     <string name="visual_solidbargraph">Solid Bar Graph</string>
     <string name="visual_waveform">Waveform</string>
-
+    
+    <!-- Themes -->
+    <string name="theme_light">Light Theme</string>
+    <string name="theme_dark">Dark Theme</string>
+    <string name="theme_black">Black Theme</string>
+    
     <!-- External file dialog -->
     <string name="play_external_question_msg">Select the action to apply to: \n\n<b><xliff:g id="name">%s</xliff:g></b></string>
     <string name="play_external_question_button_play">Play</string>
@@ -201,5 +215,8 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     <string name="simple_eq_band3">1kHz</string>
     <string name="simple_eq_band4">5kHz</string>
     <string name="simple_eq_band5">16kHz</string>
+    
+    <string name="recents_added">Recently Added</string>
+    <string name="recents_played">Recently Played</string>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4914031..2504ffc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ApolloTheme" parent="@android:style/Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
-    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
-    </style>
+    
+	<!-- 
+		GENERAL THEME STYLES
+	-->	    
+    <!--  ActionBar Styles -->
 	<style name="ApolloTheme.OverFlow" parent="@android:style/Widget.Holo.ActionButton.Overflow">
 	    <item name="android:src">@drawable/apollo_holo_dark_overflow</item>
 	</style>
@@ -15,23 +16,8 @@
 	<style name="ApolloTheme.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
 		<item name="android:textColor">@color/actionbar_text</item>
 	</style>
-
-    <!-- Translucent dialog (for @PlayExternal) -->
-    <style name="Theme.Light.Translucent" parent="android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-    <style name="Theme.Light.Translucent.Dialog" parent="@android:style/Theme.Holo.Light.Dialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Custom tabs -->
-    <style name="Tabs">
+    <!--  Tabs Styles -->
+    <style name="TabsLayout">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">@dimen/tab_height</item>
         <item name="android:background">@drawable/tab</item>
@@ -40,50 +26,777 @@
         <item name="android:paddingLeft">@dimen/tab_padding_left_right</item>
         <item name="android:paddingRight">@dimen/tab_padding_left_right</item>
         <item name="android:paddingTop">@dimen/tab_padding_top_bottom</item>
-        <item name="android:textColor">@color/tab_text_color</item>
-        <item name="android:textSize">@dimen/text_size_micro</item>
-        <item name="android:textStyle">bold</item>
         <item name="android:focusable">true</item>
         <item name="android:focusableInTouchMode">false</item>
         <item name="android:selectAllOnFocus">false</item>
+    </style>    
+    <!-- BottomActionBar Styles-->
+    <style name="BottomActionBarLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+	    <item name="android:paddingLeft">@dimen/bottom_action_bar_padding_left</item>
+	    <item name="android:paddingRight">@dimen/bottom_action_bar_padding_left</item>
+        <item name="android:orientation">horizontal</item>
     </style>
-
-    <!-- ImageButton in the bottom bar -->
-    <style name="BottomActionBarItem">
+    <style name="BottomActionBarWrapperLayout">        
+    	<item name="android:layout_width">match_parent</item>
+    	<item name="android:layout_height">@dimen/bottom_action_bar_height</item>
+    	<item name="android:layout_gravity">bottom</item>
+    	<item name="android:orientation">vertical</item> 
+    </style>
+    <style name="BottomActionBarOuterLayout">
+    	<item name="android:layout_width">match_parent</item> 
+    	<item name="android:layout_height">match_parent</item> 
+    	<item name="android:orientation">vertical</item>  
+    	<item name="android:clickable">true</item> 
+    	<item name="android:focusable">false</item> 
+    </style>
+    <style name="BottomActionBarItemLayout">
         <item name="android:layout_width">@dimen/bottom_action_bar_item_width</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:paddingLeft">@dimen/bottom_action_bar_item_padding_left_right</item>
         <item name="android:paddingRight">@dimen/bottom_action_bar_item_padding_left_right</item>
-        <item name="android:background">@drawable/holo_selector</item>
     </style>
-
-    <!-- TextView in the bottom bar -->
-    <style name="BottomActionBarText">
+    <style name="BottomActionBarTextLayout">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:ellipsize">end</item>
         <item name="android:singleLine">true</item>
         <item name="android:paddingTop">3dp</item>
-        <item name="android:textSize">@dimen/text_size_extra_micro</item>
+	    <item name="android:paddingLeft">@dimen/bottom_action_bar_padding_left</item>
+	    <item name="android:textSize">@dimen/text_size_micro</item>
         <item name="android:textAllCaps">true</item>
     </style>
-
-    <!-- List separator with a blue underline -->
-    <style name="SeparatorTextViewStyle">
+    <style name="BottomActionBarDividerLayout">
         <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/bottom_action_bar_divider_height</item>
+    </style> 	
+    <!-- AudioPlayer Styles -->
+    <style name="AudioPlayerAlbumArtLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:scaleType">matrix</item>
+    </style>
+    <style name="AudioPlayerTextLayout">
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">@dimen/list_separator_min_height</item>
-        <item name="android:background">@drawable/list_section_divider_holo_custom</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/holo_blue_dark</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingRight">@dimen/list_separator_padding_left_right</item>
-        <item name="android:visibility">gone</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:focusableInTouchMode">true</item>
+        <item name="android:lineSpacingMultiplier">1.2</item>
+        <item name="android:scrollHorizontally">false</item>
+    </style>
+    <style name="AudioPlayerAlbumArtistTextLayout" parent="AudioPlayerTextLayout">        
+        <item name="android:layout_width">70dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_marginTop">0dp</item>
+    </style>
+    <style name="AudioPlayerInfoTextLayout" parent="AudioPlayerTextLayout">  
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">0dp</item>
         <item name="android:ellipsize">end</item>
+        <item name="android:maxLength">21</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textAllCaps">true</item>
     </style>
+    <style name="AudioPlayerViewMoreLayout">  
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginRight">15dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+	    <item name="android:padding">@dimen/half_and_half_imagebutton_padding</item>
+    </style>    
+    <style name="AudioPlayerButtonLayout">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+    <style name="AudioPlayerTimeTextLayout" parent="AudioPlayerTextLayout">
+        <item name="android:layout_alignBottom">@android:id/progress</item>
+        <item name="android:layout_alignTop">@android:id/progress</item>
+        <item name="android:gravity">center</item>
+    </style>    
+    <style name="AudioPlayerNowPlayingTextLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">@dimen/audio_player_nowplaying_padding_top_bottom</item>
+        <item name="android:paddingBottom">@dimen/audio_player_nowplaying_padding_top_bottom</item>
+        <item name="android:paddingLeft">@dimen/audio_player_nowplaying_padding_left</item>
+        <item name="android:layout_alignBottom">@+id/now_playing_viewpager</item>
+        <item name="android:text">@string/nowplaying</item>
+    </style>    
+    <style name="AudioPlayerQueueBGLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+    <style name="AudioPlayerColorstripLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/colorstrip_height</item>
+    </style>
+    <style name="AudioPlayerSeekLayout" parent="android:attr/progressBarStyleHorizontal">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_toLeftOf">@+id/audio_player_total_time</item>
+        <item name="android:layout_toRightOf">@+id/audio_player_current_time</item>
+        <item name="android:paddingTop">@dimen/audio_player_seek_bar_padding</item>
+        <item name="android:thumb">@null</item>
+    </style>
+    <!-- Context Menu Styles -->
+    <style name="ContextMenuLineLayout">
+        <item name="android:layout_width">@dimen/quick_context_line_width</item>
+        <item name="android:layout_height">@dimen/quick_context_line_height</item>
+        <item name="android:layout_gravity">center|left</item>
+    </style>
+    <style name="ContextMenuArrowLayout">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_marginRight">@dimen/quick_context_margin_right</item>
+        <item name="android:scaleType">centerInside</item>
+    </style>
+    <!--  Listview Styles -->    
+    <style name="ListviewItemWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/listview_item_height</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingBottom">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>   
+    <style name="ListviewItemArtLayout">
+        <item name="android:layout_width">@dimen/listview_album_art</item>
+        <item name="android:layout_height">@dimen/listview_album_art</item>
+        <item name="android:layout_alignParentLeft">true</item> 
+        <item name="android:layout_margin">@dimen/listview_album_margin</item> 
+        <item name="android:scaleType">centerCrop</item> 
+    </style>
+    <style name="ListviewItemLineOneLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_toRightOf">@+id/listview_item_image</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:maxLength">29</item>
+        <item name="android:paddingLeft">@dimen/listview_items_padding_left_top</item>
+        <item name="android:paddingRight">@dimen/listview_items_padding_right</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_left_top</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textSize">@dimen/text_size_small_medium</item> 
+    </style>    
+    <style name="ListviewItemLineTwoLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">@dimen/listview_items_padding_left_top</item>
+        <item name="android:paddingRight">@dimen/listview_items_padding_right</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_small_top</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_below">@+id/listview_item_line_one</item>
+        <item name="android:layout_toRightOf">@+id/listview_item_image</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:textSize">@dimen/text_size_small</item> 
+    </style> 
+    <style name="ListviewLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">0dp</item> 
+        <item name="android:layout_weight">1</item> 
+        <item name="android:drawSelectorOnTop">false</item> 
+        <item name="android:fastScrollAlwaysVisible">false</item> 
+        <item name="android:fastScrollEnabled">false</item> 
+        <item name="android:scrollbars">none</item> 
+        <item name="android:dividerHeight">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingRight">@dimen/listview_items_padding_top_bottom</item>  
+        <item name="android:paddingLeft">@dimen/listview_items_padding_top_bottom</item> 
+    </style>
+    <!-- Dragsort Listview Styles -->
+    <style name="ListviewDragHandleLayout">
+        <item name="android:layout_width">@dimen/listview_drag_width</item> 
+        <item name="android:layout_height">@dimen/listview_drag_height</item> 
+        <item name="android:layout_alignParentLeft">true</item> 
+        <item name="android:scaleType">center</item> 
+    </style>
+    <style name="ListviewDragWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:drawSelectorOnTop">false</item>
+        <item name="android:fastScrollAlwaysVisible">false</item>
+        <item name="android:fastScrollEnabled">false</item>
+        <item name="android:scrollbars">none</item>
+        <item name="android:dividerHeight">@dimen/listview_items_padding_top_bottom</item>
+        <item name="android:paddingRight">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingLeft">@dimen/listview_items_padding_top_bottom</item>
+    </style>
+    <!-- Gridview Styles -->    
+    <style name="GridviewLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">0dp</item> 
+        <item name="android:layout_weight">1</item> 
+        <item name="android:paddingLeft">@dimen/gridview_item_padding_right_left_outer</item> 
+        <item name="android:paddingRight">@dimen/gridview_item_padding_right_left_outer</item> 
+        <item name="android:drawSelectorOnTop">true</item> 
+        <item name="android:numColumns">@integer/gridview_columns</item> 
+        <item name="android:scrollbars">none</item> 
+    </style>
+    <style name="GridviewItemWrapperLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">match_parent</item>  
+    </style>
+    <style name="GridviewItemArtLayout"> 
+        <item name="android:layout_width">@dimen/gridview_image_width</item>  
+        <item name="android:layout_height">@dimen/gridview_image_height</item>  
+        <item name="android:scaleType">matrix</item> 
+    </style>
+    <style name="GridviewItemTextWrapperLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">@dimen/gridview_item_ccontainer_height</item> 
+        <item name="android:gravity">center_vertical</item> 
+        <item name="android:orientation">vertical</item> 
+        <item name="android:paddingLeft">@dimen/gridview_item_ccontainer_padding_left</item> 
+        <item name="android:paddingRight">@dimen/gridview_item_ccontainer_padding_right</item>
+    </style>
+    
+    <!-- Recents Gridview Styles -->
+    <style name="GridviewRecentsWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/gridview_recent_item_height</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingBottom">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+    <style name="GridviewRecentsArtLayout">
+        <item name="android:layout_width">@dimen/gridview_image_width</item>
+        <item name="android:layout_height">@dimen/gridview_recent_album_art</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:scaleType">matrix</item> 
+    </style>
+    <style name="GridviewRecentsShadowedTextLayout" parent="ShadowedTextLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">wrap_content</item> 
+        <item name="android:layout_alignBottom">@+id/gridview_image</item> 
+        <item name="android:ellipsize">end</item> 
+        <item name="android:maxLength">49</item> 
+        <item name="android:padding">4dp</item> 
+        <item name="android:singleLine">true</item> 
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
+    <style name="GridviewRecentsTextLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_below">@+id/gridview_image</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_small_top</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textSize">@dimen/text_size_micro</item>        
+    </style>
+        
+    <!-- Shadowed Text Styles-->
+    <style name="ShadowedTextLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:shadowRadius">1.5</item>
+	    <item name="android:shadowDx">1</item>
+	    <item name="android:shadowDy">1</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
+    
+    <!-- Colorstrip Style -->
+    <style name="ColorstripLayout">        
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">@dimen/colorstrip_height</item>
+    </style>
+    
+    <!-- Half & Half Styles -->
+    <style name="HalfTextWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/half_and_half_text_wrap_height</item>
+        <item name="android:layout_alignBottom">@+id/half_artist_image</item>
+        <item name="android:paddingTop">@dimen/gridview_item_ccontainer_padding_left</item>
+        <item name="android:paddingBottom">@dimen/gridview_item_ccontainer_padding_left</item>
+        <item name="android:paddingLeft">@dimen/gridview_item_ccontainer_padding_left</item>
+        <item name="android:paddingRight">@dimen/gridview_item_ccontainer_padding_right</item>
+    </style>
+    <style name="HalfTextViewMoreLayout">
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:visibility">gone</item>
+        <item name="android:padding">@dimen/half_and_half_imagebutton_padding</item>
+    </style>
+    
+    <!-- Library Browser Styles -->
+    <style name="LibraryWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:paddingTop">?android:attr/actionBarSize</item>
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">false</item>
+        <item name="android:focusableInTouchMode">true</item>        
+    </style>
+    <style name="LibraryTabsWrapperLayout">
+        <item name="android:layout_width">match_parent</item>  
+        <item name="android:layout_height">@dimen/tab_height</item>  
+    </style>
+    
+    <!-- Shuffle Styles -->
+    <style name="ShuffleWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">55dp</item>
+        <item name="android:paddingRight">10dp</item> 
+        <item name="android:paddingLeft">10dp</item> 
+        <item name="android:paddingBottom">13dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+    <style name="ShuffleImageLayout">
+        <item name="android:layout_width">25dp</item>
+        <item name="android:layout_height">25dp</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:scaleType">centerCrop</item>
+        <item name="android:layout_marginTop">13dp</item> 
+        <item name="android:layout_marginLeft">16dp</item> 
+	</style>
+    
+    <!-- Track Browser Styles -->
+    <style name="TracksBrowserWrapperLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">match_parent</item>
+    </style>
+    
+	<!-- 
+		// GENERAL THEME STYLES
+	-->	
+	
+	
+	
+	
+	
+	
+	
+    <!--  *************************************************************** -->
+    
+    
+    
+    
+    
+    
+    
+    
+	<!-- 
+		LIGHT THEME STYLES
+	-->	
+	
+    <!-- Tabs -->
+    <style name="Tabs_Light" parent="TabsLayout">
+        <item name="android:textColor">@color/tab_text_color</item>
+        <item name="android:textSize">@dimen/text_size_micro</item>
+        <item name="android:textStyle">bold</item>
+    </style> 
+    
+    <style name="PlaylistDialog_Light" parent="@android:style/Theme.Holo.Light.Dialog.NoActionBar" ></style>
+    
+	<!-- BottomActionBar -->  
+	<style name="BottomActionBar_Light" parent="BottomActionBarLayout">
+        <item name="android:background">@drawable/holo_selector</item>
+	</style>
+    <style name="BottomActionBarWrapper_Light" parent="BottomActionBarWrapperLayout"></style>
+    <style name="BottomActionBarItem_Light" parent="BottomActionBarItemLayout">
+		<item name="android:background">@drawable/holo_selector</item>
+	</style>    
+    <style name="BottomActionBarOuter_Light" parent="BottomActionBarOuterLayout">
+    	<item name="android:background">@color/white</item> 
+    </style>
+    <style name="BottomActionBarText_Light" parent="BottomActionBarTextLayout">
+	    <item name="android:textColor">@color/transparent_black</item>
+    </style>    
+    <style name="BottomActionBarFavorites_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_favorite</item>
+        <item name="android:src">@drawable/apollo_holo_light_favorite_normal</item>
+    </style>
+    <style name="BottomActionBarPrevious_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_light_previous</item>
+    </style>
+    <style name="BottomActionBarPlay_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_light_play</item>
+    </style>
+    <style name="BottomActionBarNext_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_light_next</item>
+    </style>
+    <style name="BottomActionBarNowQueue_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_show_queue</item>
+        <item name="android:src">@drawable/btn_switch_queue</item>
+    </style>
+    <style name="BottomActionBarDivider_Light" parent="BottomActionBarDividerLayout">
+        <item name="android:background">@color/holo_blue_dark</item>
+    </style>    
+    
+    <!-- AudioPlayer Styles -->
+    <style name="AudioPlayerAlbumArt_Light" parent="AudioPlayerAlbumArtLayout">
+        <item name="android:src">@drawable/no_art_normal</item>
+    </style>
+    <style name="AudioPlayerText_Light" parent="AudioPlayerTextLayout"></style>
+    <style name="AudioPlayerAlbumArtistText_Light" parent="AudioPlayerAlbumArtistTextLayout">
+        <item name="android:textColor">@color/transparent_black</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+        <item name="android:textStyle">bold</item>
+    </style>    
+    <style name="AudioPlayerInfoText_Light" parent="AudioPlayerInfoTextLayout">
+        <item name="android:textColor">@color/transparent_black</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>    
+    <style name="AudioPlayerViewMore_Light" parent="AudioPlayerViewMoreLayout"> 
+        <item name="android:src">@drawable/view_more_now</item>
+        <item name="android:background">@drawable/holo_selector</item>
+    </style>    
+    <style name="AudioPlayerButton_Light" parent="AudioPlayerButtonLayout">
+        <item name="android:background">@drawable/holo_selector</item>
+    </style>
+    <style name="AudioPlayerTimeText_Light" parent="AudioPlayerTimeTextLayout">
+        <item name="android:textColor">@color/transparent_black</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
+    <style name="AudioPlayerNowPlayingText_Light" parent="AudioPlayerNowPlayingTextLayout">        
+        <item name="android:background">@drawable/transparent_black</item>
+		<item name="android:textColor">@color/white</item>
+		<item name="android:textSize">@dimen/text_size_medium</item>
+    </style>    
+    <style name="AudioPlayerQueueBG_Light" parent="AudioPlayerQueueBGLayout">
+        <item name="android:background">@color/background_grey</item>
+    </style>
+    <style name="AudioPlayerColorstrip_Light" parent="AudioPlayerColorstripLayout">
+        <item name="android:background">@color/holo_blue_dark</item>
+    </style>
+    <style name="AudioPlayerColorstripShadow_Light" parent="AudioPlayerColorstripLayout">
+        <item name="android:background">@drawable/colorstrip_shadow</item>
+    </style>    
+    <style name="AudioPlayerPrevious_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_light_previous</item> 
+    </style>
+    <style name="AudioPlayerPlay_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_light_pause</item> 
+    </style>
+    <style name="AudioPlayerNext_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_light_next</item> 
+    </style>
+    <style name="AudioPlayerRepeat_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_repeat</item>
+        <item name="android:src">@drawable/apollo_holo_light_repeat_normal</item> 
+    </style>
+    <style name="AudioPlayerShuffle_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_shuffle</item>
+        <item name="android:src">@drawable/apollo_holo_light_shuffle_normal</item> 
+    </style>
+    <style name="AudioPlayerSeek_Light" parent="AudioPlayerSeekLayout">  
+        <item name="android:progressDrawable">@drawable/audio_player_seekbar</item>
+    </style>
+    
+    <!-- Context Menu Styles -->
+    <style name="ContextMenuLine_Light" parent="ContextMenuLineLayout">
+        <item name="android:background">@color/transparent_black</item>
+    </style>
+    <style name="ContextMenuArrow_Light" parent="ContextMenuArrowLayout">
+        <item name="android:src">@drawable/dropdown_ic_arrow_normal_holo_light</item>
+    </style>
+    
+    <!--  Listview Styles -->    
+    <style name="ListviewItemWrapper_Light" parent="ListviewItemWrapperLayout">
+        <item name="android:background">@drawable/listview_item_background</item>
+    </style>
+    <style name="ListviewItemArt_Light" parent="ListviewItemArtLayout">
+        <item name="android:background">@drawable/no_art_small</item>
+    </style>
+    <style name="ListviewItemLineOne_Light" parent="ListviewItemLineOneLayout">
+        <item name="android:textColor">@color/black</item> 
+    </style>
+    <style name="ListviewItemLineTwo_Light" parent="ListviewItemLineTwoLayout">
+        <item name="android:textColor">@color/light_grey</item>
+    </style>
+    <style name="Listview_Light" parent="ListviewLayout">
+        <item name="android:listSelector">@drawable/holo_selector</item> 
+        <item name="android:background">@color/background_grey</item> 
+        <item name="android:divider">@android:color/transparent</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+  
+    <!-- Dragsort Listview Styles -->
+    <style name="ListviewDragHandle_Light" parent="ListviewDragHandleLayout">
+        <item name="android:src">@drawable/btn_drag_sort</item>
+    </style>
+    <style name="ListviewDragWrapper_Light" parent="ListviewDragWrapperLayout">
+        <item name="android:cacheColorHint">@color/transparent</item>
+        <item name="android:listSelector">@drawable/holo_selector</item>
+        <item name="android:background">@color/background_grey</item>
+        <item name="android:divider">@android:color/transparent</item>
+    </style>
+    
+    <!-- Gridview Styles -->
+    <style name="Gridview_Light" parent="GridviewLayout">
+        <item name="android:background">@color/background_grey</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+    <style name="GridviewItemWrapper_Light" parent="GridviewItemWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background</item>  
+    </style>
+    <style name="GridviewItemArt_Light" parent="GridviewItemArtLayout"> 
+        <item name="android:background">@drawable/no_art_small</item> 
+    </style>
+    <style name="GridviewItemTextWrapper_Light" parent="GridviewItemTextWrapperLayout">
+        <item name="android:background">@drawable/transparent_black</item>  
+    </style>
+    <!-- Recents Gridview Styles -->
+    <style name="GridviewRecentsWrapper_Light" parent="GridviewRecentsWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background</item>
+    </style>
+    <style name="GridviewRecentsArt_Light" parent="GridviewRecentsArtLayout">
+        <item name="android:background">@drawable/no_art_small</item>
+    </style>
+    <style name="GridviewRecentsShadowedText_Light" parent="GridviewRecentsShadowedTextLayout"> 
+        <item name="android:shadowColor">@color/black</item>
+        <item name="android:textColor">@color/white</item> 
+        <item name="android:background">@drawable/transparent_black</item>
+    </style>
+    <style name="GridviewRecentsText_Light" parent="GridviewRecentsTextLayout">
+        <item name="android:textColor">@color/light_grey</item>      
+    </style>
+    
+    <!-- Shadowed Text Style-->
+    <style name="ShadowedText_Light" parent="ShadowedTextLayout">
+        <item name="android:shadowColor">@color/black</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+    
+    <!-- Colorstrip Style -->
+    <style name="Colorstrip_Light" parent="ColorstripLayout">   
+        <item name="android:background">@color/holo_blue_dark</item> 
+    </style>
+    
+    <!-- Half & Half Styles -->
+    <style name="HalfTextWrapper_Light" parent="HalfTextWrapperLayout">
+        <item name="android:background">@drawable/transparent_black</item>
+    </style>    
+    <style name="HalfTextViewMore_Light" parent="HalfTextViewMoreLayout">
+        <item name="android:src">@drawable/view_more_album</item>
+        <item name="android:background">@color/transparent</item>
+    </style>
+    
+    <!-- Library Browser Styles -->
+    <style name="LibraryWrapper_Light" parent="LibraryWrapperLayout">
+        <item name="android:background">@color/background_grey</item>        
+    </style>
+    <style name="LibraryTabsWrapper_Light" parent="LibraryTabsWrapperLayout">
+        <item name="android:background">@color/white</item>  
+    </style>    
+    
+    <!-- Shuffle Styles -->
+    <style name="ShuffleWrapper_Light" parent="ShuffleWrapperLayout">
+        <item name="android:background">@drawable/shuffle_background</item>
+    </style>
+    <style name="ShuffleImage_Light" parent="ShuffleImageLayout">
+        <item name="android:background">@drawable/apollo_holo_light_shuffle_normal</item>
+	</style>
+    
+    <style name="RecentlyAddedWrapper_Light" parent="ShuffleWrapperLayout">
+        <item name="android:padding">0dp</item>
+        <item name="android:layout_height">60dp</item>
+        <item name="android:background">@drawable/recent_header_background</item>
+    </style>
+    
+    <!-- Track Browser Styles -->
+    <style name="TracksBrowserWrapper_Light" parent="TracksBrowserWrapperLayout">
+        <item name="android:background">@color/background_grey</item> 
+    </style>
+    
+	<!-- 
+		// LIGHT THEME STYLES
+	-->	
+    
+    
+    
+    
+    
+    
+    
+	<!-- 
+		DARK THEME STYLES
+	-->	
+    <style name="PlaylistDialog_Dark" parent="@android:style/Theme.Holo.Dialog.NoActionBar" ></style>
+  
+    <!-- Tabs -->
+    <style name="Tabs_Dark" parent="TabsLayout">
+        <item name="android:textColor">@color/tab_text_color_dark</item>
+        <item name="android:textSize">@dimen/text_size_micro</item>
+        <item name="android:textStyle">bold</item>
+    </style> 
+    <style name="BottomActionBarOuter_Dark" parent="BottomActionBarOuterLayout">
+    	<item name="android:background">@color/light_grey_dark</item> 
+    </style>
+    <style name="BottomActionBarText_Dark" parent="BottomActionBarTextLayout">
+	    <item name="android:textColor">@color/transparent_white</item>
+    </style>    
+    <style name="BottomActionBarFavorites_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_favorite</item>
+        <item name="android:src">@drawable/apollo_holo_dark_favorite_normal</item>
+    </style>
+    <style name="BottomActionBarPrevious_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_dark_prev</item>
+    </style>
+    <style name="BottomActionBarPlay_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_dark_play</item>
+    </style>
+    <style name="BottomActionBarNext_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_dark_next</item>
+    </style>
+    <style name="BottomActionBarNowQueue_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_show_queue</item>
+        <item name="android:src">@drawable/btn_switch_queue_dark</item>
+    </style>
+    <style name="AudioPlayerAlbumArt_Dark" parent="AudioPlayerAlbumArtLayout">
+        <item name="android:src">@drawable/no_art_normal_dark</item>
+    </style>
+    <style name="AudioPlayerAlbumArtistText_Dark" parent="AudioPlayerAlbumArtistTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+        <item name="android:textStyle">bold</item>
+    </style>     
+    <style name="AudioPlayerInfoText_Dark" parent="AudioPlayerInfoTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>    
+    <style name="AudioPlayerViewMore_Dark" parent="AudioPlayerViewMoreLayout"> 
+        <item name="android:src">@drawable/view_more_now_dark</item>
+        <item name="android:background">@drawable/holo_selector</item>
+    </style>    
+    <style name="AudioPlayerTimeText_Dark" parent="AudioPlayerTimeTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
+    <style name="AudioPlayerQueueBG_Dark" parent="AudioPlayerQueueBGLayout">
+        <item name="android:background">@color/background_grey_dark</item>
+    </style>
+    <style name="AudioPlayerPrevious_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_dark_prev</item> 
+    </style>
+    <style name="AudioPlayerPlay_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_dark_pause</item> 
+    </style>
+    <style name="AudioPlayerNext_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_dark_next</item> 
+    </style>
+    <style name="AudioPlayerRepeat_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_repeat</item>
+        <item name="android:src">@drawable/apollo_holo_light_repeat_normal</item> 
+    </style>
+    <style name="AudioPlayerShuffle_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_shuffle</item>
+        <item name="android:src">@drawable/apollo_holo_dark_shuffle_normal</item> 
+    </style>
+    <style name="AudioPlayerSeek_Dark" parent="AudioPlayerSeekLayout">  
+        <item name="android:progressDrawable">@drawable/audio_player_seekbar_dark</item>
+    </style>
+    
+    <!-- Context Menu Styles -->
+    <style name="ContextMenuLine_Dark" parent="ContextMenuLineLayout">
+        <item name="android:background">@color/transparent_white</item>
+    </style>
+    <style name="ContextMenuArrow_Dark" parent="ContextMenuArrowLayout">
+        <item name="android:src">@drawable/dropdown_ic_arrow_normal_holo_dark</item>
+    </style>
+    
+    
+    <!-- Library Browser Styles -->
+    <style name="LibraryWrapper_Dark" parent="LibraryWrapperLayout">
+        <item name="android:background">@color/background_grey_dark</item>        
+    </style>
+    <style name="ListviewItemArt_Dark" parent="ListviewItemArtLayout">
+        <item name="android:background">@drawable/no_art_small_dark</item>
+    </style>
+    <style name="LibraryTabsWrapper_Dark" parent="LibraryTabsWrapperLayout">
+        <item name="android:background">@color/light_grey_dark</item>  
+    </style>    
+    
+    <style name="ListviewItemWrapper_Dark" parent="ListviewItemWrapperLayout">
+        <item name="android:background">@drawable/listview_item_background_dark</item>
+    </style>
+    <style name="ListviewItemLineOne_Dark" parent="ListviewItemLineOneLayout">
+        <item name="android:textColor">@color/white</item> 
+    </style>
+    <style name="ListviewItemLineTwo_Dark" parent="ListviewItemLineTwoLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+    </style>
+    <style name="Listview_Dark" parent="ListviewLayout">
+        <item name="android:listSelector">@drawable/holo_selector</item> 
+        <item name="android:background">@color/background_grey_dark</item> 
+        <item name="android:divider">@android:color/transparent</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+    <style name="ListviewDragHandle_Dark" parent="ListviewDragHandleLayout">
+        <item name="android:src">@drawable/btn_drag_sort_dark</item>
+    </style>
+    <style name="ListviewDragWrapper_Dark" parent="ListviewDragWrapperLayout">
+        <item name="android:cacheColorHint">@color/transparent</item>
+        <item name="android:listSelector">@drawable/holo_selector</item>
+        <item name="android:background">@color/background_grey_dark</item>
+        <item name="android:divider">@android:color/transparent</item>
+    </style>
+  
+    <style name="Gridview_Dark" parent="GridviewLayout">
+        <item name="android:background">@color/background_grey_dark</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+    <style name="GridviewItemArt_Dark" parent="GridviewItemArtLayout"> 
+        <item name="android:background">@drawable/no_art_small_dark</item> 
+    </style>
+    <style name="GridviewItemWrapper_Dark" parent="GridviewItemWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background_dark</item>  
+    </style>
+    <style name="GridviewRecentsArt_Dark" parent="GridviewRecentsArtLayout">
+        <item name="android:background">@drawable/no_art_small_dark</item>
+    </style>
+    <style name="GridviewRecentsWrapper_Dark" parent="GridviewRecentsWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background_dark</item>  
+    </style>
+    <style name="GridviewRecentsText_Dark" parent="GridviewRecentsTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>      
+    </style>
+    
+    <style name="ShuffleWrapper_Dark" parent="ShuffleWrapperLayout">
+        <item name="android:background">@drawable/shuffle_background_dark</item>
+        <item name="android:textColor">@color/transparent_white</item>
+    </style>
+    <style name="ShuffleImage_Dark" parent="ShuffleImageLayout">
+        <item name="android:background">@drawable/apollo_holo_dark_shuffle_normal</item>
+	</style>
+    
+    <style name="RecentlyAddedWrapper_Dark" parent="ShuffleWrapperLayout">
+        <item name="android:padding">0dp</item>
+        <item name="android:layout_height">60dp</item>
+        <item name="android:background">@drawable/recent_header_background_dark</item>
+    </style>
+    
+    <!-- Track Browser Styles -->
+    <style name="TracksBrowserWrapper_Dark" parent="TracksBrowserWrapperLayout">
+        <item name="android:background">@color/background_grey_dark</item> 
+    </style>
+    
+    
+
+   
+
     <!-- Notification bar button -->
     <style name="StatusBarButton">
         <item name="android:layout_width">@dimen/status_bar_button_width_height</item>
@@ -102,19 +815,6 @@
         <item name="android:singleLine">true</item>
     </style>
 
-    <!-- Half and half layout -->
-    <style name="HalfText">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@color/transparent_black</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">@dimen/half_and_half_text_padding</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">@dimen/text_size_small</item>
-    </style>
-
     <!-- ContextMenu header text -->
     <style name="HeaderText">
         <item name="android:layout_width">match_parent</item>
@@ -130,18 +830,6 @@
         <item name="android:textSize">@dimen/text_size_large</item>
     </style>
 
-    <!-- TextView in shown over the images in the GridView -->
-    <style name="GridViewTextItem">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:shadowColor">@color/white</item>
-        <item name="android:shadowRadius">1</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">@dimen/text_size_medium</item>
-    </style>
-
     <!-- Now playing indicator -->
     <style name="PeakMeter">
         <item name="android:layout_width">wrap_content</item>
@@ -149,49 +837,15 @@
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
-    <!-- TextView in the audio player -->
-    <style name="AudioPlayerText">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:focusable">true</item>
-        <item name="android:focusableInTouchMode">true</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:scrollHorizontally">true</item>
-    </style>
-    
-    <!--  TextView with drop-shadow and white text -->
-    <style name="ShadowedText" parent="AudioPlayerText">        
-	    <item name="android:shadowColor">#000000</item>
-	    <item name="android:shadowDx">1</item>
-	    <item name="android:shadowDy">1</item>
-	    <item name="android:shadowRadius">1.5</item> 
-    </style>
     
     <!--  TextView with drop-shadow and white text -->
-    <style name="GridviewShadowedText" parent="GridViewTextItem">        
+    <style name="ShadowedText" parent="AudioPlayerTextLayout">        
 	    <item name="android:shadowColor">#000000</item>
 	    <item name="android:shadowDx">1</item>
 	    <item name="android:shadowDy">1</item>
 	    <item name="android:shadowRadius">1.5</item> 
     </style>
-
-    <!--  Black top border  -->
-    <style name="Topborderline"> 
-	    <item name="android:layout_width">match_parent</item>
-	    <item name="android:layout_height">2dp</item>
-	    <item name="android:background">@color/black</item>
-    </style>
     
-    <!-- ImageButton in the audio player controls -->
-    <style name="AudioPlayerButton">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:background">@drawable/holo_selector</item>
-    </style>
-
     <!-- QuickQueue -->
     <style name="Theme.QuickQueue" parent="@android:style/Theme.Holo.Light">
         <item name="android:windowBackground">@color/transparent</item>
@@ -234,4 +888,24 @@
         <item name="android:src">@drawable/apollo_holo_light_overflow</item>
     </style>
     
+    
+    
+    
+    <!-- Translucent dialog (for @PlayExternal) -->
+    <style name="Light.Translucent" parent="android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
+    <style name="Light.Translucent.Dialog" parent="@android:style/Theme.Holo.Light.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+    
+    
+    
+    
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
new file mode 100644
index 0000000..698f911
--- /dev/null
+++ b/res/values/themes.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+    <style name="ApolloTheme.Light" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
+    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
+    	
+    	<item name="PlaylistDialog">@style/PlaylistDialog_Light</item>
+    	<item name="Tabs">@style/Tabs_Light</item>
+    	
+    	<item name="AlbumArtNormal">@drawable/no_art_normal</item>
+    	<item name="AlbumArtSmall">@drawable/no_art_small</item>
+    	<item name="AudioPlayButton">@drawable/apollo_holo_light_play</item>
+    	<item name="AudioPauseButton">@drawable/apollo_holo_light_pause</item>
+    	<item name="AudioShuffleButton">@drawable/apollo_holo_light_shuffle_normal</item>
+    	<item name="AudioRepeatButton">@drawable/apollo_holo_light_repeat_normal</item>
+    	<item name="AudioFavoritesButton">@drawable/apollo_holo_light_favorite_normal</item>
+    	<item name="AudioQueueButton">@drawable/btn_switch_queue</item>
+    	<item name="AudioTextColor">@color/transparent_black</item>
+    	
+    	<item name="BottomActionBarItem">@style/BottomActionBarItem_Light</item>
+    	<item name="BottomActionBarText">@style/BottomActionBarText_Light</item>
+    	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
+    	<item name="BottomActionBar">@style/BottomActionBar_Light</item>
+    	<item name="BottomActionBarWrapper">@style/BottomActionBarWrapper_Light</item>
+    	<item name="BottomActionBarOuter">@style/BottomActionBarOuter_Light</item>
+    	<item name="BottomActionBarFavorites">@style/BottomActionBarFavorites_Light</item>
+    	<item name="BottomActionBarPrevious">@style/BottomActionBarPrevious_Light</item>
+    	<item name="BottomActionBarPlay">@style/BottomActionBarPlay_Light</item>
+    	<item name="BottomActionBarNext">@style/BottomActionBarNext_Light</item>
+    	<item name="BottomActionBarNowQueue">@style/BottomActionBarNowQueue_Light</item>
+    	
+    	<item name="AudioPlayerAlbumArt">@style/AudioPlayerAlbumArt_Light</item>
+    	<item name="AudioPlayerText">@style/AudioPlayerText_Light</item>
+    	<item name="AudioPlayerArtistAlbumText">@style/AudioPlayerAlbumArtistText_Light</item>
+    	<item name="AudioPlayerInfoText">@style/AudioPlayerInfoText_Light</item>
+    	<item name="AudioPlayerViewMore">@style/AudioPlayerViewMore_Light</item>
+    	<item name="AudioPlayerButton">@style/AudioPlayerButton_Light</item>
+    	<item name="AudioPlayerTimeText">@style/AudioPlayerTimeText_Light</item>
+    	<item name="AudioPlayerNowPlayingText">@style/AudioPlayerNowPlayingText_Light</item>
+    	<item name="AudioPlayerQueueBG">@style/AudioPlayerQueueBG_Light</item>
+    	<item name="AudioPlayerColorstrip">@style/AudioPlayerColorstrip_Light</item>
+    	<item name="AudioPlayerColorstripShadow">@style/AudioPlayerColorstripShadow_Light</item>
+    	<item name="AudioPlayerPrevious">@style/AudioPlayerPrevious_Light</item>
+    	<item name="AudioPlayerPlay">@style/AudioPlayerPrevious_Light</item>
+    	<item name="AudioPlayerNext">@style/AudioPlayerNext_Light</item>
+    	<item name="AudioPlayerRepeat">@style/AudioPlayerRepeat_Light</item>
+    	<item name="AudioPlayerShuffle">@style/AudioPlayerShuffle_Light</item>
+    	<item name="AudioPlayerSeek">@style/AudioPlayerSeek_Light</item>
+    	
+    	<item name="ContextMenuLine">@style/ContextMenuLine_Light</item>
+    	<item name="ContextMenuArrow">@style/ContextMenuArrow_Light</item>
+    	
+    	<item name="ListviewItemWrapper">@style/ListviewItemWrapper_Light</item>
+    	<item name="ListviewItemArt">@style/ListviewItemArt_Light</item>
+    	<item name="ListviewItemLineOne">@style/ListviewItemLineOne_Light</item>
+    	<item name="ListviewItemLineTwo">@style/ListviewItemLineTwo_Light</item>
+    	<item name="Listview">@style/Listview_Light</item>
+    	<item name="ListviewDragHandle">@style/ListviewDragHandle_Light</item>
+    	<item name="ListviewDragWrapper">@style/ListviewDragWrapper_Light</item>
+    	
+    	<item name="Gridview">@style/Gridview_Light</item>
+    	<item name="GridviewItemWrapper">@style/GridviewItemWrapper_Light</item>
+    	<item name="GridviewItemArt">@style/GridviewItemArt_Light</item>
+    	<item name="GridviewItemTextWrapper">@style/GridviewItemTextWrapper_Light</item>
+    	
+    	<item name="GridviewRecentsWrapper">@style/GridviewRecentsWrapper_Light</item>
+    	<item name="GridviewRecentsArt">@style/GridviewRecentsArt_Light</item>
+    	<item name="GridviewRecentsShadowedText">@style/GridviewRecentsShadowedText_Light</item>
+    	<item name="GridviewRecentsText">@style/GridviewRecentsText_Light</item>
+    	
+    	<item name="ShadowedText">@style/ShadowedText_Light</item>
+    	
+    	<item name="Colorstrip">@style/Colorstrip_Light</item>
+    	
+    	<item name="HalfTextWrapper">@style/HalfTextWrapper_Light</item>
+    	<item name="HalfTextViewMore">@style/HalfTextViewMore_Light</item>
+    	
+    	<item name="LibraryWrapper">@style/LibraryWrapper_Light</item>
+    	<item name="LibraryTabsWrapper">@style/LibraryTabsWrapper_Light</item>
+    	
+    	<item name="ShuffleWrapper">@style/ShuffleWrapper_Light</item>
+    	<item name="ShuffleImage">@style/ShuffleImage_Light</item>
+    	
+    	<item name="RecentlyAddedWrapper">@style/RecentlyAddedWrapper_Light</item>
+    	
+    	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Light</item>
+    </style>
+    
+    
+    
+    
+    
+    <style name="ApolloTheme.Dark" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
+    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
+    	
+    	<item name="PlaylistDialog">@style/PlaylistDialog_Dark</item>
+    	<item name="Tabs">@style/Tabs_Dark</item>
+    	
+    	<item name="AlbumArtNormal">@drawable/no_art_normal_dark</item>
+    	<item name="AlbumArtSmall">@drawable/no_art_small_dark</item>
+    	<item name="AudioPlayButton">@drawable/apollo_holo_dark_play</item>
+    	<item name="AudioPauseButton">@drawable/apollo_holo_dark_pause</item>
+    	<item name="AudioShuffleButton">@drawable/apollo_holo_dark_shuffle_normal</item>
+    	<item name="AudioRepeatButton">@drawable/apollo_holo_dark_repeat_normal</item>
+    	<item name="AudioFavoritesButton">@drawable/apollo_holo_dark_favorite_normal</item>
+    	<item name="AudioQueueButton">@drawable/btn_switch_queue_dark</item>
+    	<item name="AudioTextColor">@color/transparent_white</item>
+    	
+    	<item name="BottomActionBarItem">@style/BottomActionBarItem_Light</item>
+    	<item name="BottomActionBarText">@style/BottomActionBarText_Dark</item>
+    	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
+    	<item name="BottomActionBar">@style/BottomActionBar_Light</item>
+    	<item name="BottomActionBarWrapper">@style/BottomActionBarWrapper_Light</item>
+    	<item name="BottomActionBarOuter">@style/BottomActionBarOuter_Dark</item>
+    	<item name="BottomActionBarFavorites">@style/BottomActionBarFavorites_Dark</item>
+    	<item name="BottomActionBarPrevious">@style/BottomActionBarPrevious_Dark</item>
+    	<item name="BottomActionBarPlay">@style/BottomActionBarPlay_Dark</item>
+    	<item name="BottomActionBarNext">@style/BottomActionBarNext_Dark</item>
+    	<item name="BottomActionBarNowQueue">@style/BottomActionBarNowQueue_Dark</item>
+    	
+    	<item name="AudioPlayerAlbumArt">@style/AudioPlayerAlbumArt_Dark</item>
+    	<item name="AudioPlayerText">@style/AudioPlayerText_Light</item>
+    	<item name="AudioPlayerArtistAlbumText">@style/AudioPlayerAlbumArtistText_Dark</item>
+    	<item name="AudioPlayerInfoText">@style/AudioPlayerInfoText_Dark</item>
+    	<item name="AudioPlayerViewMore">@style/AudioPlayerViewMore_Dark</item>
+    	<item name="AudioPlayerButton">@style/AudioPlayerButton_Light</item>
+    	<item name="AudioPlayerTimeText">@style/AudioPlayerTimeText_Dark</item>
+    	<item name="AudioPlayerNowPlayingText">@style/AudioPlayerNowPlayingText_Light</item>
+    	<item name="AudioPlayerQueueBG">@style/AudioPlayerQueueBG_Dark</item>
+    	<item name="AudioPlayerColorstrip">@style/AudioPlayerColorstrip_Light</item>
+    	<item name="AudioPlayerColorstripShadow">@style/AudioPlayerColorstripShadow_Light</item>
+    	<item name="AudioPlayerPrevious">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerPlay">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerNext">@style/AudioPlayerNext_Dark</item>
+    	<item name="AudioPlayerRepeat">@style/AudioPlayerRepeat_Dark</item>
+    	<item name="AudioPlayerShuffle">@style/AudioPlayerShuffle_Dark</item>
+    	<item name="AudioPlayerSeek">@style/AudioPlayerSeek_Dark</item>
+    	
+    	<item name="ContextMenuLine">@style/ContextMenuLine_Dark</item>
+    	<item name="ContextMenuArrow">@style/ContextMenuArrow_Dark</item>
+    	
+    	<item name="ListviewItemWrapper">@style/ListviewItemWrapper_Dark</item>
+    	<item name="ListviewItemArt">@style/ListviewItemArt_Dark</item>
+    	<item name="ListviewItemLineOne">@style/ListviewItemLineOne_Dark</item>
+    	<item name="ListviewItemLineTwo">@style/ListviewItemLineTwo_Dark</item>
+    	<item name="Listview">@style/Listview_Dark</item>
+    	<item name="ListviewDragHandle">@style/ListviewDragHandle_Dark</item>
+    	<item name="ListviewDragWrapper">@style/ListviewDragWrapper_Dark</item>
+    	
+    	<item name="Gridview">@style/Gridview_Dark</item>
+    	<item name="GridviewItemWrapper">@style/GridviewItemWrapper_Dark</item>
+    	<item name="GridviewItemArt">@style/GridviewItemArt_Dark</item>
+    	<item name="GridviewItemTextWrapper">@style/GridviewItemTextWrapper_Light</item>
+    	
+    	<item name="GridviewRecentsWrapper">@style/GridviewRecentsWrapper_Dark</item>
+    	<item name="GridviewRecentsArt">@style/GridviewRecentsArt_Dark</item>
+    	<item name="GridviewRecentsShadowedText">@style/GridviewRecentsShadowedText_Light</item>
+    	<item name="GridviewRecentsText">@style/GridviewRecentsText_Dark</item>
+    	
+    	<item name="ShadowedText">@style/ShadowedText_Light</item>
+    	
+    	<item name="Colorstrip">@style/Colorstrip_Light</item>
+    	
+    	<item name="HalfTextWrapper">@style/HalfTextWrapper_Light</item>
+    	<item name="HalfTextViewMore">@style/HalfTextViewMore_Light</item>
+    	
+    	<item name="LibraryWrapper">@style/LibraryWrapper_Dark</item>
+    	<item name="LibraryTabsWrapper">@style/LibraryTabsWrapper_Dark</item>
+    	
+    	<item name="ShuffleWrapper">@style/ShuffleWrapper_Dark</item>
+    	<item name="ShuffleImage">@style/ShuffleImage_Dark</item>
+    	
+    	<item name="RecentlyAddedWrapper">@style/RecentlyAddedWrapper_Dark</item>
+    	
+    	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Dark</item>
+    </style>
+    
+    
+    
+    
+    
+    
+    <style name="ApolloTheme.Black" parent="ApolloTheme.Dark">
+        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
+    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
+    	
+    	<item name="PlaylistDialog">@style/PlaylistDialog_Dark</item>
+    	<item name="Tabs">@style/Tabs_Dark</item>
+    	
+    	<item name="AlbumArtNormal">@drawable/no_art_normal_dark</item>
+    	<item name="AlbumArtSmall">@drawable/no_art_small_dark</item>
+    	<item name="AudioPlayButton">@drawable/apollo_holo_dark_play</item>
+    	<item name="AudioPauseButton">@drawable/apollo_holo_dark_pause</item>
+    	<item name="AudioShuffleButton">@drawable/apollo_holo_dark_shuffle_normal</item>
+    	<item name="AudioRepeatButton">@drawable/apollo_holo_dark_repeat_normal</item>
+    	<item name="AudioFavoritesButton">@drawable/apollo_holo_dark_favorite_normal</item>
+    	<item name="AudioQueueButton">@drawable/btn_switch_queue_dark</item>
+    	<item name="AudioTextColor">@color/transparent_white</item>
+    	
+    	<item name="BottomActionBarItem">@style/BottomActionBarItem_Light</item>
+    	<item name="BottomActionBarText">@style/BottomActionBarText_Dark</item>
+    	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
+    	<item name="BottomActionBar">@style/BottomActionBar_Light</item>
+    	<item name="BottomActionBarWrapper">@style/BottomActionBarWrapper_Light</item>
+    	<item name="BottomActionBarOuter">@style/BottomActionBarOuter_Dark</item>
+    	<item name="BottomActionBarFavorites">@style/BottomActionBarFavorites_Dark</item>
+    	<item name="BottomActionBarPrevious">@style/BottomActionBarPrevious_Dark</item>
+    	<item name="BottomActionBarPlay">@style/BottomActionBarPlay_Dark</item>
+    	<item name="BottomActionBarNext">@style/BottomActionBarNext_Dark</item>
+    	<item name="BottomActionBarNowQueue">@style/BottomActionBarNowQueue_Dark</item>
+    	
+    	<item name="AudioPlayerAlbumArt">@style/AudioPlayerAlbumArt_Dark</item>
+    	<item name="AudioPlayerText">@style/AudioPlayerText_Light</item>
+    	<item name="AudioPlayerArtistAlbumText">@style/AudioPlayerAlbumArtistText_Dark</item>
+    	<item name="AudioPlayerInfoText">@style/AudioPlayerInfoText_Dark</item>
+    	<item name="AudioPlayerViewMore">@style/AudioPlayerViewMore_Dark</item>
+    	<item name="AudioPlayerButton">@style/AudioPlayerButton_Light</item>
+    	<item name="AudioPlayerTimeText">@style/AudioPlayerTimeText_Dark</item>
+    	<item name="AudioPlayerNowPlayingText">@style/AudioPlayerNowPlayingText_Light</item>
+    	<item name="AudioPlayerQueueBG">@style/AudioPlayerQueueBG_Dark</item>
+    	<item name="AudioPlayerColorstrip">@style/AudioPlayerColorstrip_Light</item>
+    	<item name="AudioPlayerColorstripShadow">@style/AudioPlayerColorstripShadow_Light</item>
+    	<item name="AudioPlayerPrevious">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerPlay">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerNext">@style/AudioPlayerNext_Dark</item>
+    	<item name="AudioPlayerRepeat">@style/AudioPlayerRepeat_Dark</item>
+    	<item name="AudioPlayerShuffle">@style/AudioPlayerShuffle_Dark</item>
+    	<item name="AudioPlayerSeek">@style/AudioPlayerSeek_Dark</item>
+    	
+    	<item name="ContextMenuLine">@style/ContextMenuLine_Dark</item>
+    	<item name="ContextMenuArrow">@style/ContextMenuArrow_Dark</item>
+    	
+    	<item name="ListviewItemWrapper">@style/ListviewItemWrapper_Dark</item>
+    	<item name="ListviewItemArt">@style/ListviewItemArt_Dark</item>
+    	<item name="ListviewItemLineOne">@style/ListviewItemLineOne_Dark</item>
+    	<item name="ListviewItemLineTwo">@style/ListviewItemLineTwo_Dark</item>
+    	<item name="Listview">@style/Listview_Dark</item>
+    	<item name="ListviewDragHandle">@style/ListviewDragHandle_Dark</item>
+    	<item name="ListviewDragWrapper">@style/ListviewDragWrapper_Dark</item>
+    	
+    	<item name="Gridview">@style/Gridview_Dark</item>
+    	<item name="GridviewItemWrapper">@style/GridviewItemWrapper_Dark</item>
+    	<item name="GridviewItemArt">@style/GridviewItemArt_Dark</item>
+    	<item name="GridviewItemTextWrapper">@style/GridviewItemTextWrapper_Light</item>
+    	
+    	<item name="GridviewRecentsWrapper">@style/GridviewRecentsWrapper_Dark</item>
+    	<item name="GridviewRecentsArt">@style/GridviewRecentsArt_Dark</item>
+    	<item name="GridviewRecentsShadowedText">@style/GridviewRecentsShadowedText_Light</item>
+    	<item name="GridviewRecentsText">@style/GridviewRecentsText_Dark</item>
+    	
+    	<item name="ShadowedText">@style/ShadowedText_Light</item>
+    	
+    	<item name="Colorstrip">@style/Colorstrip_Light</item>
+    	
+    	<item name="HalfTextWrapper">@style/HalfTextWrapper_Light</item>
+    	<item name="HalfTextViewMore">@style/HalfTextViewMore_Light</item>
+    	
+    	<item name="LibraryWrapper">@style/LibraryWrapper_Dark</item>
+    	<item name="LibraryTabsWrapper">@style/LibraryTabsWrapper_Dark</item>
+    	
+    	<item name="ShuffleWrapper">@style/ShuffleWrapper_Dark</item>
+    	<item name="ShuffleImage">@style/ShuffleImage_Dark</item>
+    	
+    	<item name="RecentlyAddedWrapper">@style/RecentlyAddedWrapper_Dark</item>
+    	
+    	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Dark</item>
+    </style>
+    
+</resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 904cb18..34e6e37 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -2,6 +2,18 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <PreferenceCategory android:title="@string/header_interface" >
+        
+        <ListPreference 
+	        android:dialogTitle="@string/themes_title"
+            android:key="@string/key_current_theme"
+            android:title="@string/themes_title"
+            android:summary="@string/themes_subtitle"
+            android:defaultValue="@string/theme_light" 
+            android:entries="@array/theme_types"
+            android:entryValues="@array/theme_types"
+	        android:capitalize="words"
+        	/>          
+        
         <MultiSelectListPreference
 	        android:dialogTitle="@string/tab_visibility_title"
 	        android:key="@string/key_tabs_enabled"
@@ -12,6 +24,18 @@
 	        android:defaultValue="@array/tab_titles"
 	        android:capitalize="words"
 	        />
+        
+        <ListPreference 
+	        android:dialogTitle="@string/recents_title"
+            android:key="@string/key_recents_type"
+            android:title="@string/recents_title"
+            android:summary="@string/recents_summary"
+            android:defaultValue="@string/recents_added" 
+            android:entries="@array/recents_types"
+            android:entryValues="@array/recents_types"
+	        android:capitalize="words"
+        	/>  
+        
         <ListPreference 
 	        android:dialogTitle="@string/visualizer_title"
             android:key="@string/key_visualization_type"
diff --git a/src/com/andrew/apolloMod/Constants.java b/src/com/andrew/apolloMod/Constants.java
index 80f6266..ee96fc8 100644
--- a/src/com/andrew/apolloMod/Constants.java
+++ b/src/com/andrew/apolloMod/Constants.java
@@ -13,11 +13,11 @@ public final class Constants {
     public final static String LASTFM_API_KEY = "0bec3f7ec1f914d7c960c12a916c8fb3";
 
     // SharedPreferences
-    public final static String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences",
+    public final static String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences", CURRENT_THEME ="current_theme",
             ARTIST_KEY = "artist", ALBUM_KEY = "album", ALBUM_ID_KEY = "albumid", NUMALBUMS = "num_albums",
             GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks",BUILD_DEPENDS = "build_depends",
             PLAYLIST_NAME_FAVORITES = "Favorites", PLAYLIST_NAME = "playlist", WIDGET_STYLE="widget_type",
-            VISUALIZATION_TYPE="visualization_type", DELETE_CACHE="delete_cache", BUILD_VERSION = "build_version",
+            RECENTS_TYPE="recents_type", VISUALIZATION_TYPE="visualization_type", DELETE_CACHE="delete_cache", BUILD_VERSION = "build_version",
             UP_STARTS_ALBUM_ACTIVITY = "upStartsAlbumActivity", TABS_ENABLED = "tabs_enabled";
     
     //Image Loading Constants
diff --git a/src/com/andrew/apolloMod/NowPlayingCursor.java b/src/com/andrew/apolloMod/NowPlayingCursor.java
deleted file mode 100644
index 5603a06..0000000
--- a/src/com/andrew/apolloMod/NowPlayingCursor.java
+++ /dev/null
@@ -1,196 +0,0 @@
-
-package com.andrew.apolloMod;
-
-import java.util.Arrays;
-
-import android.content.Context;
-import android.database.AbstractCursor;
-import android.database.Cursor;
-import android.os.RemoteException;
-import android.provider.BaseColumns;
-import android.provider.MediaStore.Audio;
-
-import com.andrew.apolloMod.IApolloService;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-
-public class NowPlayingCursor extends AbstractCursor {
-
-    public NowPlayingCursor(IApolloService service, String[] projection, Context c) {
-        mProjection = projection;
-        mService = service;
-        makeNowPlayingCursor();
-        context = c;
-    }
-
-    private void makeNowPlayingCursor() {
-        mCurrentPlaylistCursor = null;
-        try {
-            mNowPlaying = mService.getQueue();
-        } catch (RemoteException ex) {
-            mNowPlaying = new long[0];
-        }
-        mSize = mNowPlaying.length;
-        if (mSize == 0) {
-            return;
-        }
-
-        StringBuilder where = new StringBuilder();
-        where.append(BaseColumns._ID + " IN (");
-        for (int i = 0; i < mSize; i++) {
-            where.append(mNowPlaying[i]);
-            if (i < mSize - 1) {
-                where.append(",");
-            }
-        }
-        where.append(")");
-
-        mCurrentPlaylistCursor = MusicUtils.query(context, Audio.Media.EXTERNAL_CONTENT_URI,
-                mProjection, where.toString(), null, BaseColumns._ID);
-
-        if (mCurrentPlaylistCursor == null) {
-            mSize = 0;
-            return;
-        }
-
-        int size = mCurrentPlaylistCursor.getCount();
-        mCursorIdxs = new long[size];
-        mCurrentPlaylistCursor.moveToFirst();
-        int colidx = mCurrentPlaylistCursor.getColumnIndexOrThrow(BaseColumns._ID);
-        for (int i = 0; i < size; i++) {
-            mCursorIdxs[i] = mCurrentPlaylistCursor.getLong(colidx);
-            mCurrentPlaylistCursor.moveToNext();
-        }
-        mCurrentPlaylistCursor.moveToFirst();
-        try {
-            int removed = 0;
-            for (int i = mNowPlaying.length - 1; i >= 0; i--) {
-                long trackid = mNowPlaying[i];
-                int crsridx = Arrays.binarySearch(mCursorIdxs, trackid);
-                if (crsridx < 0) {
-                    removed += mService.removeTrack(trackid);
-                }
-            }
-            if (removed > 0) {
-                mNowPlaying = mService.getQueue();
-                mSize = mNowPlaying.length;
-                if (mSize == 0) {
-                    mCursorIdxs = null;
-                    return;
-                }
-            }
-        } catch (RemoteException ex) {
-            mNowPlaying = new long[0];
-        }
-    }
-
-    @Override
-    public int getCount() {
-        return mSize;
-    }
-
-    @Override
-    public boolean onMove(int oldPosition, int newPosition) {
-        if (oldPosition == newPosition)
-            return true;
-
-        if (mNowPlaying == null || mCursorIdxs == null || newPosition >= mNowPlaying.length) {
-            return false;
-        }
-
-        // The cursor doesn't have any duplicates in it, and is not ordered
-        // in queue-order, so we need to figure out where in the cursor we
-        // should be.
-
-        long newid = mNowPlaying[newPosition];
-        int crsridx = Arrays.binarySearch(mCursorIdxs, newid);
-        mCurrentPlaylistCursor.moveToPosition(crsridx);
-        return true;
-    }
-
-    @Override
-    public String getString(int column) {
-        try {
-            return mCurrentPlaylistCursor.getString(column);
-        } catch (Exception ex) {
-            onChange(true);
-            return "";
-        }
-    }
-
-    @Override
-    public short getShort(int column) {
-        return mCurrentPlaylistCursor.getShort(column);
-    }
-
-    @Override
-    public int getInt(int column) {
-        try {
-            return mCurrentPlaylistCursor.getInt(column);
-        } catch (Exception ex) {
-            onChange(true);
-            return 0;
-        }
-    }
-
-    @Override
-    public long getLong(int column) {
-        try {
-            return mCurrentPlaylistCursor.getLong(column);
-        } catch (Exception ex) {
-            onChange(true);
-            return 0;
-        }
-    }
-
-    @Override
-    public float getFloat(int column) {
-        return mCurrentPlaylistCursor.getFloat(column);
-    }
-
-    @Override
-    public double getDouble(int column) {
-        return mCurrentPlaylistCursor.getDouble(column);
-    }
-
-    @Override
-    public int getType(int column) {
-        return mCurrentPlaylistCursor.getType(column);
-    }
-
-    @Override
-    public boolean isNull(int column) {
-        return mCurrentPlaylistCursor.isNull(column);
-    }
-
-    @Override
-    public String[] getColumnNames() {
-        return mProjection;
-    }
-
-    @Override
-	@SuppressWarnings("deprecation")
-    public void deactivate() {
-        if (mCurrentPlaylistCursor != null)
-            mCurrentPlaylistCursor.deactivate();
-    }
-
-    @Override
-    public boolean requery() {
-        makeNowPlayingCursor();
-        return true;
-    }
-
-    private final String[] mProjection;
-
-    private Cursor mCurrentPlaylistCursor;
-
-    private int mSize;
-
-    private long[] mNowPlaying;
-
-    private long[] mCursorIdxs;
-
-    private final Context context;
-
-    private final IApolloService mService;
-}
diff --git a/src/com/andrew/apolloMod/app/widgets/AppWidget11.java b/src/com/andrew/apolloMod/appwidgets/AppWidget11.java
similarity index 99%
rename from src/com/andrew/apolloMod/app/widgets/AppWidget11.java
rename to src/com/andrew/apolloMod/appwidgets/AppWidget11.java
index e18d232..fae9ccd 100644
--- a/src/com/andrew/apolloMod/app/widgets/AppWidget11.java
+++ b/src/com/andrew/apolloMod/appwidgets/AppWidget11.java
@@ -1,5 +1,5 @@
 
-package com.andrew.apolloMod.app.widgets;
+package com.andrew.apolloMod.appwidgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/com/andrew/apolloMod/app/widgets/AppWidget41.java b/src/com/andrew/apolloMod/appwidgets/AppWidget41.java
similarity index 98%
rename from src/com/andrew/apolloMod/app/widgets/AppWidget41.java
rename to src/com/andrew/apolloMod/appwidgets/AppWidget41.java
index 0e5fd93..181949e 100644
--- a/src/com/andrew/apolloMod/app/widgets/AppWidget41.java
+++ b/src/com/andrew/apolloMod/appwidgets/AppWidget41.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.app.widgets;
+package com.andrew.apolloMod.appwidgets;
 
 import static com.andrew.apolloMod.Constants.WIDGET_STYLE;
 import android.app.PendingIntent;
@@ -30,8 +30,8 @@
 import android.widget.RemoteViews;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.MusicLibrary;
 import com.andrew.apolloMod.service.ApolloService;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
 
 /**
  * Simple widget to show currently playing album art along with play/pause and
diff --git a/src/com/andrew/apolloMod/app/widgets/AppWidget42.java b/src/com/andrew/apolloMod/appwidgets/AppWidget42.java
similarity index 99%
rename from src/com/andrew/apolloMod/app/widgets/AppWidget42.java
rename to src/com/andrew/apolloMod/appwidgets/AppWidget42.java
index de2038c..3aed5a0 100644
--- a/src/com/andrew/apolloMod/app/widgets/AppWidget42.java
+++ b/src/com/andrew/apolloMod/appwidgets/AppWidget42.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.app.widgets;
+package com.andrew.apolloMod.appwidgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
@@ -29,8 +29,9 @@
 import android.widget.RemoteViews;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.MusicLibrary;
 import com.andrew.apolloMod.service.ApolloService;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
+
 import static com.andrew.apolloMod.Constants.WIDGET_STYLE;
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/GetBitmapTask.java b/src/com/andrew/apolloMod/cache/GetBitmapTask.java
similarity index 77%
rename from src/com/andrew/apolloMod/helpers/GetBitmapTask.java
rename to src/com/andrew/apolloMod/cache/GetBitmapTask.java
index 06af5b1..d59e977 100644
--- a/src/com/andrew/apolloMod/helpers/GetBitmapTask.java
+++ b/src/com/andrew/apolloMod/cache/GetBitmapTask.java
@@ -1,13 +1,14 @@
-package com.andrew.apolloMod.helpers;
+package com.andrew.apolloMod.cache;
 
 import android.content.Context;
+import android.content.res.Resources.Theme;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
+import android.util.TypedValue;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.cache.ImageInfo;
-import com.andrew.apolloMod.helpers.utils.ImageUtils;
+import com.andrew.apolloMod.helpers.ImageUtils;
 
 import static com.andrew.apolloMod.Constants.*;
 
@@ -83,17 +84,20 @@ else if( mImageInfo.size.equals( SIZE_THUMB ) ){
     protected void onPostExecute(Bitmap bitmap) {
         super.onPostExecute(bitmap);
         OnBitmapReadyListener listener = mListenerReference.get();
-        if(bitmap == null && !isCancelled()){
-        	if(mImageInfo.size.equals(SIZE_THUMB))
-        		bitmap = BitmapFactory.decodeResource(mContextReference.get().getResources(),
-        													R.drawable.no_art_small);
-        	else if(mImageInfo.size.equals(SIZE_NORMAL))
-        		bitmap = BitmapFactory.decodeResource(mContextReference.get().getResources(),
-        													R.drawable.no_art_normal);
+        if( bitmap == null && !isCancelled() ){
+			Theme theme = mContextReference.get().getTheme();
+			TypedValue typedvalueattr = new TypedValue();
+        	if( mImageInfo.size.equals(SIZE_THUMB) ) 
+    			theme.resolveAttribute(R.attr.AlbumArtSmall, typedvalueattr, true); 
+        	else if( mImageInfo.size.equals(SIZE_NORMAL) )     			
+    			theme.resolveAttribute(R.attr.AlbumArtNormal, typedvalueattr, true);
+        	
+        	bitmap = BitmapFactory.decodeResource(mContextReference.get().getResources(),
+        															typedvalueattr.resourceId);
         }
-        if (bitmap != null && !isCancelled()) {
-            if (listener != null) {
-                	listener.bitmapReady(bitmap,  ImageUtils.createShortTag(mImageInfo) + mImageInfo.size );
+        if( bitmap != null && !isCancelled() ) {
+            if ( listener != null ) {
+                	listener.bitmapReady( bitmap,  ImageUtils.createShortTag(mImageInfo) + mImageInfo.size );
             }
         }
     }
diff --git a/src/com/andrew/apolloMod/cache/ImageProvider.java b/src/com/andrew/apolloMod/cache/ImageProvider.java
index 94cfbba..ed12a12 100644
--- a/src/com/andrew/apolloMod/cache/ImageProvider.java
+++ b/src/com/andrew/apolloMod/cache/ImageProvider.java
@@ -12,8 +12,7 @@
 import android.util.DisplayMetrics;
 import android.widget.ImageView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.GetBitmapTask;
-import com.andrew.apolloMod.helpers.utils.ImageUtils;
+import com.andrew.apolloMod.helpers.ImageUtils;
 
 import static com.andrew.apolloMod.Constants.*;
 
diff --git a/src/com/andrew/apolloMod/helpers/utils/ApolloUtils.java b/src/com/andrew/apolloMod/helpers/ApolloUtils.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/utils/ApolloUtils.java
rename to src/com/andrew/apolloMod/helpers/ApolloUtils.java
index 21b3921..c6b445e 100644
--- a/src/com/andrew/apolloMod/helpers/utils/ApolloUtils.java
+++ b/src/com/andrew/apolloMod/helpers/ApolloUtils.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -37,7 +37,7 @@
 import android.widget.Toast;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.TracksBrowser;
+import com.andrew.apolloMod.ui.activities.TracksBrowser;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
 import com.androidquery.util.AQUtility;
diff --git a/src/com/andrew/apolloMod/helpers/utils/ImageUtils.java b/src/com/andrew/apolloMod/helpers/ImageUtils.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/utils/ImageUtils.java
rename to src/com/andrew/apolloMod/helpers/ImageUtils.java
index dd0b4ee..8f4257c 100644
--- a/src/com/andrew/apolloMod/helpers/utils/ImageUtils.java
+++ b/src/com/andrew/apolloMod/helpers/ImageUtils.java
@@ -1,4 +1,4 @@
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/com/andrew/apolloMod/helpers/utils/MusicUtils.java b/src/com/andrew/apolloMod/helpers/MusicUtils.java
similarity index 96%
rename from src/com/andrew/apolloMod/helpers/utils/MusicUtils.java
rename to src/com/andrew/apolloMod/helpers/MusicUtils.java
index 20b5bbf..f7f48c9 100644
--- a/src/com/andrew/apolloMod/helpers/utils/MusicUtils.java
+++ b/src/com/andrew/apolloMod/helpers/MusicUtils.java
@@ -1,5 +1,5 @@
 
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.util.Arrays;
 import java.util.Formatter;
@@ -41,6 +41,8 @@
 import android.widget.ImageButton;
 import android.widget.Toast;
 
+import com.andrew.apolloMod.providers.HistoryStore;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.service.ApolloService;
@@ -587,6 +589,36 @@ public static long createPlaylist(Context context, String name) {
         }
         return -1;
     }
+    
+    public static long addSongToHistory(Context context, String id, String timeplayed, String title, String artist, String album, String album_id){
+    	if(Long.parseLong(id)<0)
+    		return -1;
+    	ContentResolver resolver = context.getContentResolver();
+        String[] cols = new String[] {
+                RecentColumns._ID, RecentColumns.TIME_PLAYED,
+                RecentColumns.TITLE, RecentColumns.ARTIST,
+                RecentColumns.ALBUM               
+            };
+        String whereclause = RecentColumns._ID + " = '" + id + "'";
+
+        ContentValues values = new ContentValues();
+        values.put(RecentColumns._ID, id);
+        values.put(RecentColumns.TIME_PLAYED, timeplayed);
+        values.put(RecentColumns.TITLE, title);
+        values.put(RecentColumns.ARTIST, artist);
+        values.put(RecentColumns.ALBUM, album);
+        values.put(RecentColumns.ALBUM_ID, album_id);
+        
+        Cursor cur = resolver.query(HistoryStore.CONTENT_URI, cols, whereclause, null, null);
+        
+        if (cur.getCount() <= 0) {
+            Uri uri = resolver.insert(HistoryStore.CONTENT_URI, values);
+            return Long.parseLong(uri.getLastPathSegment());
+        }
+        else{
+        	return resolver.update(HistoryStore.CONTENT_URI, values, whereclause, null);
+        }
+    }
 
     /**
      * @param context
diff --git a/src/com/andrew/apolloMod/helpers/utils/StringUtilities.java b/src/com/andrew/apolloMod/helpers/StringUtilities.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/utils/StringUtilities.java
rename to src/com/andrew/apolloMod/helpers/StringUtilities.java
index 5ef7a96..c896751 100644
--- a/src/com/andrew/apolloMod/helpers/utils/StringUtilities.java
+++ b/src/com/andrew/apolloMod/helpers/StringUtilities.java
@@ -23,7 +23,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/com/andrew/apolloMod/helpers/utils/VisualizerUtils.java b/src/com/andrew/apolloMod/helpers/VisualizerUtils.java
similarity index 95%
rename from src/com/andrew/apolloMod/helpers/utils/VisualizerUtils.java
rename to src/com/andrew/apolloMod/helpers/VisualizerUtils.java
index 2a89ba5..bc474bb 100644
--- a/src/com/andrew/apolloMod/helpers/utils/VisualizerUtils.java
+++ b/src/com/andrew/apolloMod/helpers/VisualizerUtils.java
@@ -1,9 +1,9 @@
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 
 import java.lang.ref.WeakReference;
 
-import com.andrew.apolloMod.ui.widgets.VisualizerView;
+import com.andrew.apolloMod.ui.views.VisualizerView;
 
 import android.media.MediaPlayer;
 import android.media.audiofx.Visualizer;
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Album.java b/src/com/andrew/apolloMod/helpers/lastfm/Album.java
index 0e073cc..d4281f7 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Album.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Album.java
@@ -29,8 +29,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.andrew.apolloMod.helpers.DomElement;
-import com.andrew.apolloMod.helpers.utils.StringUtilities;
+import com.andrew.apolloMod.helpers.StringUtilities;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Artist.java b/src/com/andrew/apolloMod/helpers/lastfm/Artist.java
index 09b5500..1cfdc1e 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Artist.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Artist.java
@@ -30,7 +30,6 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * Bean that contains artist information.<br/>
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Caller.java b/src/com/andrew/apolloMod/helpers/lastfm/Caller.java
index bced774..6ef747d 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Caller.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Caller.java
@@ -26,8 +26,8 @@
 
 package com.andrew.apolloMod.helpers.lastfm;
 
-import static com.andrew.apolloMod.helpers.utils.StringUtilities.encode;
-import static com.andrew.apolloMod.helpers.utils.StringUtilities.map;
+import static com.andrew.apolloMod.helpers.StringUtilities.encode;
+import static com.andrew.apolloMod.helpers.StringUtilities.map;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
diff --git a/src/com/andrew/apolloMod/helpers/DomElement.java b/src/com/andrew/apolloMod/helpers/lastfm/DomElement.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/DomElement.java
rename to src/com/andrew/apolloMod/helpers/lastfm/DomElement.java
index 34f84f4..0a4dd34 100644
--- a/src/com/andrew/apolloMod/helpers/DomElement.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/DomElement.java
@@ -23,7 +23,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.andrew.apolloMod.helpers;
+package com.andrew.apolloMod.helpers.lastfm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Image.java b/src/com/andrew/apolloMod/helpers/lastfm/Image.java
index 0cab1e4..9950fdf 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Image.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Image.java
@@ -28,7 +28,6 @@
 
 import java.util.Locale;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * An <code>Image</code> contains metadata and URLs for an artist's image.
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java b/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java
index dafa5fe..724ce23 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java
@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * Abstract superclass for all items that may contain images (such as
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java b/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java
index 4dd51fd..971f374 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java
@@ -26,7 +26,6 @@
 
 package com.andrew.apolloMod.helpers.lastfm;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * An <code>ItemFactory</code> can be used to instantiate a value object - such as Artist, Album, Track, Tag - from an XML element. Use the
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java b/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java
index f554536..29ef50c 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java
@@ -29,7 +29,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java b/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java
index 81cbc75..a4601d4 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java
@@ -30,7 +30,6 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Result.java b/src/com/andrew/apolloMod/helpers/lastfm/Result.java
index cb92e6e..5361772 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Result.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Result.java
@@ -27,7 +27,6 @@
 
 import org.w3c.dom.Document;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Session.java b/src/com/andrew/apolloMod/helpers/lastfm/Session.java
index c71a914..e666cf8 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Session.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Session.java
@@ -26,7 +26,6 @@
 
 package com.andrew.apolloMod.helpers.lastfm;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * Contains Session data relevant for making API calls which require
diff --git a/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java b/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java
index 3cc3b3b..8e91a84 100644
--- a/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java
+++ b/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java
@@ -7,7 +7,7 @@
 package com.andrew.apolloMod.helpers.visualizer;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 import android.content.Context;
 import android.graphics.BlurMaskFilter;
diff --git a/src/com/andrew/apolloMod/menu/PlaylistPickerDialog.java b/src/com/andrew/apolloMod/menu/PlaylistPickerDialog.java
deleted file mode 100644
index 4ddccde..0000000
--- a/src/com/andrew/apolloMod/menu/PlaylistPickerDialog.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package com.andrew.apolloMod.menu;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnClickListener;
-
-public class PlaylistPickerDialog extends AlertDialog implements OnCancelListener, OnClickListener {
-
-    public PlaylistPickerDialog(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void onCancel(DialogInterface dialog) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        // TODO Auto-generated method stub
-
-    }
-
-}
diff --git a/src/com/andrew/apolloMod/preferences/SettingsHolder.java b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
index 1b868ac..5c33554 100644
--- a/src/com/andrew/apolloMod/preferences/SettingsHolder.java
+++ b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
@@ -9,13 +9,16 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceManager;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
@@ -29,10 +32,11 @@
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.service.ServiceToken;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.WIDGET_STYLE;
 import static com.andrew.apolloMod.Constants.DELETE_CACHE;
 import static com.andrew.apolloMod.Constants.BUILD_VERSION;
@@ -46,6 +50,14 @@ public class SettingsHolder extends PreferenceActivity  implements ServiceConnec
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                  
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         // This should be called first thing
         super.onCreate(savedInstanceState);
         mContext = this;
@@ -53,6 +65,8 @@ protected void onCreate(Bundle savedInstanceState) {
         int preferencesResId = R.xml.settings;
         addPreferencesFromResource(preferencesResId);
         
+        initChangeTheme();
+        
         //Init widget style change option
         initChangeWidgetTheme();
         
@@ -62,6 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Init about dialog
         initAboutDialog();
         
+        //Init dependencies dialog
         initDependencies();
         
     }
@@ -75,6 +90,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    private void initChangeTheme(){
+    	ListPreference listPreference = (ListPreference)findPreference(CURRENT_THEME);
+        listPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+            	Intent intent = getIntent();
+            	finish();
+            	startActivity(intent);
+                return true;
+            }
+        });
+    }
     
     private void initChangeWidgetTheme(){
     	ListPreference listPreference = (ListPreference)findPreference(WIDGET_STYLE);
diff --git a/src/com/andrew/apolloMod/providers/HistoryStore.java b/src/com/andrew/apolloMod/providers/HistoryStore.java
new file mode 100644
index 0000000..39f0b72
--- /dev/null
+++ b/src/com/andrew/apolloMod/providers/HistoryStore.java
@@ -0,0 +1,146 @@
+
+package com.andrew.apolloMod.providers;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.MediaColumns;
+import android.provider.MediaStore.Audio.AudioColumns;
+
+public class HistoryStore extends ContentProvider {
+
+	static final String PROVIDER = "com.andrew.apolloMod.recents";
+	
+	static final String URL = "content://" + PROVIDER ;
+	
+	public static final Uri CONTENT_URI = Uri.parse(URL);
+	
+	public static final String CONTENT_TYPE = ContentResolver.CURSOR_DIR_BASE_TYPE
+											+ "/vnd.com.andrew.apolloMod.recents";
+	
+	static final int RECENTS = 1;
+	
+	static final UriMatcher uriMatcher;
+		static{
+			uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+			uriMatcher.addURI(PROVIDER, "recents", RECENTS);
+			}  
+		
+	RecentDB recentDBHelper;	
+	private SQLiteDatabase database;
+	   
+	public HistoryStore() { }
+	
+	public static interface RecentColumns {
+		
+		public static final String _ID 			= 	BaseColumns._ID;
+		
+		public static final String TITLE 		= 	MediaColumns.TITLE;
+		
+		public static final String ALBUM 		= 	AudioColumns.ALBUM;
+
+		public static final String ALBUM_ID 	= 	AudioColumns.ALBUM_ID;
+		
+		public static final String ARTIST 		= 	AudioColumns.ARTIST;
+		
+        public static final String TIME_PLAYED 	= 	"timeplayed";
+		
+	}
+
+	public class RecentDB extends SQLiteOpenHelper {
+		
+		private static final int VERSION = 2;
+
+	    public static final String DATABASENAME = "recenthistory.db";
+	    
+	    public static final String DATABASETABLE = "recenthistory";
+	    
+	    public RecentDB(Context context) {
+	    	super(context, DATABASENAME, null, VERSION);
+	    }
+	    @Override
+	    public void onCreate(final SQLiteDatabase db) {
+	        db.execSQL("CREATE TABLE IF NOT EXISTS " + DATABASETABLE + " ("
+	                + RecentColumns._ID + " LONG NOT NULL," + RecentColumns.ALBUM
+	                + " TEXT NOT NULL," + RecentColumns.ARTIST + " TEXT NOT NULL,"
+	                + RecentColumns.TITLE + " TEXT NOT NULL,"+ RecentColumns.ALBUM_ID 
+	                + " TEXT NOT NULL," + RecentColumns.TIME_PLAYED + " LONG NOT NULL);");
+	    }	    
+	    @Override
+	    public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+	        db.execSQL("DROP TABLE IF EXISTS " + DATABASETABLE);
+	        onCreate(db);
+	    }
+	}
+	
+	@Override
+	public int delete(Uri uri, String selection, String[] selectionArgs) {
+		int count = database.delete(RecentDB.DATABASETABLE, selection, selectionArgs);
+		getContext().getContentResolver().notifyChange(uri, null);
+		return count;
+	}
+
+	@Override
+	public String getType(Uri uri) {
+		switch (uriMatcher.match(uri)){
+			case RECENTS:
+				return CONTENT_TYPE;
+			default:
+				throw new IllegalArgumentException("Unsupported URI: " + uri);
+		}
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues values) {		
+		long row = database.insert(RecentDB.DATABASETABLE, "", values);		
+		if(row > 0) {
+			Uri newUri = ContentUris.withAppendedId(CONTENT_URI, row);
+			getContext().getContentResolver().notifyChange(newUri, null);
+			return newUri;
+		}
+		throw new SQLException("Fail to add a new record into " + uri);
+	}
+
+	@Override
+	public boolean onCreate() {
+		recentDBHelper = new RecentDB(getContext());
+		database = recentDBHelper.getWritableDatabase();
+		if(database == null)
+			return false;
+		else
+			return true;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] projection, String selection,
+			String[] selectionArgs, String sortOrder) {
+		SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+		queryBuilder.setTables(RecentDB.DATABASETABLE);
+		//queryBuilder.setDistinct(true);
+		if (sortOrder == null || sortOrder == "")
+			sortOrder = RecentColumns.TIME_PLAYED;
+		
+		Cursor cursor = queryBuilder.query(database, projection, selection,
+											selectionArgs, null, null, sortOrder);
+		cursor.setNotificationUri(getContext().getContentResolver(), uri);
+		return cursor;
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues values, String selection,
+			String[] selectionArgs) {
+		int count = database.update(RecentDB.DATABASETABLE, values, selection, selectionArgs);
+		getContext().getContentResolver().notifyChange(uri, null);
+		return count;
+	}
+}
diff --git a/src/com/andrew/apolloMod/providers/RecentsLoader.java b/src/com/andrew/apolloMod/providers/RecentsLoader.java
new file mode 100644
index 0000000..6604631
--- /dev/null
+++ b/src/com/andrew/apolloMod/providers/RecentsLoader.java
@@ -0,0 +1,250 @@
+
+package com.andrew.apolloMod.providers;
+
+import android.support.v4.content.AsyncTaskLoader;
+import android.content.ContentQueryMap;
+import android.content.Context;
+import android.content.ContentValues;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.Audio;
+import android.provider.MediaStore.MediaColumns;
+import android.provider.MediaStore.Audio.AlbumColumns;
+import android.provider.MediaStore.Audio.AudioColumns;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Map;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
+
+public class RecentsLoader extends AsyncTaskLoader<Cursor> {
+    final ForceLoadContentObserver mObserver;
+
+    Uri mUri;
+    String[] mProjection;
+    String mSelection;
+    String[] mSelectionArgs;
+    String mSortOrder;
+
+    Cursor mCursor;
+    Context mContext;
+
+    /* Runs on a worker thread */
+    @Override
+    public Cursor loadInBackground() {
+
+    	//Get Recently Added Songs
+    	String[] sProjection = new String[] {
+                BaseColumns._ID, MediaColumns.TITLE, AudioColumns.ALBUM, AudioColumns.ARTIST
+        };
+
+        StringBuilder where = new StringBuilder();
+        where.append(MediaColumns.TITLE + " != ''");
+        where.append(" AND " + AudioColumns.IS_MUSIC + "=1");
+        
+        Cursor mediaCursor = getContext().getContentResolver().query( Audio.Media.EXTERNAL_CONTENT_URI,
+        			sProjection, where.toString(), null, MediaColumns.DATE_ADDED + " DESC LIMIT 4");
+        
+        //Merge with Album data
+        String [] projection =  new String[] {
+                BaseColumns._ID, AlbumColumns.ALBUM
+        };        
+        Uri uri = Audio.Albums.EXTERNAL_CONTENT_URI;
+        String sortOrder = Audio.Albums.DEFAULT_SORT_ORDER;
+        Cursor albumCursor = getContext().getContentResolver().query(uri, projection, null, null, sortOrder);
+        
+        //Matrix cursor to hold final data to be returned to calling context
+        MatrixCursor cursor = new MatrixCursor( new String[]
+        		{ BaseColumns._ID, MediaColumns.TITLE, AudioColumns.ARTIST, AudioColumns.ALBUM, AudioColumns.ALBUM_ID});
+        //Map data from Audio Id cursor to the ALbumName Colum
+        ContentQueryMap mQueryMap = new ContentQueryMap(albumCursor, AlbumColumns.ALBUM, false, null);
+
+		Map<String, ContentValues> data = mQueryMap.getRows();
+        if (mediaCursor != null) {
+            while(mediaCursor.moveToNext()) {
+				String id = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(BaseColumns._ID));
+				String title = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(MediaColumns.TITLE));
+				String artist = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String album = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+					
+				ContentValues tData = data.get(album);
+				String albumid = (String) tData.get(BaseColumns._ID);
+				cursor.addRow(new String[] {id, title, artist, album, albumid});
+            }
+            mediaCursor.close();
+        }
+        
+        //Add empty row to symbolize start of recently played
+		cursor.addRow(new String[] {"-1", "", "", "", ""});
+        
+        //Add recently played to cursor
+        sProjection = new String[] {
+    			"DISTINCT "+RecentColumns._ID, RecentColumns.TIME_PLAYED,
+                RecentColumns.TITLE, RecentColumns.ARTIST,
+                RecentColumns.ALBUM, RecentColumns.ALBUM_ID       
+        };                
+        Cursor historyCursor = getContext().getContentResolver().query( HistoryStore.CONTENT_URI,
+    			sProjection, null, null, RecentColumns.TIME_PLAYED + " DESC LIMIT 4");
+        if (historyCursor != null) {
+            while(historyCursor.moveToNext()) {
+				String id = historyCursor.getString(historyCursor.getColumnIndexOrThrow(BaseColumns._ID));
+				String title = historyCursor.getString(historyCursor.getColumnIndexOrThrow(MediaColumns.TITLE));
+				String artist = historyCursor.getString(historyCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String album = historyCursor.getString(historyCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+				String albumid = historyCursor.getString(historyCursor.getColumnIndexOrThrow(AudioColumns.ALBUM_ID));
+				cursor.addRow(new String[] {id, title, artist, album, albumid});
+            }
+            historyCursor.close();
+        }
+        
+        if (cursor != null) {
+            // Ensure the cursor window is filled
+            registerContentObserver(cursor, mObserver);
+            cursor.setNotificationUri(mContext.getContentResolver(), HistoryStore.CONTENT_URI);
+        }
+        return cursor;
+    }
+
+    /**
+     * Registers an observer to get notifications from the content provider
+     * when the cursor needs to be refreshed.
+     */
+    void registerContentObserver(Cursor cursor, ContentObserver observer) {
+        cursor.registerContentObserver(mObserver);
+    }
+
+    /* Runs on the UI thread */
+    @Override
+    public void deliverResult(Cursor cursor) {
+        if (isReset()) {
+            // An async query came in while the loader is stopped
+            if (cursor != null) {
+                cursor.close();
+            }
+            return;
+        }
+        Cursor oldCursor = mCursor;
+        mCursor = cursor;
+
+        if (isStarted()) {
+            super.deliverResult(cursor);
+        }
+
+        if (oldCursor != null && oldCursor != cursor && !oldCursor.isClosed()) {
+            oldCursor.close();
+        }
+    }
+
+    /**
+     * Creates an empty unspecified CursorLoader.  You must follow this with
+     * calls to {@link #setUri(Uri)}, {@link #setSelection(String)}, etc
+     * to specify the query to perform.
+     */
+    public RecentsLoader(Context context) {
+        super(context);
+        mContext = context;
+        mObserver = new ForceLoadContentObserver();
+    }
+
+    /**
+     * Starts an asynchronous load of the contacts list data. When the result is ready the callbacks
+     * will be called on the UI thread. If a previous load has been completed and is still valid
+     * the result may be passed to the callbacks immediately.
+     *
+     * Must be called from the UI thread
+     */
+    @Override
+    protected void onStartLoading() {
+        if (mCursor != null) {
+            deliverResult(mCursor);
+        }
+        if (takeContentChanged() || mCursor == null) {
+            forceLoad();
+        }
+    }
+
+    /**
+     * Must be called from the UI thread
+     */
+    @Override
+    protected void onStopLoading() {
+        // Attempt to cancel the current load task if possible.
+        cancelLoad();
+    }
+
+    @Override
+    public void onCanceled(Cursor cursor) {
+        if (cursor != null && !cursor.isClosed()) {
+            cursor.close();
+        }
+    }
+
+    @Override
+    protected void onReset() {
+        super.onReset();
+        
+        // Ensure the loader is stopped
+        onStopLoading();
+
+        if (mCursor != null && !mCursor.isClosed()) {
+            mCursor.close();
+        }
+        mCursor = null;
+    }
+
+    public Uri getUri() {
+        return mUri;
+    }
+
+    public void setUri(Uri uri) {
+        mUri = uri;
+    }
+
+    public String[] getProjection() {
+        return mProjection;
+    }
+
+    public void setProjection(String[] projection) {
+        mProjection = projection;
+    }
+
+    public String getSelection() {
+        return mSelection;
+    }
+
+    public void setSelection(String selection) {
+        mSelection = selection;
+    }
+
+    public String[] getSelectionArgs() {
+        return mSelectionArgs;
+    }
+
+    public void setSelectionArgs(String[] selectionArgs) {
+        mSelectionArgs = selectionArgs;
+    }
+
+    public String getSortOrder() {
+        return mSortOrder;
+    }
+
+    public void setSortOrder(String sortOrder) {
+        mSortOrder = sortOrder;
+    }
+
+    @Override
+    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
+        super.dump(prefix, fd, writer, args);
+        writer.print(prefix); writer.print("mUri="); writer.println(mUri);
+        writer.print(prefix); writer.print("mProjection=");
+                writer.println(Arrays.toString(mProjection));
+        writer.print(prefix); writer.print("mSelection="); writer.println(mSelection);
+        writer.print(prefix); writer.print("mSelectionArgs=");
+                writer.println(Arrays.toString(mSelectionArgs));
+        writer.print(prefix); writer.print("mSortOrder="); writer.println(mSortOrder);
+        writer.print(prefix); writer.print("mCursor="); writer.println(mCursor);
+    }
+}
diff --git a/src/com/andrew/apolloMod/service/ApolloService.java b/src/com/andrew/apolloMod/service/ApolloService.java
index ff173f0..5928978 100644
--- a/src/com/andrew/apolloMod/service/ApolloService.java
+++ b/src/com/andrew/apolloMod/service/ApolloService.java
@@ -69,15 +69,15 @@
 
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.app.widgets.AppWidget11;
-import com.andrew.apolloMod.app.widgets.AppWidget41;
-import com.andrew.apolloMod.app.widgets.AppWidget42;
+import com.andrew.apolloMod.appwidgets.AppWidget11;
+import com.andrew.apolloMod.appwidgets.AppWidget41;
+import com.andrew.apolloMod.appwidgets.AppWidget42;
+import com.andrew.apolloMod.cache.GetBitmapTask;
 import com.andrew.apolloMod.cache.ImageInfo;
-import com.andrew.apolloMod.helpers.GetBitmapTask;
-import com.andrew.apolloMod.helpers.GetBitmapTask.OnBitmapReadyListener;
-import com.andrew.apolloMod.helpers.utils.ImageUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.helpers.utils.VisualizerUtils;
+import com.andrew.apolloMod.cache.GetBitmapTask.OnBitmapReadyListener;
+import com.andrew.apolloMod.helpers.ImageUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.helpers.VisualizerUtils;
 import com.andrew.apolloMod.preferences.SharedPreferencesCompat;
 
 import static com.andrew.apolloMod.Constants.APOLLO_PREFERENCES;
@@ -2284,7 +2284,7 @@ private boolean setDataSourceImpl(MediaPlayer player, String path) {
     	    if(!type.equals(getResources().getString(R.string.visual_none))){
         	    VisualizerUtils.initVisualizer( player );
             }
-            return true;
+    	    return true;
         }
 
         public void setNextDataSource(String path) {
@@ -2342,6 +2342,10 @@ public void setHandler(Handler handler) {
         MediaPlayer.OnCompletionListener listener = new MediaPlayer.OnCompletionListener() {
             @Override
             public void onCompletion(MediaPlayer mp) {
+        	    String timestamp = Long.valueOf(System.currentTimeMillis()/1000).toString();
+        	    MusicUtils.addSongToHistory(getApplicationContext(), String.valueOf(getAudioId()), timestamp, 
+        	    						getTrackName(), getArtistName(), getAlbumName(), String.valueOf(getAlbumId()) );
+                
                 if (mp == mCurrentMediaPlayer && mNextMediaPlayer != null) {
                     mCurrentMediaPlayer.release();
                     mCurrentMediaPlayer = mNextMediaPlayer;
diff --git a/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java b/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java
index 915889b..5047fe5 100644
--- a/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java
+++ b/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java
@@ -16,7 +16,7 @@
 
 package com.andrew.apolloMod.service;
 
-import com.andrew.apolloMod.activities.MusicLibrary;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/andrew/apolloMod/service/ServiceBinder.java b/src/com/andrew/apolloMod/service/ServiceBinder.java
index faecba0..46ebe0b 100644
--- a/src/com/andrew/apolloMod/service/ServiceBinder.java
+++ b/src/com/andrew/apolloMod/service/ServiceBinder.java
@@ -6,7 +6,7 @@
 import android.os.IBinder;
 
 import com.andrew.apolloMod.IApolloService;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 public class ServiceBinder implements ServiceConnection {
     private final ServiceConnection mCallback;
diff --git a/src/com/andrew/apolloMod/activities/MusicLibrary.java b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
similarity index 91%
rename from src/com/andrew/apolloMod/activities/MusicLibrary.java
rename to src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
index 303bdeb..62c458d 100644
--- a/src/com/andrew/apolloMod/activities/MusicLibrary.java
+++ b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
@@ -1,13 +1,9 @@
-/**
- * 
- */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-
 import android.app.ActionBar;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -33,28 +29,27 @@
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.Window;
-
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.ui.adapters.PagerAdapter;
 import com.andrew.apolloMod.ui.adapters.ScrollingTabsAdapter;
 import com.andrew.apolloMod.ui.fragments.BottomActionBarFragment;
+import com.andrew.apolloMod.ui.fragments.RecentsRootFragment;
 import com.andrew.apolloMod.ui.fragments.grid.AlbumsFragment;
 import com.andrew.apolloMod.ui.fragments.grid.ArtistsFragment;
 import com.andrew.apolloMod.ui.fragments.list.GenresFragment;
 import com.andrew.apolloMod.ui.fragments.list.PlaylistsFragment;
-import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
 import com.andrew.apolloMod.ui.fragments.list.SongsFragment;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.preferences.SettingsHolder;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.service.ServiceToken;
-import com.andrew.apolloMod.ui.widgets.ScrollableTabView;
+import com.andrew.apolloMod.ui.views.ScrollableTabView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelSlideListener;
-
 import static com.andrew.apolloMod.Constants.TABS_ENABLED;
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 
 /**
  * @author Andrew Neal
@@ -73,9 +68,17 @@ public class MusicLibrary extends FragmentActivity implements ServiceConnection
 	private boolean isAlreadyStarted = false;	
     
     @Override
-    protected void onCreate(Bundle icicle) {
+    protected void onCreate(Bundle icicle) { 
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
-
+        
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
         // Landscape mode on phone isn't ready
         if (!ApolloUtils.isTablet(this))
@@ -84,8 +87,7 @@ protected void onCreate(Bundle icicle) {
         // Scan for music
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);       
        // getSupportFragmentManager().beginTransaction().add(R.id.bottomactionbar_new, new BottomActionBarFragment(), "bottomactionbar_new").commit();
-        
-        // Layout
+       // Layout
         setContentView(R.layout.library_browser);
         
         mBActionbar =(BottomActionBarFragment) getSupportFragmentManager().findFragmentById(R.id.bottomactionbar_new);
@@ -196,7 +198,7 @@ protected void onStop() {
      */
     public void initPager() {
         // Initiate PagerAdapter
-        PagerAdapter mPagerAdapter = new PagerAdapter(getSupportFragmentManager());
+        PagerAdapter mPagerAdapter = new PagerAdapter(this, getSupportFragmentManager());
 
         //Get tab visibility preferences
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
@@ -214,7 +216,7 @@ public void initPager() {
         //Only show tabs that were set in preferences
         // Recently added tracks
         if(tabs_set.contains(getResources().getString(R.string.tab_recent)))
-        	mPagerAdapter.addFragment(new RecentlyAddedFragment());
+        	mPagerAdapter.addFragment(new RecentsRootFragment());
         // Artists
         if(tabs_set.contains(getResources().getString(R.string.tab_artists)))
         	mPagerAdapter.addFragment(new ArtistsFragment());
diff --git a/src/com/andrew/apolloMod/activities/PlayExternal.java b/src/com/andrew/apolloMod/ui/activities/PlayExternal.java
similarity index 88%
rename from src/com/andrew/apolloMod/activities/PlayExternal.java
rename to src/com/andrew/apolloMod/ui/activities/PlayExternal.java
index 6d1e376..db5edee 100644
--- a/src/com/andrew/apolloMod/activities/PlayExternal.java
+++ b/src/com/andrew/apolloMod/ui/activities/PlayExternal.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -23,16 +24,18 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ServiceToken;
 
 import java.io.File;
@@ -51,6 +54,14 @@ public class PlayExternal extends Activity
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(savedInstanceState);
 
         // Get the external file to play
@@ -106,7 +117,7 @@ private void play(Uri uri) {
             else {
                 // Show a dialog asking the user for play or queue the song
                 AlertDialog.Builder builder =
-                        new AlertDialog.Builder(this, R.style.Theme_Light_Translucent_Dialog);
+                        new AlertDialog.Builder(this, R.style.Light_Translucent_Dialog);
                 builder.setTitle(R.string.app_name);
                 builder.setMessage(getString(R.string.play_external_question_msg, name));
 
diff --git a/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java b/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
similarity index 93%
rename from src/com/andrew/apolloMod/activities/QueryBrowserActivity.java
rename to src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
index 7ef4703..6dbe137 100644
--- a/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java
+++ b/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import android.app.ListActivity;
 import android.app.SearchManager;
@@ -24,13 +24,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.graphics.Color;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
@@ -38,21 +38,19 @@
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ServiceToken;
 
 import static com.andrew.apolloMod.Constants.ALBUM_KEY;
 import static com.andrew.apolloMod.Constants.ARTIST_ID;
 import static com.andrew.apolloMod.Constants.ARTIST_KEY;
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.MIME_TYPE;
 
 public class QueryBrowserActivity extends ListActivity implements ServiceConnection {
@@ -71,6 +69,14 @@ public QueryBrowserActivity() {
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
         mAdapter = (QueryListAdapter)getLastNonConfigurationInstance();
@@ -120,6 +126,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                 intent.setClass(this, TracksBrowser.class);
                 intent.putExtras(bundle);
                 startActivity(intent);
+                finish();
                 return;
             }
         }
@@ -152,7 +159,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
         mTrackList = getListView();
         mTrackList.setTextFilterEnabled(true);
         if (mAdapter == null) {
-            mAdapter = new QueryListAdapter(getApplication(), this, R.layout.listview_items, null, // cursor
+            mAdapter = new QueryListAdapter(getApplication(), this, R.layout.listview_items_search, null, // cursor
                     new String[] {}, new int[] {}, 0);
             setListAdapter(mAdapter);
             if (TextUtils.isEmpty(mFilterString)) {
@@ -335,21 +342,7 @@ public AsyncQueryHandler getQueryHandler() {
         public void bindView(View view, Context context, Cursor cursor) {
 
             TextView tv1 = (TextView)view.findViewById(R.id.listview_item_line_one);
-            tv1.setTextColor(Color.BLACK);
             TextView tv2 = (TextView)view.findViewById(R.id.listview_item_line_two);
-            tv2.setTextColor(Color.BLACK);
-            ImageView iv = (ImageView)view.findViewById(R.id.listview_item_image);
-            iv.setVisibility(View.GONE);
-            FrameLayout fl = (FrameLayout)view.findViewById(R.id.track_list_context_frame);
-            fl.setVisibility(View.GONE);
-            ViewGroup.LayoutParams p = iv.getLayoutParams();
-            if (p == null) {
-                // seen this happen, not sure why
-                DatabaseUtils.dumpCursor(cursor);
-                return;
-            }
-            p.width = ViewGroup.LayoutParams.WRAP_CONTENT;
-            p.height = ViewGroup.LayoutParams.WRAP_CONTENT;
 
             String mimetype = cursor.getString(cursor.getColumnIndexOrThrow(Audio.Media.MIME_TYPE));
 
@@ -440,7 +433,11 @@ public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            finish();
+        	Intent i = getBaseContext().getPackageManager()
+	   	             .getLaunchIntentForPackage( getBaseContext().getPackageName() );
+	   		i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+	   		startActivity(i);
+	   		finish();
             return true;
         }
         return super.onKeyDown(keyCode, event);
diff --git a/src/com/andrew/apolloMod/activities/QuickQueue.java b/src/com/andrew/apolloMod/ui/activities/QuickQueue.java
similarity index 58%
rename from src/com/andrew/apolloMod/activities/QuickQueue.java
rename to src/com/andrew/apolloMod/ui/activities/QuickQueue.java
index 3ed9c36..d3453d1 100644
--- a/src/com/andrew/apolloMod/activities/QuickQueue.java
+++ b/src/com/andrew/apolloMod/ui/activities/QuickQueue.java
@@ -2,16 +2,20 @@
  * 
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
+import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio;
 import android.support.v4.app.FragmentActivity;
 
+import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.ui.fragments.grid.QuickQueueFragment;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.MIME_TYPE;
 import static com.andrew.apolloMod.Constants.PLAYLIST_QUEUE;
 
@@ -22,6 +26,14 @@ public class QuickQueue extends FragmentActivity {
 
     @Override
     protected void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         // This needs to be called first
         super.onCreate(icicle);
 
diff --git a/src/com/andrew/apolloMod/activities/SimpleEq.java b/src/com/andrew/apolloMod/ui/activities/SimpleEq.java
similarity index 88%
rename from src/com/andrew/apolloMod/activities/SimpleEq.java
rename to src/com/andrew/apolloMod/ui/activities/SimpleEq.java
index 8649b42..c97e811 100644
--- a/src/com/andrew/apolloMod/activities/SimpleEq.java
+++ b/src/com/andrew/apolloMod/ui/activities/SimpleEq.java
@@ -2,12 +2,13 @@
  * 
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.NavUtils;
 import android.view.MenuItem;
@@ -17,10 +18,10 @@
 import android.widget.TextView;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.preferences.SharedPreferencesCompat;
-import com.andrew.apolloMod.views.VerticalSeekBar;
+import com.andrew.apolloMod.ui.views.VerticalSeekBar;
 
 import static com.andrew.apolloMod.Constants.*;
 
@@ -44,6 +45,14 @@ public class SimpleEq extends FragmentActivity
     
     @Override
     protected void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
         
         // Landscape mode on phone isn't ready
diff --git a/src/com/andrew/apolloMod/activities/TracksBrowser.java b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
similarity index 96%
rename from src/com/andrew/apolloMod/activities/TracksBrowser.java
rename to src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
index 2e85642..2e92097 100644
--- a/src/com/andrew/apolloMod/activities/TracksBrowser.java
+++ b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import android.app.SearchManager;
 import android.content.*;
@@ -13,6 +13,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
@@ -35,8 +36,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.PagerAdapter;
 import com.andrew.apolloMod.ui.fragments.BottomActionBarFragment;
 import com.andrew.apolloMod.ui.fragments.list.AlbumListFragment;
@@ -80,6 +81,14 @@ public class TracksBrowser extends FragmentActivity implements ServiceConnection
     
     @Override
     protected void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
         
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
@@ -434,7 +443,7 @@ public void onClick(View v) {
      */
     private void initPager() {
         // Initiate PagerAdapter
-        PagerAdapter mPagerAdapter = new PagerAdapter(getSupportFragmentManager());
+        PagerAdapter mPagerAdapter = new PagerAdapter(this, getSupportFragmentManager());
         if (ApolloUtils.isArtist(mimeType))
             // Show all albums for an artist
             mPagerAdapter.addFragment(new ArtistAlbumsFragment(bundle));
diff --git a/src/com/andrew/apolloMod/menu/PlaylistDialog.java b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
similarity index 91%
rename from src/com/andrew/apolloMod/menu/PlaylistDialog.java
rename to src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
index fc5049f..3e08416 100644
--- a/src/com/andrew/apolloMod/menu/PlaylistDialog.java
+++ b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
@@ -14,32 +14,37 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.menu;
+package com.andrew.apolloMod.ui.activities.dialogs;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.DialogInterface.OnShowListener;
+import android.content.res.Resources.Theme;
 import android.database.Cursor;
 import android.media.AudioManager;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
 import android.support.v4.app.FragmentActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.INTENT_CREATE_PLAYLIST;
 import static com.andrew.apolloMod.Constants.INTENT_KEY_DEFAULT_NAME;
 import static com.andrew.apolloMod.Constants.INTENT_KEY_RENAME;
@@ -116,7 +121,20 @@ public void onCancel(DialogInterface dialog) {
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {    	
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+		String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
+	
+		Theme theme = getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.PlaylistDialog, typedvalueattr, true); 
+		setTheme(typedvalueattr.resourceId);
 
         super.onCreate(icicle);
         setContentView(new LinearLayout(this));
diff --git a/src/com/andrew/apolloMod/menu/PlaylistPicker.java b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
similarity index 81%
rename from src/com/andrew/apolloMod/menu/PlaylistPicker.java
rename to src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
index 08fe425..c387116 100644
--- a/src/com/andrew/apolloMod/menu/PlaylistPicker.java
+++ b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
@@ -1,5 +1,5 @@
 
-package com.andrew.apolloMod.menu;
+package com.andrew.apolloMod.ui.activities.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,13 +9,18 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources.Theme;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.TypedValue;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.INTENT_ADD_TO_PLAYLIST;
 import static com.andrew.apolloMod.Constants.INTENT_CREATE_PLAYLIST;
 import static com.andrew.apolloMod.Constants.INTENT_PLAYLIST_LIST;
@@ -74,6 +79,19 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onCreate(Bundle icicle) {
 
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
+
+    	Theme theme = getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.PlaylistDialog, typedvalueattr, true); 
+		setTheme(typedvalueattr.resourceId);
         super.onCreate(icicle);
         setContentView(new LinearLayout(this));
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java b/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java
index a521da5..98aca01 100644
--- a/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java
@@ -6,7 +6,8 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
-import com.andrew.apolloMod.helpers.RefreshableFragment;
+
+import com.andrew.apolloMod.ui.fragments.base.RefreshableFragment;
 
 public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter {
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java b/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
index 55c5b4b..038729e 100644
--- a/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
@@ -4,13 +4,24 @@
 
 package com.andrew.apolloMod.ui.adapters;
 
+import static com.andrew.apolloMod.Constants.TABS_ENABLED;
+
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 
-import com.andrew.apolloMod.helpers.RefreshableFragment;
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
+import com.andrew.apolloMod.ui.fragments.RecentsRootFragment;
+import com.andrew.apolloMod.ui.fragments.base.RefreshableFragment;
 
 /**
  * @author Andrew Neal
@@ -18,9 +29,11 @@
 public class PagerAdapter extends FragmentPagerAdapter {
 
     private final ArrayList<Fragment> mFragments = new ArrayList<Fragment>();
+    private Context mContext;
 
-    public PagerAdapter(FragmentManager fragmentManager) {
+    public PagerAdapter(Context context, FragmentManager fragmentManager) {
         super(fragmentManager);
+    	mContext = context;
     }
 
     public void addFragment(Fragment fragment) {
@@ -34,7 +47,18 @@ public int getCount() {
     }
 
     @Override
-    public Fragment getItem(int position) {
+    public Fragment getItem(int position) {	
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
+        Set<String> defaults = new HashSet<String>(Arrays.asList(
+        		mContext.getResources().getStringArray(R.array.tab_titles)
+        	));
+        Set<String> tabs_set = sp.getStringSet(TABS_ENABLED,defaults);
+
+    	if (position == 0 
+    			&& tabs_set.contains(mContext.getResources().getString(R.string.tab_recent)) 
+    			&& MusicLibrary.class.isInstance(mContext) ){
+    		return new RecentsRootFragment();
+    	}
         return mFragments.get(position);
     }
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java b/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java
index 552dde5..8cb2c31 100644
--- a/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java
@@ -15,7 +15,7 @@
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
 import com.andrew.apolloMod.ui.fragments.grid.QuickQueueFragment;
-import com.andrew.apolloMod.views.ViewHolderQueue;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderQueue;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java b/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java
index 3f06f45..55afd07 100644
--- a/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java
@@ -17,8 +17,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.views.ViewHolderList;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderList;
 import com.mobeta.android.dslv.SimpleDragSortCursorAdapter;
 
 public abstract class DragSortListViewAdapter extends SimpleDragSortCursorAdapter{
diff --git a/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java b/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java
index f581f97..11dda5a 100644
--- a/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java
@@ -15,8 +15,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.views.ViewHolderGrid;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderGrid;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java b/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java
index 68fafdf..761a4d0 100644
--- a/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java
@@ -17,8 +17,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.views.ViewHolderList;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderList;
 
 public abstract class ListViewAdapter extends SimpleCursorAdapter {
 	
diff --git a/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java b/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java
index bc71b31..31c923f 100644
--- a/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java
@@ -7,7 +7,7 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.AlbumColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 
 public class AlbumAdapter extends GridViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java b/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java
index a22ecdd..ef9687a 100644
--- a/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.ArtistColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 
 public class ArtistAdapter extends GridViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java
index 70474dc..d7a1000 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java
@@ -7,7 +7,8 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class AlbumListAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java
index b465e53..b3d2dbb 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java
@@ -6,7 +6,8 @@
 import android.database.Cursor;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.AlbumColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class ArtistAlbumAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java
index 5ce21cf..a8c08da 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java
@@ -6,7 +6,8 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class ArtistListAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java
index 1014ac2..0dab8b9 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java
@@ -5,7 +5,7 @@
 import android.database.Cursor;
 import android.provider.MediaStore.Audio;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class GenreAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java
index 800038f..68bf8dc 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java
@@ -7,7 +7,7 @@
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class GenreListAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java
index e4f25ac..bb52855 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore.Audio.AudioColumns;
 import android.widget.Toast;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.DragSortListViewAdapter;
 
 public class NowPlayingAdapter extends DragSortListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java
index 47b5cf5..15f8a73 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java
@@ -11,7 +11,7 @@
 import android.util.Log;
 import android.widget.Toast;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.DragSortListViewAdapter;
 
 public class PlaylistListAdapter extends DragSortListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
index 1157b59..839e1a6 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
@@ -6,11 +6,12 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
 
-public class RecentlyAddedAdapter extends ListViewAdapter {
+public class RecentlyAddedAdapter extends GridViewAdapter {
 
     public RecentlyAddedAdapter(Context context, int layout, Cursor c, String[] from, int[] to,
             int flags) {
@@ -28,8 +29,6 @@ public void setupViewData( Cursor mCursor ){
         
         mPlayingId = MusicUtils.getCurrentAudioId();
         mCurrentId = mCursor.getLong(mCursor.getColumnIndexOrThrow(BaseColumns._ID));
-
-        mListType = TYPE_ALBUM;
-    	showContextEnabled = false;    	
+        mGridType = TYPE_ALBUM;
     }
 }
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyPlayedAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyPlayedAdapter.java
new file mode 100644
index 0000000..4fc670b
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyPlayedAdapter.java
@@ -0,0 +1,32 @@
+
+package com.andrew.apolloMod.ui.adapters.list;
+
+import android.content.Context;
+import android.database.Cursor;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
+
+public class RecentlyPlayedAdapter extends GridViewAdapter {
+
+    public RecentlyPlayedAdapter(Context context, int layout, Cursor c, String[] from, int[] to,
+            int flags) {
+        super(context, layout, c, from, to, flags);
+    }
+
+    public void setupViewData( Cursor mCursor ){
+    	mLineOneText = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.TITLE));
+
+    	mLineTwoText = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.ARTIST));
+
+        String albumName = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.ALBUM));
+        String albumId = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.ALBUM_ID));
+        mImageData = new String[]{ albumId , mLineTwoText, albumName };
+        
+        mPlayingId = MusicUtils.getCurrentAudioId();
+        mCurrentId = mCursor.getLong(mCursor.getColumnIndexOrThrow(RecentColumns._ID));
+        mGridType = TYPE_ALBUM;
+    }
+}
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java
index 8a68071..b18ed3e 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class SonglistAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
index 27cd611..0daa003 100644
--- a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
@@ -1,6 +1,10 @@
 
 package com.andrew.apolloMod.ui.fragments;
 
+import static com.andrew.apolloMod.Constants.ARTIST_ID;
+import static com.andrew.apolloMod.Constants.ARTIST_KEY;
+import static com.andrew.apolloMod.Constants.MIME_TYPE;
+import static com.andrew.apolloMod.Constants.NUMALBUMS;
 import static com.andrew.apolloMod.Constants.SIZE_NORMAL;
 import static com.andrew.apolloMod.Constants.SRC_FIRST_AVAILABLE;
 import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
@@ -9,14 +13,22 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Resources.Theme;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.Audio;
+import android.provider.MediaStore.Audio.ArtistColumns;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.SimpleOnPageChangeListener;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -28,27 +40,28 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.ui.activities.TracksBrowser;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.helpers.utils.VisualizerUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.helpers.VisualizerUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.AlbumArtPagerAdapter;
-import com.andrew.apolloMod.ui.widgets.RepeatingImageButton;
-import com.andrew.apolloMod.ui.widgets.VisualizerView;
+import com.andrew.apolloMod.ui.views.RepeatingImageButton;
+import com.andrew.apolloMod.ui.views.VisualizerView;
 
 public class AudioPlayerFragment extends Fragment {
 
     // Total and current time
-    private TextView mTotalTime, mCurrentTime;
+    private TextView mTotalTime, mCurrentTime, mAlbum, mArtist;
 
     // Album art
     private ViewPager mAlbumArtPager;
 
     private AlbumArtPagerAdapter mPagerAdapter;
     // Controls
-    private ImageButton mRepeat, mPlay, mShuffle;
+    private ImageButton mRepeat, mPlay, mShuffle, mViewArtist;
 
     private RepeatingImageButton mPrev, mNext;
 
@@ -71,10 +84,53 @@ public class AudioPlayerFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         root = inflater.inflate(R.layout.audio_player, container, false);
-        
+
         mTotalTime = (TextView)root.findViewById(R.id.audio_player_total_time);
         mCurrentTime = (TextView)root.findViewById(R.id.audio_player_current_time);
 
+        mAlbum = (TextView)root.findViewById(R.id.audio_player_album);
+        mArtist = (TextView)root.findViewById(R.id.audio_player_artist);
+        
+        mViewArtist = (ImageButton)root.findViewById(R.id.view_more);
+
+        mViewArtist.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String artistName = MusicUtils.getArtistName();
+                String artistId = String.valueOf(MusicUtils.getCurrentArtistId());
+                Bundle bundle = new Bundle();
+                bundle.putString(MIME_TYPE, Audio.Artists.CONTENT_TYPE);
+                bundle.putString(ARTIST_KEY, artistName);
+                String[] projection = {
+                        BaseColumns._ID, ArtistColumns.ARTIST, ArtistColumns.NUMBER_OF_ALBUMS
+                };
+                Uri uri = Audio.Artists.EXTERNAL_CONTENT_URI;   
+                Cursor cursor = null;
+                try{
+                	cursor = getActivity().getContentResolver().query(uri, projection, BaseColumns._ID+ "=" + DatabaseUtils.sqlEscapeString(artistId), null, null);
+                }
+                catch(Exception e){
+                	e.printStackTrace();        	
+                }
+                String artistNumAlbums = null;
+                int mArtistNumAlbumsIndex = cursor.getColumnIndexOrThrow(ArtistColumns.NUMBER_OF_ALBUMS);
+                if(cursor.getCount()>0){
+        	    	cursor.moveToFirst();
+        	    	artistNumAlbums = cursor.getString(mArtistNumAlbumsIndex);	
+        			cursor.close();
+                }
+                bundle.putString(NUMALBUMS, artistNumAlbums);
+                ApolloUtils.setArtistId(artistName, Long.parseLong(artistId), ARTIST_ID, getActivity());   
+
+                bundle.putLong( BaseColumns._ID, Long.parseLong(artistId) );
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setClass(getActivity(), TracksBrowser.class);
+                intent.putExtras(bundle);
+                getActivity().startActivity(intent);
+            }
+        });
+        
+
         mRepeat = (ImageButton)root.findViewById(R.id.audio_player_repeat);
         mPrev = (RepeatingImageButton)root.findViewById(R.id.audio_player_prev);
         mPlay = (ImageButton)root.findViewById(R.id.audio_player_play);
@@ -152,7 +208,7 @@ public void onClick(View v) {
         mAlbumArtPager.setOffscreenPageLimit(3);
         mAlbumArtPager.setCurrentItem(1);
         mAlbumArtPager.setOnPageChangeListener(new AlbumArtPageListener());
-        
+        setRepeatButtonImage();
         FrameLayout mColorstripBottom = (FrameLayout)root.findViewById(R.id.colorstrip_bottom);
         mColorstripBottom.setBackgroundColor(getResources().getColor(R.color.holo_blue_dark));
         return root;
@@ -418,7 +474,10 @@ private void setRepeatButtonImage() {
                     mRepeat.setImageResource(R.drawable.apollo_holo_light_repeat_one);
                     break;
                 default:
-                    mRepeat.setImageResource(R.drawable.apollo_holo_light_repeat_normal);
+                	Theme theme = getActivity().getTheme();
+        			TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioRepeatButton, typedvalueattr, true); 
+                    mRepeat.setImageResource(typedvalueattr.resourceId);
                     break;
             }
         } catch (RemoteException ex) {
@@ -435,7 +494,10 @@ private void setShuffleButtonImage() {
         try {
             switch (MusicUtils.mService.getShuffleMode()) {
                 case ApolloService.SHUFFLE_NONE:
-                    mShuffle.setImageResource(R.drawable.apollo_holo_light_shuffle_normal);
+                	Theme theme = getActivity().getTheme();
+        			TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioShuffleButton, typedvalueattr, true); 
+                    mShuffle.setImageResource(typedvalueattr.resourceId);
                     break;
                 case ApolloService.SHUFFLE_AUTO:
                     mShuffle.setImageResource(R.drawable.apollo_holo_light_shuffle_on);
@@ -454,11 +516,14 @@ private void setShuffleButtonImage() {
      */
     private void setPauseButtonImage() {
         try {
+        	Theme theme = getActivity().getTheme();
+			TypedValue typedvalueattr = new TypedValue();
             if (MusicUtils.mService != null && MusicUtils.mService.isPlaying()) {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_pause);
+    			theme.resolveAttribute(R.attr.AudioPauseButton, typedvalueattr, true); 
             } else {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_play);
+    			theme.resolveAttribute(R.attr.AudioPlayButton, typedvalueattr, true); 
             }
+            mPlay.setImageResource(typedvalueattr.resourceId);
         } catch (RemoteException ex) {
             ex.printStackTrace();
         }
@@ -537,6 +602,9 @@ public void onStopTrackingTouch(SeekBar bar) {
      * @return current time
      */
     private long refreshNow() {
+    	Theme theme = getActivity().getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.AudioTextColor, typedvalueattr, true); 
         if (MusicUtils.mService == null)
             return 500;
         try {
@@ -547,14 +615,14 @@ private long refreshNow() {
 
                 if (MusicUtils.mService.isPlaying()) {
                     mCurrentTime.setVisibility(View.VISIBLE);
-                    mCurrentTime.setTextColor(getResources().getColor(R.color.transparent_black));
+                    mCurrentTime.setTextColor(getResources().getColor(typedvalueattr.resourceId));
                 } else {
                     // blink the counter
                     int col = mCurrentTime.getCurrentTextColor();
                     mCurrentTime.setTextColor(col == getResources().getColor(
-                            R.color.transparent_black) ? getResources().getColor(
+                    		typedvalueattr.resourceId) ? getResources().getColor(
                             R.color.holo_blue_dark) : getResources().getColor(
-                            R.color.transparent_black));
+                            typedvalueattr.resourceId));
                     remaining = 500;
                 }
 
@@ -584,6 +652,9 @@ private void updateMusicInfo() {
         mDuration = MusicUtils.getDuration();
         mTotalTime.setText(MusicUtils.makeTimeString(getActivity(), mDuration / 1000));
 
+        mAlbum.setText(albumName);
+        mArtist.setText(artistName);
+        
         ImageInfo mInfo = new ImageInfo();
         mInfo.type = TYPE_ALBUM;
         mInfo.size = SIZE_NORMAL;
diff --git a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
index 75213f8..23f8a60 100644
--- a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
@@ -7,36 +7,63 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Resources.Theme;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.support.v4.app.Fragment;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
+
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.fragments.list.NowPlayingFragment;
-import com.andrew.apolloMod.ui.widgets.BottomActionBar;
+import com.andrew.apolloMod.ui.views.BottomActionBar;
 
 public class BottomActionBarFragment extends Fragment {
 
-	private ImageButton mPrev, mPlay, mNext, mQueue;
+	private ImageButton mPrev, mPlay, mNext, mQueue, mFavs;
+	private ImageView mAlbumImage;
     private BottomActionBar mBottomActionBar;
     private RelativeLayout albumArt, listQueue;
+    private TextView mSongName, mSongNameOnly, mArtistName;
     
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     	View root = inflater.inflate(R.layout.bottom_action_bar, container);
         mBottomActionBar = new BottomActionBar(getActivity());
-        
-        
+        mAlbumImage = (ImageView)root.findViewById(R.id.bottom_action_bar_album_art);
+
+        mSongName = (TextView)root.findViewById(R.id.bottom_action_bar_track_name);
+        mSongNameOnly = (TextView)root.findViewById(R.id.bottom_action_bar_track_name_only);
+        mArtistName = (TextView)root.findViewById(R.id.bottom_action_bar_artist_name);
+
         mQueue = (ImageButton)root.findViewById(R.id.bottom_action_bar_switch_queue);
-        
+
+        mFavs = (ImageButton)root.findViewById(R.id.bottom_action_bar_favorites);
+        mFavs.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+            	MusicUtils.toggleFavorite();
+            	if(MusicUtils.isFavorite(getActivity(), MusicUtils.getCurrentAudioId())){
+            		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_selected);
+            	}
+            	else{
+                	Theme theme = getActivity().getTheme();
+            		TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioFavoritesButton, typedvalueattr, true); 
+            		mFavs.setImageResource(typedvalueattr.resourceId);
+            	}
+            }
+        });
         
         
         mPrev = (ImageButton)root.findViewById(R.id.bottom_action_bar_previous);
@@ -129,19 +156,26 @@ private void doPauseResume() {
         }
     }
 
-    public void onCollapsed(){
+    public void onCollapsed(){    
+    	Theme theme = getActivity().getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.AudioQueueButton, typedvalueattr, true); 
+    	mQueue.setImageResource( typedvalueattr.resourceId );
+    	mQueue.setVisibility(View.GONE);
+    	mFavs.setVisibility(View.GONE);        
+        listQueue.setVisibility(View.GONE);
+        
     	mPrev.setVisibility(View.VISIBLE);
     	mNext.setVisibility(View.VISIBLE);
     	mPlay.setVisibility(View.VISIBLE);
-    	
-    	mQueue.setImageResource(R.drawable.btn_switch_queue);
-    	mQueue.setVisibility(View.GONE);
-        
-        listQueue.setVisibility(View.GONE);
+    	mAlbumImage.setVisibility(View.VISIBLE);
         albumArt.setVisibility(View.VISIBLE);
+        
+        mSongName.setVisibility(View.VISIBLE);
+        mArtistName.setVisibility(View.VISIBLE);
+        mSongNameOnly.setVisibility(View.GONE);
 
         fade(listQueue, 0f);
-        // Fade in the album art
         fade(albumArt, 1f);
     }
     
@@ -149,7 +183,14 @@ public void onExpanded(){
     	mPrev.setVisibility(View.GONE);
     	mNext.setVisibility(View.GONE);
     	mPlay.setVisibility(View.GONE);
+    	
+    	mAlbumImage.setVisibility(View.GONE);
     	mQueue.setVisibility(View.VISIBLE);
+    	mFavs.setVisibility(View.VISIBLE);
+    	
+        mSongName.setVisibility(View.GONE);
+        mArtistName.setVisibility(View.GONE);
+        mSongNameOnly.setVisibility(View.VISIBLE);
     }
     
     /**
@@ -169,11 +210,14 @@ private void fade(final View v, final float alpha) {
      */
     private void setPauseButtonImage() {
         try {
+        	Theme theme = getActivity().getTheme();
+			TypedValue typedvalueattr = new TypedValue();
             if (MusicUtils.mService != null && MusicUtils.mService.isPlaying()) {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_pause);
+    			theme.resolveAttribute(R.attr.AudioPauseButton, typedvalueattr, true); 
             } else {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_play);
+    			theme.resolveAttribute(R.attr.AudioPlayButton, typedvalueattr, true); 
             }
+            mPlay.setImageResource(typedvalueattr.resourceId);
         } catch (RemoteException ex) {
             ex.printStackTrace();
         }
@@ -200,7 +244,10 @@ public void onClick(View v) {
             	else{
                     listQueue.setVisibility(View.GONE);
                     albumArt.setVisibility(View.VISIBLE);
-            		mQueue.setImageResource(R.drawable.btn_switch_queue);
+                	Theme theme = getActivity().getTheme();
+            		TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioQueueButton, typedvalueattr, true); 
+            		mQueue.setImageResource(typedvalueattr.resourceId);
                     // Fade out the pager container
                     fade(listQueue, 0f);
                     // Fade in the album art
diff --git a/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java b/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
new file mode 100644
index 0000000..5a57b01
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
@@ -0,0 +1,52 @@
+
+package com.andrew.apolloMod.ui.fragments;
+
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyPlayedFragment;
+import static com.andrew.apolloMod.Constants.RECENTS_TYPE;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class RecentsRootFragment extends Fragment {
+
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+
+		View view = inflater.inflate(R.layout.recents_root_fragment, container, false);
+
+		FragmentTransaction transaction = getFragmentManager()
+				.beginTransaction();
+		
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
+		String type = sp.getString(RECENTS_TYPE, getResources().getString(R.string.recents_added));                    
+ 	    if( type.equals(getResources().getString(R.string.recents_added)) ){
+ 	    	Log.e("Recents","ADDED!!!!!");
+ 	    	transaction.replace(R.id.root_frame, new RecentlyAddedFragment());
+ 	    }
+ 	    else if( type.equals(getResources().getString(R.string.recents_played)) ){
+ 	    	Log.e("Recents","PLAYED!!!!!");
+ 	    	transaction.replace(R.id.root_frame, new RecentlyPlayedFragment());
+ 	    }
+ 	    else{
+ 	    	Log.e("Recents","SPLITTERRR!!!!!");
+ 	    	transaction.replace(R.id.root_frame, new RecentsSplitFragment());
+ 	    }     	
+
+		//transaction.replace(R.id.root_frame, new RecentsSplitFragment());
+
+		transaction.commit();
+
+		return view;
+	}
+
+}
diff --git a/src/com/andrew/apolloMod/ui/fragments/RecentsSplitFragment.java b/src/com/andrew/apolloMod/ui/fragments/RecentsSplitFragment.java
new file mode 100644
index 0000000..3427d82
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/fragments/RecentsSplitFragment.java
@@ -0,0 +1,178 @@
+
+package com.andrew.apolloMod.ui.fragments;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.app.Activity;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.MediaColumns;
+import android.provider.MediaStore.Audio.AudioColumns;
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.cache.ImageInfo;
+import com.andrew.apolloMod.cache.ImageProvider;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.providers.RecentsLoader;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyPlayedFragment;
+
+import static com.andrew.apolloMod.Constants.SIZE_THUMB;
+import static com.andrew.apolloMod.Constants.SRC_FIRST_AVAILABLE;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
+
+public class RecentsSplitFragment  extends Fragment implements LoaderCallbacks<Cursor>{
+	
+	private LinearLayout mWrapper;
+	
+	private Cursor mCursor;
+	
+    private ImageProvider mImageProvider;
+	
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        getLoaderManager().initLoader(0, null, this);
+    	mImageProvider = ImageProvider.getInstance( (Activity) getActivity() );
+    }    
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.recents_main, container, false);
+        mWrapper = (LinearLayout )root.findViewById(R.id.recents_wrapper);
+        return root;
+    }
+
+	@Override
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {    
+        return new RecentsLoader(getActivity());
+    }
+
+	@Override
+	public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
+		mWrapper.removeAllViews();
+		mWrapper.addView(View.inflate(getActivity(), R.layout.shadow, null));
+
+		mCursor = cursor;
+		View row = null;
+		mCursor.moveToPosition(-1);
+		int count = 0;
+		boolean added = false;
+		row = View.inflate(getActivity(), R.layout.recently_added_heading, null);
+		View wrapper = row.findViewById(R.id.recently_added_wrapper);
+		wrapper.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					FragmentTransaction trans = getFragmentManager()
+					.beginTransaction();
+					trans.replace(R.id.root_frame, new RecentlyAddedFragment());
+					trans.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+					trans.addToBackStack(null);
+					trans.commit();
+				}
+			});
+		mWrapper.addView(row);
+		
+		while (mCursor.moveToNext()) {
+			if(mCursor.getString(mCursor.getColumnIndex(BaseColumns._ID)).equals("-1")){
+				count = 0;
+				if(!added){
+					mWrapper.addView(row);
+					added = true;
+				}
+				row = View.inflate(getActivity(), R.layout.recently_added_heading, null);
+				((TextView)row.findViewById(R.id.recents_textview)).setText(R.string.recents_played);
+				wrapper = row.findViewById(R.id.recently_added_wrapper);
+				wrapper.setOnClickListener(new OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							FragmentTransaction trans = getFragmentManager()
+							.beginTransaction();
+							trans.replace(R.id.root_frame, new RecentlyPlayedFragment());
+							trans.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+							trans.addToBackStack(null);
+							trans.commit();
+						}
+					});
+				
+				
+				
+				mWrapper.addView(row);									
+				continue;
+			}
+			if (count % 2 == 0) {
+				row = View.inflate(getActivity(), R.layout.recents_row, null);
+				View col1 = row.findViewById(R.id.recent_column1);
+				col1.setVisibility(View.VISIBLE);
+				col1.setTag(mCursor.getLong(mCursor.getColumnIndexOrThrow(BaseColumns._ID)));
+				col1.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						MusicUtils.addToCurrentPlaylist(getActivity(), new long[]{(Long)v.getTag()});
+					}
+				});
+				TextView lineOne = (TextView) row.findViewById(R.id.recent_line_one1);
+				TextView lineTwo = (TextView) row.findViewById(R.id.recent_line_two1);
+				lineOne.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(MediaColumns.TITLE)));
+				lineTwo.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST)));
+				added = false;
+				
+				String artistName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String albumName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+		        String albumId = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM_ID));
+		        ImageInfo mInfo = new ImageInfo();
+	            mInfo.type = TYPE_ALBUM;
+	            mInfo.size = SIZE_THUMB;
+	            mInfo.source = SRC_FIRST_AVAILABLE;
+	            mInfo.data = new String[]{ albumId , artistName, albumName };
+	            mImageProvider.loadImage( (ImageView) row.findViewById(R.id.recent_image1), mInfo ); 
+			}	
+			else{
+				View col2 = row.findViewById(R.id.recent_column2);
+				col2.setVisibility(View.VISIBLE);
+				col2.setTag(mCursor.getLong(mCursor.getColumnIndexOrThrow(BaseColumns._ID)));
+				col2.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						MusicUtils.addToCurrentPlaylist(getActivity(), new long[]{(Long)v.getTag()});
+					}
+				});
+				TextView lineOne = (TextView) row.findViewById(R.id.recent_line_one2);
+				TextView lineTwo = (TextView) row.findViewById(R.id.recent_line_two2);
+				lineOne.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(MediaColumns.TITLE)));
+				lineTwo.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST)));
+				mWrapper.addView(row);
+				added = true;
+				
+				String artistName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String albumName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+		        String albumId = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM_ID));
+		        ImageInfo mInfo = new ImageInfo();
+	            mInfo.type = TYPE_ALBUM;
+	            mInfo.size = SIZE_THUMB;
+	            mInfo.source = SRC_FIRST_AVAILABLE;
+	            mInfo.data = new String[]{ albumId , artistName, albumName };
+	            mImageProvider.loadImage( (ImageView) row.findViewById(R.id.recent_image2), mInfo ); 
+			}
+			count++;
+		}	
+		if(!added){
+			mWrapper.addView(row);
+		}
+		
+	}
+
+	@Override
+	public void onLoaderReset(Loader<Cursor> arg0) {
+		
+	}
+}
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java
index df763d8..bf1bd43 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java
@@ -25,8 +25,7 @@
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.RefreshableFragment;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.base.DragSortListViewAdapter;
 import com.mobeta.android.dslv.DragSortController;
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
index 3ebded7..2f4de4e 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
@@ -4,8 +4,8 @@
 import static com.andrew.apolloMod.Constants.INTENT_PLAYLIST_LIST;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 
@@ -34,7 +34,7 @@
 public abstract class GridViewFragment extends Fragment implements LoaderCallbacks<Cursor>,
 OnItemClickListener {
 
-	private GridView mGridView;
+	protected GridView mGridView;
 	
 	protected GridViewAdapter mAdapter;
 
@@ -48,7 +48,7 @@ public abstract class GridViewFragment extends Fragment implements LoaderCallbac
     
     protected int mFragmentGroupId = 0;
 
-    protected String mCurrentId, mSortOrder = null, mType = null;
+    protected String mCurrentId, mSortOrder = null, mType = null, mWhere = null;
     
     protected String[] mProjection = null;
     
@@ -86,14 +86,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        menu.add(mFragmentGroupId, PLAY_SELECTION, 0, getResources().getString(R.string.play_all));
-        menu.add(mFragmentGroupId, ADD_TO_PLAYLIST, 0, getResources().getString(R.string.add_to_playlist));
-        menu.add(mFragmentGroupId, SEARCH, 0, getResources().getString(R.string.search));
+    	if( mFragmentGroupId != 0 ){
+    	    menu.add(mFragmentGroupId, PLAY_SELECTION, 0, getResources().getString(R.string.play_all));
+    	    menu.add(mFragmentGroupId, ADD_TO_PLAYLIST, 0, getResources().getString(R.string.add_to_playlist));
+    	    menu.add(mFragmentGroupId, SEARCH, 0, getResources().getString(R.string.search));
 
-        mCurrentId = mCursor.getString(mCursor.getColumnIndexOrThrow(BaseColumns._ID));
+    	    mCurrentId = mCursor.getString(mCursor.getColumnIndexOrThrow(BaseColumns._ID));
 
-        menu.setHeaderView(ApolloUtils.setHeaderLayout(mType, mCursor, getActivity()));
-        super.onCreateContextMenu(menu, v, menuInfo);
+    	    menu.setHeaderView(ApolloUtils.setHeaderLayout(mType, mCursor, getActivity()));
+    	    super.onCreateContextMenu(menu, v, menuInfo);
+    	}
     }
 
     @Override
@@ -130,7 +132,7 @@ public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
 
 	@Override
 	public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-	     return new CursorLoader(getActivity(), mUri, mProjection, null, null, mSortOrder);
+	     return new CursorLoader(getActivity(), mUri, mProjection,  mWhere, null, mSortOrder);
 	}
 
 	@Override
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java
index 9b77979..9c8e59f 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java
@@ -23,8 +23,7 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.RefreshableFragment;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 import static com.andrew.apolloMod.Constants.INTENT_ADD_TO_PLAYLIST;
diff --git a/src/com/andrew/apolloMod/helpers/RefreshableFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/RefreshableFragment.java
similarity index 94%
rename from src/com/andrew/apolloMod/helpers/RefreshableFragment.java
rename to src/com/andrew/apolloMod/ui/fragments/base/RefreshableFragment.java
index 709c2fc..8a08998 100644
--- a/src/com/andrew/apolloMod/helpers/RefreshableFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/RefreshableFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.helpers;
+package com.andrew.apolloMod.ui.fragments.base;
 
 import android.support.v4.app.Fragment;
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java b/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java
index 576a795..9cf56fc 100644
--- a/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java
@@ -30,10 +30,9 @@
 import android.widget.GridView;
 import android.widget.LinearLayout;
 
-import com.andrew.apolloMod.NowPlayingCursor;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.AddIdCursorLoader;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.QuickQueueAdapter;
 
@@ -183,11 +182,6 @@ public boolean onContextItemSelected(MenuItem item) {
 
     @Override
     public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-        if (mCursor instanceof NowPlayingCursor) {
-            if (MusicUtils.mService != null) {
-                MusicUtils.setQueuePosition(position);
-            }
-        }
         MusicUtils.playAll(getActivity(), mCursor, position);
         getActivity().finish();
     }
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java
index 7e899df..b9783d0 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java
@@ -10,8 +10,8 @@
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.ArtistAlbumAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java
index ef8a14b..b0c9506 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java
@@ -9,8 +9,8 @@
 import android.view.View;
 import android.widget.AdapterView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.GenreAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_GENRE;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java
index 115307d..8e5b823 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java
@@ -10,7 +10,7 @@
 import android.provider.MediaStore.Audio.AudioColumns;
 import android.provider.MediaStore.MediaColumns;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.NowPlayingAdapter;
 import com.andrew.apolloMod.ui.fragments.base.DragSortListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_SONG;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java
index bc01776..4b0d3f8 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore.Audio.Playlists;
 import android.provider.MediaStore.MediaColumns;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.PlaylistListAdapter;
 import com.andrew.apolloMod.ui.fragments.base.DragSortListViewFragment;
 import static com.andrew.apolloMod.Constants.EXTERNAL;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java
index 8ce1201..59aa4b8 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java
@@ -15,8 +15,8 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.PlaylistAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.INTENT_KEY_RENAME;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
index d268101..21bc413 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
@@ -2,6 +2,8 @@
 package com.andrew.apolloMod.ui.fragments.list;
 
 import android.support.v4.content.Loader;
+import android.view.View;
+import android.widget.AdapterView;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.BaseColumns;
@@ -10,15 +12,16 @@
 import android.provider.MediaStore.MediaColumns;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.AddIdCursorLoader;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.RecentlyAddedAdapter;
-import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
+import com.andrew.apolloMod.ui.fragments.base.GridViewFragment;
 import static com.andrew.apolloMod.Constants.NUMWEEKS;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
 
-public class RecentlyAddedFragment extends ListViewFragment{
-
+public class RecentlyAddedFragment extends GridViewFragment{
+	
     public void setupFragmentData(){
-        mAdapter = new RecentlyAddedAdapter(getActivity(), R.layout.listview_items,
+        mAdapter = new RecentlyAddedAdapter(getActivity(), R.layout.gridview_items_recent,
                 null, new String[] {}, new int[] {}, 0);
     	mProjection = new String[] {
                 BaseColumns._ID, MediaColumns.TITLE, AudioColumns.ALBUM, AudioColumns.ARTIST
@@ -32,11 +35,16 @@ public void setupFragmentData(){
         mWhere = where.toString();
         mSortOrder = MediaColumns.DATE_ADDED + " DESC";
         mUri = Audio.Media.EXTERNAL_CONTENT_URI;
-        mTitleColumn = MediaColumns.TITLE;       
+        mType = TYPE_ALBUM;
     }
 
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {    
         return new AddIdCursorLoader(getActivity(), mUri, mProjection, mWhere, null, mSortOrder);
     }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+        MusicUtils.playAll(getActivity(), mCursor, position);
+    }
 }
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyPlayedFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyPlayedFragment.java
new file mode 100644
index 0000000..7925f5d
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyPlayedFragment.java
@@ -0,0 +1,34 @@
+
+package com.andrew.apolloMod.ui.fragments.list;
+
+import android.view.View;
+import android.widget.AdapterView;
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.adapters.list.RecentlyPlayedAdapter;
+import com.andrew.apolloMod.ui.fragments.base.GridViewFragment;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
+
+import com.andrew.apolloMod.providers.HistoryStore;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
+
+public class RecentlyPlayedFragment extends GridViewFragment{
+	
+    public void setupFragmentData(){
+        mAdapter = new RecentlyPlayedAdapter(getActivity(), R.layout.gridview_items_recent,
+                null, new String[] {}, new int[] {}, 0);
+    	mProjection = new String[] {
+    			"DISTINCT "+RecentColumns._ID, RecentColumns.TIME_PLAYED,
+                RecentColumns.TITLE, RecentColumns.ARTIST,
+                RecentColumns.ALBUM, RecentColumns.ALBUM_ID       
+        };        
+        mSortOrder = RecentColumns.TIME_PLAYED + " DESC";
+        mUri = HistoryStore.CONTENT_URI;
+        mType = TYPE_ALBUM;
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+        MusicUtils.playAll(getActivity(), mCursor, position);
+    }
+}
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java
index 65d6508..a4a4417 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java
@@ -14,7 +14,7 @@
 import android.widget.RelativeLayout;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.SonglistAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_SONG;
diff --git a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java b/src/com/andrew/apolloMod/ui/views/BottomActionBar.java
similarity index 72%
rename from src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
rename to src/com/andrew/apolloMod/ui/views/BottomActionBar.java
index b9b2a97..547f627 100644
--- a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
+++ b/src/com/andrew/apolloMod/ui/views/BottomActionBar.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import static com.andrew.apolloMod.Constants.SIZE_THUMB;
 import static com.andrew.apolloMod.Constants.SRC_FIRST_AVAILABLE;
@@ -10,19 +10,22 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources.Theme;
 import android.os.RemoteException;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.View.OnLongClickListener;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.QuickQueue;
+import com.andrew.apolloMod.ui.activities.QuickQueue;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 /**
  * @author Andrew Neal
@@ -55,11 +58,27 @@ public void updateBottomActionBar(Activity activity) {
         }
 
         if (MusicUtils.mService != null && MusicUtils.getCurrentAudioId() != -1) {
-
+        	ImageButton mFavs = (ImageButton)bottomActionBar
+        			.findViewById(R.id.bottom_action_bar_favorites);
+        	if(MusicUtils.isFavorite(activity, MusicUtils.getCurrentAudioId())){
+        		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_selected);
+        	}
+        	else{
+            	Theme theme = activity.getTheme();
+        		TypedValue typedvalueattr = new TypedValue();
+        		theme.resolveAttribute(R.attr.AudioFavoritesButton, typedvalueattr, true); 
+        		mFavs.setImageResource(typedvalueattr.resourceId);
+        	}
+            
             // Track name
             TextView mTrackName = (TextView)bottomActionBar
                     .findViewById(R.id.bottom_action_bar_track_name);
             mTrackName.setText(MusicUtils.getTrackName());
+            
+            // Track name
+            TextView mTrackNameOnly = (TextView)bottomActionBar
+                    .findViewById(R.id.bottom_action_bar_track_name_only);
+            mTrackNameOnly.setText(MusicUtils.getTrackName());
 
             // Artist name
             TextView mArtistName = (TextView)bottomActionBar
diff --git a/src/com/andrew/apolloMod/ui/widgets/RepeatingImageButton.java b/src/com/andrew/apolloMod/ui/views/RepeatingImageButton.java
similarity index 99%
rename from src/com/andrew/apolloMod/ui/widgets/RepeatingImageButton.java
rename to src/com/andrew/apolloMod/ui/views/RepeatingImageButton.java
index df3d2a9..3761eba 100644
--- a/src/com/andrew/apolloMod/ui/widgets/RepeatingImageButton.java
+++ b/src/com/andrew/apolloMod/ui/views/RepeatingImageButton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import android.content.Context;
 import android.os.SystemClock;
diff --git a/src/com/andrew/apolloMod/ui/widgets/ScrollableTabView.java b/src/com/andrew/apolloMod/ui/views/ScrollableTabView.java
similarity index 99%
rename from src/com/andrew/apolloMod/ui/widgets/ScrollableTabView.java
rename to src/com/andrew/apolloMod/ui/views/ScrollableTabView.java
index 4757212..60356c7 100644
--- a/src/com/andrew/apolloMod/ui/widgets/ScrollableTabView.java
+++ b/src/com/andrew/apolloMod/ui/views/ScrollableTabView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import java.util.ArrayList;
 
diff --git a/src/com/andrew/apolloMod/views/TrackBrowserImageView.java b/src/com/andrew/apolloMod/ui/views/TrackBrowserImageView.java
similarity index 97%
rename from src/com/andrew/apolloMod/views/TrackBrowserImageView.java
rename to src/com/andrew/apolloMod/ui/views/TrackBrowserImageView.java
index 53e4ab6..ff48ce9 100644
--- a/src/com/andrew/apolloMod/views/TrackBrowserImageView.java
+++ b/src/com/andrew/apolloMod/ui/views/TrackBrowserImageView.java
@@ -1,4 +1,4 @@
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views;
 
 
 import android.content.Context;
diff --git a/src/com/andrew/apolloMod/views/VerticalSeekBar.java b/src/com/andrew/apolloMod/ui/views/VerticalSeekBar.java
similarity index 97%
rename from src/com/andrew/apolloMod/views/VerticalSeekBar.java
rename to src/com/andrew/apolloMod/ui/views/VerticalSeekBar.java
index e7aa47b..7e6b752 100644
--- a/src/com/andrew/apolloMod/views/VerticalSeekBar.java
+++ b/src/com/andrew/apolloMod/ui/views/VerticalSeekBar.java
@@ -1,4 +1,4 @@
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/andrew/apolloMod/ui/widgets/VisualizerView.java b/src/com/andrew/apolloMod/ui/views/VisualizerView.java
similarity index 98%
rename from src/com/andrew/apolloMod/ui/widgets/VisualizerView.java
rename to src/com/andrew/apolloMod/ui/views/VisualizerView.java
index f9e6eef..c36fcc2 100644
--- a/src/com/andrew/apolloMod/ui/widgets/VisualizerView.java
+++ b/src/com/andrew/apolloMod/ui/views/VisualizerView.java
@@ -4,7 +4,7 @@
  * Licensed under the MIT license:
  * http://creativecommons.org/licenses/MIT/
  */
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.visualizer.AudioData;
diff --git a/src/com/andrew/apolloMod/views/ViewHolderGrid.java b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderGrid.java
similarity index 87%
rename from src/com/andrew/apolloMod/views/ViewHolderGrid.java
rename to src/com/andrew/apolloMod/ui/views/holders/ViewHolderGrid.java
index c44cbb1..967bf74 100644
--- a/src/com/andrew/apolloMod/views/ViewHolderGrid.java
+++ b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderGrid.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views.holders;
 
 import android.view.View;
 import android.widget.ImageView;
@@ -31,7 +31,6 @@ public ViewHolderGrid(View view) {
         mPeakOne = (ImageView)view.findViewById(R.id.peak_one);
         mPeakTwo = (ImageView)view.findViewById(R.id.peak_two);
         mInfoHolder = (LinearLayout)view.findViewById(R.id.gridview_info_holder);
-        mInfoHolder.setBackgroundColor(view.getResources().getColor(R.color.transparent_black));
     }
 
 }
diff --git a/src/com/andrew/apolloMod/views/ViewHolderList.java b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderList.java
similarity index 96%
rename from src/com/andrew/apolloMod/views/ViewHolderList.java
rename to src/com/andrew/apolloMod/ui/views/holders/ViewHolderList.java
index 8589e70..d8453dd 100644
--- a/src/com/andrew/apolloMod/views/ViewHolderList.java
+++ b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderList.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views.holders;
 
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/src/com/andrew/apolloMod/views/ViewHolderQueue.java b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderQueue.java
similarity index 94%
rename from src/com/andrew/apolloMod/views/ViewHolderQueue.java
rename to src/com/andrew/apolloMod/ui/views/holders/ViewHolderQueue.java
index aae85a1..ba1c179 100644
--- a/src/com/andrew/apolloMod/views/ViewHolderQueue.java
+++ b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderQueue.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views.holders;
 
 import android.view.View;
 import android.widget.ImageView;