diff --git a/gen/net/sourceforge/subsonic/androidapp/R.java b/gen/net/sourceforge/subsonic/androidapp/R.java
index b31f7956..fd48478c 100644
--- a/gen/net/sourceforge/subsonic/androidapp/R.java
+++ b/gen/net/sourceforge/subsonic/androidapp/R.java
@@ -349,12 +349,12 @@ public final class R {
         public static final int select_album_n_songs_downloading=0x7f0a0001;
     }
     public static final class string {
-        public static final int background_task_loading=0x7f0900ee;
-        public static final int background_task_network_error=0x7f0900f0;
-        public static final int background_task_no_network=0x7f0900ef;
-        public static final int background_task_not_found=0x7f0900f1;
-        public static final int background_task_parse_error=0x7f0900f2;
-        public static final int background_task_wait=0x7f0900ed;
+        public static final int background_task_loading=0x7f0900ef;
+        public static final int background_task_network_error=0x7f0900f1;
+        public static final int background_task_no_network=0x7f0900f0;
+        public static final int background_task_not_found=0x7f0900f2;
+        public static final int background_task_parse_error=0x7f0900f3;
+        public static final int background_task_wait=0x7f0900ee;
         public static final int button_bar_browse=0x7f09000b;
         public static final int button_bar_home=0x7f09000a;
         public static final int button_bar_now_playing=0x7f09000e;
@@ -402,9 +402,9 @@ public final class R {
         public static final int download_repeat_single=0x7f09005f;
         public static final int download_visualizer_off=0x7f090061;
         public static final int download_visualizer_on=0x7f090060;
-        public static final int equalizer_enabled=0x7f0900ff;
-        public static final int equalizer_label=0x7f0900fe;
-        public static final int equalizer_preset=0x7f090100;
+        public static final int equalizer_enabled=0x7f090100;
+        public static final int equalizer_label=0x7f0900ff;
+        public static final int equalizer_preset=0x7f090101;
         public static final int error_label=0x7f09006b;
         public static final int help_back=0x7f090027;
         public static final int help_close=0x7f090028;
@@ -439,14 +439,14 @@ public final class R {
         /** <string name="settings.screen_lit_title">TODO: Keep screen on</string>
 <string name="settings.screen_lit_summary">TODO: Keeping the screen on when downloading may improve download speed</string>
          */
-        public static final int music_service_retry=0x7f0900ec;
-        public static final int parser_artist_count=0x7f0900fa;
-        public static final int parser_not_authenticated=0x7f0900f8;
-        public static final int parser_not_authorized=0x7f0900f9;
-        public static final int parser_reading=0x7f0900f4;
-        public static final int parser_reading_done=0x7f0900f5;
-        public static final int parser_upgrade_client=0x7f0900f6;
-        public static final int parser_upgrade_server=0x7f0900f7;
+        public static final int music_service_retry=0x7f0900ed;
+        public static final int parser_artist_count=0x7f0900fb;
+        public static final int parser_not_authenticated=0x7f0900f9;
+        public static final int parser_not_authorized=0x7f0900fa;
+        public static final int parser_reading=0x7f0900f5;
+        public static final int parser_reading_done=0x7f0900f6;
+        public static final int parser_upgrade_client=0x7f0900f7;
+        public static final int parser_upgrade_server=0x7f0900f8;
         public static final int play_video_loading=0x7f09002b;
         public static final int play_video_noplugin=0x7f09002c;
         /** <string name="menu.exit">TODO: Exit</string>
@@ -481,21 +481,21 @@ public final class R {
         public static final int select_album_play_all=0x7f09003f;
         public static final int select_album_searching=0x7f09003e;
         public static final int select_album_select=0x7f090039;
-        public static final int select_artist_all_folders=0x7f0900fd;
-        public static final int select_artist_folder=0x7f0900fc;
-        public static final int select_artist_refresh=0x7f0900fb;
+        public static final int select_artist_all_folders=0x7f0900fe;
+        public static final int select_artist_folder=0x7f0900fd;
+        public static final int select_artist_refresh=0x7f0900fc;
         public static final int select_playlist_empty=0x7f090047;
-        public static final int service_connecting=0x7f0900f3;
+        public static final int service_connecting=0x7f0900f4;
         public static final int settings_appearance_title=0x7f090080;
-        public static final int settings_buffer_length=0x7f0900b2;
-        public static final int settings_buffer_length_10=0x7f0900b7;
-        public static final int settings_buffer_length_12=0x7f0900b8;
-        public static final int settings_buffer_length_15=0x7f0900b9;
-        public static final int settings_buffer_length_2=0x7f0900b4;
-        public static final int settings_buffer_length_20=0x7f0900ba;
-        public static final int settings_buffer_length_30=0x7f0900bb;
-        public static final int settings_buffer_length_5=0x7f0900b5;
-        public static final int settings_buffer_length_8=0x7f0900b6;
+        public static final int settings_buffer_length=0x7f0900b3;
+        public static final int settings_buffer_length_10=0x7f0900b8;
+        public static final int settings_buffer_length_12=0x7f0900b9;
+        public static final int settings_buffer_length_15=0x7f0900ba;
+        public static final int settings_buffer_length_2=0x7f0900b5;
+        public static final int settings_buffer_length_20=0x7f0900bb;
+        public static final int settings_buffer_length_30=0x7f0900bc;
+        public static final int settings_buffer_length_5=0x7f0900b6;
+        public static final int settings_buffer_length_8=0x7f0900b7;
         public static final int settings_cache_location=0x7f090078;
         public static final int settings_cache_location_error=0x7f090079;
         public static final int settings_cache_size=0x7f090077;
@@ -511,37 +511,37 @@ public final class R {
         public static final int settings_cache_title=0x7f090075;
         public static final int settings_clear_search_history=0x7f0900a5;
         public static final int settings_connection_failure=0x7f09007d;
-        public static final int settings_default_albums=0x7f0900ea;
-        public static final int settings_default_artists=0x7f0900e9;
-        public static final int settings_default_songs=0x7f0900eb;
-        public static final int settings_hide_media_summary=0x7f0900ac;
+        public static final int settings_default_albums=0x7f0900eb;
+        public static final int settings_default_artists=0x7f0900ea;
+        public static final int settings_default_songs=0x7f0900ec;
+        public static final int settings_hide_media_summary=0x7f0900ad;
         /** <string name="settings.scrobble_title">TODO: Scrobble to Last.fm</string>
 <string name="settings.scrobble_summary">TODO: Remember to set up your Last.fm user and password on the Subsonic server</string>
          */
-        public static final int settings_hide_media_title=0x7f0900ab;
-        public static final int settings_hide_media_toast=0x7f0900ad;
+        public static final int settings_hide_media_title=0x7f0900ac;
+        public static final int settings_hide_media_toast=0x7f0900ae;
         public static final int settings_invalid_url=0x7f09007e;
         public static final int settings_invalid_username=0x7f09007f;
-        public static final int settings_max_albums=0x7f0900cc;
-        public static final int settings_max_albums_10=0x7f0900ce;
-        public static final int settings_max_albums_100=0x7f0900d3;
-        public static final int settings_max_albums_20=0x7f0900cf;
-        public static final int settings_max_albums_250=0x7f0900d4;
-        public static final int settings_max_albums_30=0x7f0900d0;
-        public static final int settings_max_albums_40=0x7f0900d1;
-        public static final int settings_max_albums_5=0x7f0900cd;
-        public static final int settings_max_albums_50=0x7f0900d2;
-        public static final int settings_max_albums_500=0x7f0900d5;
-        public static final int settings_max_artists=0x7f0900df;
-        public static final int settings_max_artists_10=0x7f0900e2;
-        public static final int settings_max_artists_100=0x7f0900e6;
-        public static final int settings_max_artists_200=0x7f0900e7;
-        public static final int settings_max_artists_25=0x7f0900e3;
-        public static final int settings_max_artists_3=0x7f0900e0;
-        public static final int settings_max_artists_5=0x7f0900e1;
-        public static final int settings_max_artists_50=0x7f0900e4;
-        public static final int settings_max_artists_500=0x7f0900e8;
-        public static final int settings_max_artists_75=0x7f0900e5;
+        public static final int settings_max_albums=0x7f0900cd;
+        public static final int settings_max_albums_10=0x7f0900cf;
+        public static final int settings_max_albums_100=0x7f0900d4;
+        public static final int settings_max_albums_20=0x7f0900d0;
+        public static final int settings_max_albums_250=0x7f0900d5;
+        public static final int settings_max_albums_30=0x7f0900d1;
+        public static final int settings_max_albums_40=0x7f0900d2;
+        public static final int settings_max_albums_5=0x7f0900ce;
+        public static final int settings_max_albums_50=0x7f0900d3;
+        public static final int settings_max_albums_500=0x7f0900d6;
+        public static final int settings_max_artists=0x7f0900e0;
+        public static final int settings_max_artists_10=0x7f0900e3;
+        public static final int settings_max_artists_100=0x7f0900e7;
+        public static final int settings_max_artists_200=0x7f0900e8;
+        public static final int settings_max_artists_25=0x7f0900e4;
+        public static final int settings_max_artists_3=0x7f0900e1;
+        public static final int settings_max_artists_5=0x7f0900e2;
+        public static final int settings_max_artists_50=0x7f0900e5;
+        public static final int settings_max_artists_500=0x7f0900e9;
+        public static final int settings_max_artists_75=0x7f0900e6;
         public static final int settings_max_bitrate_112=0x7f09008d;
         public static final int settings_max_bitrate_128=0x7f09008e;
         public static final int settings_max_bitrate_160=0x7f09008f;
@@ -555,28 +555,29 @@ public final class R {
         public static final int settings_max_bitrate_mobile=0x7f090088;
         public static final int settings_max_bitrate_unlimited=0x7f090093;
         public static final int settings_max_bitrate_wifi=0x7f090087;
-        public static final int settings_max_songs=0x7f0900d6;
-        public static final int settings_max_songs_10=0x7f0900d8;
-        public static final int settings_max_songs_100=0x7f0900dc;
-        public static final int settings_max_songs_200=0x7f0900dd;
-        public static final int settings_max_songs_25=0x7f0900d9;
-        public static final int settings_max_songs_5=0x7f0900d7;
-        public static final int settings_max_songs_50=0x7f0900da;
-        public static final int settings_max_songs_500=0x7f0900de;
-        public static final int settings_max_songs_75=0x7f0900db;
-        public static final int settings_media_button_summary=0x7f0900af;
-        public static final int settings_media_button_title=0x7f0900ae;
-        public static final int settings_network_timeout=0x7f0900b3;
-        public static final int settings_network_timeout_105000=0x7f0900c2;
-        public static final int settings_network_timeout_120000=0x7f0900c3;
-        public static final int settings_network_timeout_15000=0x7f0900bc;
-        public static final int settings_network_timeout_30000=0x7f0900bd;
-        public static final int settings_network_timeout_45000=0x7f0900be;
-        public static final int settings_network_timeout_60000=0x7f0900bf;
-        public static final int settings_network_timeout_75000=0x7f0900c0;
-        public static final int settings_network_timeout_90000=0x7f0900c1;
+        public static final int settings_max_songs=0x7f0900d7;
+        public static final int settings_max_songs_10=0x7f0900d9;
+        public static final int settings_max_songs_100=0x7f0900dd;
+        public static final int settings_max_songs_200=0x7f0900de;
+        public static final int settings_max_songs_25=0x7f0900da;
+        public static final int settings_max_songs_5=0x7f0900d8;
+        public static final int settings_max_songs_50=0x7f0900db;
+        public static final int settings_max_songs_500=0x7f0900df;
+        public static final int settings_max_songs_75=0x7f0900dc;
+        public static final int settings_media_button_summary=0x7f0900b0;
+        public static final int settings_media_button_title=0x7f0900af;
+        public static final int settings_network_timeout=0x7f0900b4;
+        public static final int settings_network_timeout_105000=0x7f0900c3;
+        public static final int settings_network_timeout_120000=0x7f0900c4;
+        public static final int settings_network_timeout_15000=0x7f0900bd;
+        public static final int settings_network_timeout_30000=0x7f0900be;
+        public static final int settings_network_timeout_45000=0x7f0900bf;
+        public static final int settings_network_timeout_60000=0x7f0900c0;
+        public static final int settings_network_timeout_75000=0x7f0900c1;
+        public static final int settings_network_timeout_90000=0x7f0900c2;
         public static final int settings_network_title=0x7f090086;
         public static final int settings_other_title=0x7f0900a7;
+        public static final int settings_playback_control_title=0x7f0900a9;
         public static final int settings_preload=0x7f090076;
         public static final int settings_preload_1=0x7f090096;
         public static final int settings_preload_10=0x7f09009a;
@@ -584,10 +585,10 @@ public final class R {
         public static final int settings_preload_3=0x7f090098;
         public static final int settings_preload_5=0x7f090099;
         public static final int settings_preload_unlimited=0x7f09009b;
-        public static final int settings_screen_lit_summary=0x7f0900b1;
-        public static final int settings_screen_lit_title=0x7f0900b0;
-        public static final int settings_scrobble_summary=0x7f0900aa;
-        public static final int settings_scrobble_title=0x7f0900a9;
+        public static final int settings_screen_lit_summary=0x7f0900b2;
+        public static final int settings_screen_lit_title=0x7f0900b1;
+        public static final int settings_scrobble_summary=0x7f0900ab;
+        public static final int settings_scrobble_title=0x7f0900aa;
         public static final int settings_search_history_cleared=0x7f0900a6;
         public static final int settings_search_title=0x7f0900a8;
         public static final int settings_server_address=0x7f090072;
@@ -597,12 +598,12 @@ public final class R {
         public static final int settings_server_unused2=0x7f090070;
         public static final int settings_server_username=0x7f090073;
         public static final int settings_servers_title=0x7f09006e;
-        public static final int settings_show_lockscreen_controls=0x7f0900c8;
-        public static final int settings_show_lockscreen_controls_summary=0x7f0900c9;
-        public static final int settings_show_notification=0x7f0900c4;
-        public static final int settings_show_notification_always=0x7f0900c6;
-        public static final int settings_show_notification_always_summary=0x7f0900c7;
-        public static final int settings_show_notification_summary=0x7f0900c5;
+        public static final int settings_show_lockscreen_controls=0x7f0900c9;
+        public static final int settings_show_lockscreen_controls_summary=0x7f0900ca;
+        public static final int settings_show_notification=0x7f0900c5;
+        public static final int settings_show_notification_always=0x7f0900c7;
+        public static final int settings_show_notification_always_summary=0x7f0900c8;
+        public static final int settings_show_notification_summary=0x7f0900c6;
         public static final int settings_test_connection_title=0x7f09006d;
         public static final int settings_testing_connection=0x7f09007a;
         public static final int settings_testing_ok=0x7f09007b;
@@ -612,21 +613,21 @@ public final class R {
         public static final int settings_theme_fullscreenlight=0x7f090083;
         public static final int settings_theme_light=0x7f090084;
         public static final int settings_theme_title=0x7f090081;
-        public static final int settings_theme_wheat=0x7f090108;
+        public static final int settings_theme_wheat=0x7f090109;
         public static final int settings_title=0x7f09006c;
-        public static final int settings_use_stream_proxy=0x7f0900ca;
-        public static final int settings_use_stream_proxy_summary=0x7f0900cb;
+        public static final int settings_use_stream_proxy=0x7f0900cb;
+        public static final int settings_use_stream_proxy_summary=0x7f0900cc;
         public static final int settings_wifi_required_summary=0x7f090095;
         public static final int settings_wifi_required_title=0x7f090094;
         public static final int song_details_all=0x7f090068;
         public static final int song_details_kbps=0x7f090069;
-        public static final int util_bytes_format_byte=0x7f090107;
-        public static final int util_bytes_format_gigabyte=0x7f090104;
-        public static final int util_bytes_format_kilobyte=0x7f090106;
-        public static final int util_bytes_format_megabyte=0x7f090105;
-        public static final int widget_initial_text=0x7f090101;
-        public static final int widget_sdcard_busy=0x7f090102;
-        public static final int widget_sdcard_missing=0x7f090103;
+        public static final int util_bytes_format_byte=0x7f090108;
+        public static final int util_bytes_format_gigabyte=0x7f090105;
+        public static final int util_bytes_format_kilobyte=0x7f090107;
+        public static final int util_bytes_format_megabyte=0x7f090106;
+        public static final int widget_initial_text=0x7f090102;
+        public static final int widget_sdcard_busy=0x7f090103;
+        public static final int widget_sdcard_missing=0x7f090104;
     }
     public static final class style {
         public static final int Dark=0x7f0b0000;
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 40d73c8f..aac80897 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -188,6 +188,7 @@
     <string name="settings.search_history_cleared">Search history cleared</string>
     <string name="settings.other_title">Other Settings</string>
     <string name="settings.search_title">Search Settings</string>
+    <string name="settings.playback_control_title">Playback Control Settings</string>
     <string name="settings.scrobble_title">Scrobble To Last.fm</string>
     <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Subsonic server</string>
     <string name="settings.hide_media_title">Hide From Other</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 0c66e59b..0b620ed5 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,285 +1,221 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"
-                  a:title="@string/settings.title">
-
-    <PreferenceCategory
-            a:title="@string/settings.servers_title">
-
-        <PreferenceScreen
-                a:key="server1">
+    a:title="@string/settings.title" >
 
+    <PreferenceCategory a:title="@string/settings.servers_title" >
+        <PreferenceScreen a:key="server1" >
             <EditTextPreference
-                    a:key="serverName1"
-                    a:title="@string/settings.server_name"
-                    a:defaultValue="Subsonic demo"/>
-
+                a:defaultValue="Subsonic demo"
+                a:key="serverName1"
+                a:title="@string/settings.server_name" />
             <EditTextPreference
-                    a:key="serverUrl1"
-                    a:title="@string/settings.server_address"
-                    a:defaultValue="http://demo.subsonic.org"
-                    a:inputType="textUri"/>
-
+                a:defaultValue="http://demo.subsonic.org"
+                a:inputType="textUri"
+                a:key="serverUrl1"
+                a:title="@string/settings.server_address" />
             <EditTextPreference
-                    a:key="username1"
-                    a:title="@string/settings.server_username"
-                    a:defaultValue="android-guest"/>
-
+                a:defaultValue="android-guest"
+                a:key="username1"
+                a:title="@string/settings.server_username" />
             <EditTextPreference
-                    a:key="password1"
-                    a:title="@string/settings.server_password"
-                    a:password="true"
-                    a:defaultValue="guest"
-                    a:summary="****"/>
-
+                a:defaultValue="guest"
+                a:key="password1"
+                a:password="true"
+                a:summary="****"
+                a:title="@string/settings.server_password" />
             <Preference
-                    a:key="testConnection1"
-                    a:title="@string/settings.test_connection_title"
-                    a:persistent="false"/>
-
+                a:key="testConnection1"
+                a:persistent="false"
+                a:title="@string/settings.test_connection_title" />
         </PreferenceScreen>
-
-        <PreferenceScreen
-                a:key="server2">
-
+        <PreferenceScreen a:key="server2" >
             <EditTextPreference
-                    a:key="serverName2"
-                    a:title="@string/settings.server_name"
-                    a:defaultValue="@string/settings.server_unused1"/>
-
+                a:defaultValue="@string/settings.server_unused1"
+                a:key="serverName2"
+                a:title="@string/settings.server_name" />
             <EditTextPreference
-                    a:key="serverUrl2"
-                    a:title="@string/settings.server_address"
-                    a:defaultValue="http://yourhost"
-                    a:inputType="textUri"/>
-
+                a:defaultValue="http://yourhost"
+                a:inputType="textUri"
+                a:key="serverUrl2"
+                a:title="@string/settings.server_address" />
             <EditTextPreference
-                    a:key="username2"
-                    a:title="@string/settings.server_username"/>
-
+                a:key="username2"
+                a:title="@string/settings.server_username" />
             <EditTextPreference
-                    a:key="password2"
-                    a:title="@string/settings.server_password"
-                    a:password="true"
-                    a:summary="****"/>
-
+                a:key="password2"
+                a:password="true"
+                a:summary="****"
+                a:title="@string/settings.server_password" />
             <Preference
-                    a:key="testConnection2"
-                    a:title="@string/settings.test_connection_title"
-                    a:persistent="false"/>
-
+                a:key="testConnection2"
+                a:persistent="false"
+                a:title="@string/settings.test_connection_title" />
         </PreferenceScreen>
-
-        <PreferenceScreen
-                a:key="server3">
-
+        <PreferenceScreen a:key="server3" >
             <EditTextPreference
-                    a:key="serverName3"
-                    a:title="@string/settings.server_name"
-                    a:defaultValue="@string/settings.server_unused2"/>
-
+                a:defaultValue="@string/settings.server_unused2"
+                a:key="serverName3"
+                a:title="@string/settings.server_name" />
             <EditTextPreference
-                    a:key="serverUrl3"
-                    a:title="@string/settings.server_address"
-                    a:defaultValue="http://yourhost"
-                    a:inputType="textUri"/>
-
+                a:defaultValue="http://yourhost"
+                a:inputType="textUri"
+                a:key="serverUrl3"
+                a:title="@string/settings.server_address" />
             <EditTextPreference
-                    a:key="username3"
-                    a:title="@string/settings.server_username"/>
-
+                a:key="username3"
+                a:title="@string/settings.server_username" />
             <EditTextPreference
-                    a:key="password3"
-                    a:title="@string/settings.server_password"
-                    a:password="true"
-                    a:summary="****"/>
-
+                a:key="password3"
+                a:password="true"
+                a:summary="****"
+                a:title="@string/settings.server_password" />
             <Preference
-                    a:key="testConnection3"
-                    a:title="@string/settings.test_connection_title"
-                    a:persistent="false"/>
-
+                a:key="testConnection3"
+                a:persistent="false"
+                a:title="@string/settings.test_connection_title" />
         </PreferenceScreen>
-
     </PreferenceCategory>
-
-    <PreferenceCategory
-            a:title="@string/settings.appearance_title">
-
+    <PreferenceCategory a:title="@string/settings.appearance_title" >
         <ListPreference
-                a:title="@string/settings.theme_title"
-                a:key="theme"
-                a:defaultValue="Dark"
-                a:entryValues="@array/themeValues"
-                a:entries="@array/themeNames"/>
-
+            a:defaultValue="Dark"
+            a:entries="@array/themeNames"
+            a:entryValues="@array/themeValues"
+            a:key="theme"
+            a:title="@string/settings.theme_title" />
     </PreferenceCategory>
-
-    <PreferenceCategory
-            a:title="@string/settings.network_title">
-
+    <PreferenceCategory a:title="@string/settings.network_title" >
         <ListPreference
-                a:title="@string/settings.max_bitrate_wifi"
-                a:key="maxBitrateWifi"
-                a:defaultValue="0"
-                a:entryValues="@array/maxBitrateValues"
-                a:entries="@array/maxBitrateNames"/>
-
+            a:defaultValue="0"
+            a:entries="@array/maxBitrateNames"
+            a:entryValues="@array/maxBitrateValues"
+            a:key="maxBitrateWifi"
+            a:title="@string/settings.max_bitrate_wifi" />
         <ListPreference
-                a:title="@string/settings.max_bitrate_mobile"
-                a:key="maxBitrateMobile"
-                a:defaultValue="0"
-                a:entryValues="@array/maxBitrateValues"
-                a:entries="@array/maxBitrateNames"/>
-
+            a:defaultValue="0"
+            a:entries="@array/maxBitrateNames"
+            a:entryValues="@array/maxBitrateValues"
+            a:key="maxBitrateMobile"
+            a:title="@string/settings.max_bitrate_mobile" />
         <CheckBoxPreference
-                a:title="@string/settings.wifi_required_title"
-                a:summary="@string/settings.wifi_required_summary"
-                a:key="wifiRequiredForDownload"
-                a:defaultValue="false"/>
-
+            a:defaultValue="false"
+            a:key="wifiRequiredForDownload"
+            a:summary="@string/settings.wifi_required_summary"
+            a:title="@string/settings.wifi_required_title" />
         <ListPreference
-				a:title="@string/settings.buffer_length"
-				a:key="bufferLength"
-				a:defaultValue="5"
-				a:entryValues="@array/bufferLengthValues"
-				a:entries="@array/bufferLengthNames"/>
-
-		<ListPreference
-				a:title="@string/settings.network_timeout"
-				a:key="networkTimeout"
-				a:defaultValue="15000"
-				a:entryValues="@array/networkTimeoutValues"
-				a:entries="@array/networkTimeoutNames"/>
-
+            a:defaultValue="5"
+            a:entries="@array/bufferLengthNames"
+            a:entryValues="@array/bufferLengthValues"
+            a:key="bufferLength"
+            a:title="@string/settings.buffer_length" />
+        <ListPreference
+            a:defaultValue="15000"
+            a:entries="@array/networkTimeoutNames"
+            a:entryValues="@array/networkTimeoutValues"
+            a:key="networkTimeout"
+            a:title="@string/settings.network_timeout" />
     </PreferenceCategory>
-
-    <PreferenceCategory
-            a:title="@string/settings.cache_title">
-
+    <PreferenceCategory a:title="@string/settings.cache_title" >
         <ListPreference
-                a:title="@string/settings.cache_size"
-                a:key="cacheSize"
-                a:defaultValue="500"
-                a:entryValues="@array/cacheSizeValues"
-                a:entries="@array/cacheSizeNames"/>
-
+            a:defaultValue="500"
+            a:entries="@array/cacheSizeNames"
+            a:entryValues="@array/cacheSizeValues"
+            a:key="cacheSize"
+            a:title="@string/settings.cache_size" />
         <EditTextPreference
-                a:title="@string/settings.cache_location"
-                a:key="cacheLocation"/>
-
+            a:key="cacheLocation"
+            a:title="@string/settings.cache_location" />
         <ListPreference
-                a:title="@string/settings.preload"
-                a:key="preloadCount"
-                a:defaultValue="3"
-                a:entryValues="@array/preloadCountValues"
-                a:entries="@array/preloadCountNames"/>
-
+            a:defaultValue="3"
+            a:entries="@array/preloadCountNames"
+            a:entryValues="@array/preloadCountValues"
+            a:key="preloadCount"
+            a:title="@string/settings.preload" />
     </PreferenceCategory>
-
-    <PreferenceCategory
-            a:title="@string/settings.search_title">
-        
+    <PreferenceCategory a:title="@string/settings.search_title" >
         <ListPreference
-                a:title="@string/settings.default_artists"
-                a:key="defaultArtists"
-                a:defaultValue="3"
-                a:entryValues="@array/defaultSearchValues"
-                a:entries="@array/defaultSearchNames"/>
-        
+            a:defaultValue="3"
+            a:entries="@array/defaultSearchNames"
+            a:entryValues="@array/defaultSearchValues"
+            a:key="defaultArtists"
+            a:title="@string/settings.default_artists" />
         <ListPreference
-                a:title="@string/settings.max_artists"
-                a:key="maxArtists"
-                a:defaultValue="10"
-                a:entryValues="@array/maxArtistsValues"
-                a:entries="@array/maxArtistsNames"/>
-
+            a:defaultValue="10"
+            a:entries="@array/maxArtistsNames"
+            a:entryValues="@array/maxArtistsValues"
+            a:key="maxArtists"
+            a:title="@string/settings.max_artists" />
         <ListPreference
-                a:title="@string/settings.default_albums"
-                a:key="defaultAlbums"
-                a:defaultValue="5"
-                a:entryValues="@array/defaultSearchValues"
-                a:entries="@array/defaultSearchNames"/>
-                
+            a:defaultValue="5"
+            a:entries="@array/defaultSearchNames"
+            a:entryValues="@array/defaultSearchValues"
+            a:key="defaultAlbums"
+            a:title="@string/settings.default_albums" />
         <ListPreference
-                a:title="@string/settings.max_albums"
-                a:key="maxAlbums"
-                a:defaultValue="20"
-                a:entryValues="@array/maxAlbumsValues"
-                a:entries="@array/maxAlbumsNames"/>
-        
+            a:defaultValue="20"
+            a:entries="@array/maxAlbumsNames"
+            a:entryValues="@array/maxAlbumsValues"
+            a:key="maxAlbums"
+            a:title="@string/settings.max_albums" />
         <ListPreference
-                a:title="@string/settings.default_songs"
-                a:key="defaultSongs"
-                a:defaultValue="10"
-                a:entryValues="@array/defaultSearchValues"
-                a:entries="@array/defaultSearchNames"/>
-              
+            a:defaultValue="10"
+            a:entries="@array/defaultSearchNames"
+            a:entryValues="@array/defaultSearchValues"
+            a:key="defaultSongs"
+            a:title="@string/settings.default_songs" />
         <ListPreference
-                a:title="@string/settings.max_songs"
-                a:key="maxSongs"
-                a:defaultValue="25"
-                a:entryValues="@array/maxSongsValues"
-                a:entries="@array/maxSongsNames"/>
-        
+            a:defaultValue="25"
+            a:entries="@array/maxSongsNames"
+            a:entryValues="@array/maxSongsValues"
+            a:key="maxSongs"
+            a:title="@string/settings.max_songs" />
         <Preference
-                a:key="clearSearchHistory"
-                a:title="@string/settings.clear_search_history"
-                a:persistent="false"/>
-        
+            a:key="clearSearchHistory"
+            a:persistent="false"
+            a:title="@string/settings.clear_search_history" />
     </PreferenceCategory>
-    
-    <PreferenceCategory
-            a:title="@string/settings.other_title">
-
+    <PreferenceCategory a:title="@string/settings.playback_control_title" >
         <CheckBoxPreference
-                a:title="@string/settings.scrobble_title"
-                a:summary="@string/settings.scrobble_summary"
-                a:key="scrobble"
-                a:defaultValue="false"/>
-
+            a:defaultValue="true"
+            a:key="mediaButtons"
+            a:summary="@string/settings.media_button_summary"
+            a:title="@string/settings.media_button_title" />
         <CheckBoxPreference
-                a:title="@string/settings.hide_media_title"
-                a:summary="@string/settings.hide_media_summary"
-                a:key="hideMedia"
-                a:defaultValue="false"/>
-
+            a:defaultValue="true"
+            a:key="showNotification"
+            a:summary="@string/settings.show_notification_summary"
+            a:title="@string/settings.show_notification" />
         <CheckBoxPreference
-                a:title="@string/settings.media_button_title"
-                a:summary="@string/settings.media_button_summary"
-                a:key="mediaButtons"
-                a:defaultValue="true"/>
-
+            a:defaultValue="true"
+            a:key="alwaysShowNotification"
+            a:summary="@string/settings.show_notification_always_summary"
+            a:title="@string/settings.show_notification_always" />
         <CheckBoxPreference
-                a:title="@string/settings.screen_lit_title"
-                a:summary="@string/settings.screen_lit_summary"
-                a:key="screenLitOnDownload"
-                a:defaultValue="true"/>
-        
+            a:defaultValue="true"
+            a:key="showLockScreen"
+            a:summary="@string/settings.show_lockscreen_controls_summary"
+            a:title="@string/settings.show_lockscreen_controls" />
         <CheckBoxPreference
-                a:title="@string/settings.show_notification"
-                a:summary="@string/settings.show_notification_summary"
-                a:key="showNotification"
-                a:defaultValue="true"/>
-        
-		<CheckBoxPreference
-                a:title="@string/settings.show_notification_always"
-                a:summary="@string/settings.show_notification_always_summary"
-                a:key="alwaysShowNotification"
-                a:defaultValue="true"/>        
-        
-       	<CheckBoxPreference
-                a:title="@string/settings.show_lockscreen_controls"
-                a:summary="@string/settings.show_lockscreen_controls_summary"
-                a:key="showLockScreen"
-                a:defaultValue="true"/>
-       	
-       	<CheckBoxPreference
-                a:title="@string/settings.use_stream_proxy"
-                a:summary="@string/settings.use_stream_proxy_summary"
-                a:key="useStreamProxy"
-                a:defaultValue="false"/>       	
-
+            a:defaultValue="false"
+            a:key="useStreamProxy"
+            a:summary="@string/settings.use_stream_proxy_summary"
+            a:title="@string/settings.use_stream_proxy" />
+    </PreferenceCategory>
+    <PreferenceCategory a:title="@string/settings.other_title" >
+        <CheckBoxPreference
+            a:defaultValue="false"
+            a:key="scrobble"
+            a:summary="@string/settings.scrobble_summary"
+            a:title="@string/settings.scrobble_title" />
+        <CheckBoxPreference
+            a:defaultValue="false"
+            a:key="hideMedia"
+            a:summary="@string/settings.hide_media_summary"
+            a:title="@string/settings.hide_media_title" />
+        <CheckBoxPreference
+            a:defaultValue="true"
+            a:key="screenLitOnDownload"
+            a:summary="@string/settings.screen_lit_summary"
+            a:title="@string/settings.screen_lit_title" />
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file