diff --git a/yaacc/build.gradle b/yaacc/build.gradle
index a104fa24..b4a150db 100644
--- a/yaacc/build.gradle
+++ b/yaacc/build.gradle
@@ -22,6 +22,7 @@ dependencies {
     implementation 'org.apache.httpcomponents.core5:httpcore5:5.2'
     implementation 'org.slf4j:slf4j-simple:2.0.6'
     implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
 //https://developer.android.com/jetpack/androidx/migrate/artifact-mappings
diff --git a/yaacc/src/main/java/de/yaacc/browser/BrowseItemAdapter.java b/yaacc/src/main/java/de/yaacc/browser/BrowseItemAdapter.java
index 9f96a2cf..8bfe25f3 100644
--- a/yaacc/src/main/java/de/yaacc/browser/BrowseItemAdapter.java
+++ b/yaacc/src/main/java/de/yaacc/browser/BrowseItemAdapter.java
@@ -58,7 +58,7 @@
  */
 public class BrowseItemAdapter extends BaseAdapter implements AbsListView.OnScrollListener {
     public static final Item LOAD_MORE_FAKE_ITEM = new Item("LoadMoreFakeItem", (String) null, "...", "", (DIDLObject.Class) null);
-    private static final long CHUNK_SIZE = 10;
+
     private static final Item LOADING_FAKE_ITEM = new Item("LoadingFakeItem", (String) null, "Loading...", "", (DIDLObject.Class) null);
     private boolean loading = false;
 
@@ -287,7 +287,7 @@ public void loadMore() {
 
         Log.d(getClass().getName(), "loadMore from: " + from);
 
-        BrowseItemLoadTask browseItemLoadTask = new BrowseItemLoadTask(this, CHUNK_SIZE);
+        BrowseItemLoadTask browseItemLoadTask = new BrowseItemLoadTask(this, Long.parseLong(PreferenceManager.getDefaultSharedPreferences(getContext()).getString(getContext().getString(R.string.settings_browse_chunk_size_key), "50")));
         asyncTasks.add(browseItemLoadTask);
         browseItemLoadTask.executeOnExecutor(((Yaacc) getContext().getApplicationContext()).getContentLoadExecutor(), from);
 
diff --git a/yaacc/src/main/java/de/yaacc/player/AVTransportPlayerActivity.java b/yaacc/src/main/java/de/yaacc/player/AVTransportPlayerActivity.java
index 3db8c9e5..735985ab 100644
--- a/yaacc/src/main/java/de/yaacc/player/AVTransportPlayerActivity.java
+++ b/yaacc/src/main/java/de/yaacc/player/AVTransportPlayerActivity.java
@@ -17,7 +17,6 @@
  */
 package de.yaacc.player;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -36,6 +35,8 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.fourthline.cling.model.meta.Device;
 
 import java.net.URI;
@@ -59,7 +60,7 @@
  *
  * @author Tobias Schoene (openbit)
  */
-public class AVTransportPlayerActivity extends Activity implements ServiceConnection {
+public class AVTransportPlayerActivity extends AppCompatActivity implements ServiceConnection {
 
     protected boolean updateTime = false;
     protected SeekBar seekBar = null;
diff --git a/yaacc/src/main/java/de/yaacc/player/MultiContentPlayerActivity.java b/yaacc/src/main/java/de/yaacc/player/MultiContentPlayerActivity.java
index f382d064..1cec5027 100644
--- a/yaacc/src/main/java/de/yaacc/player/MultiContentPlayerActivity.java
+++ b/yaacc/src/main/java/de/yaacc/player/MultiContentPlayerActivity.java
@@ -17,7 +17,6 @@
  */
 package de.yaacc.player;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +28,8 @@
 import android.view.MenuItem;
 import android.widget.ImageButton;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import de.yaacc.R;
 import de.yaacc.settings.SettingsActivity;
 import de.yaacc.util.AboutActivity;
@@ -39,7 +40,7 @@
  *
  * @author Tobias Schoene (openbit)
  */
-public class MultiContentPlayerActivity extends Activity implements ServiceConnection {
+public class MultiContentPlayerActivity extends AppCompatActivity implements ServiceConnection {
 
     private PlayerService playerService;
 
diff --git a/yaacc/src/main/java/de/yaacc/player/MusicPlayerActivity.java b/yaacc/src/main/java/de/yaacc/player/MusicPlayerActivity.java
index 202a74c3..8a1f10a9 100644
--- a/yaacc/src/main/java/de/yaacc/player/MusicPlayerActivity.java
+++ b/yaacc/src/main/java/de/yaacc/player/MusicPlayerActivity.java
@@ -17,7 +17,6 @@
  */
 package de.yaacc.player;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -33,6 +32,8 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.net.URI;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -53,7 +54,7 @@
  *
  * @author Tobias Schoene (openbit)
  */
-public class MusicPlayerActivity extends Activity implements ServiceConnection {
+public class MusicPlayerActivity extends AppCompatActivity implements ServiceConnection {
 
     protected boolean updateTime = false;
     protected SeekBar seekBar = null;
diff --git a/yaacc/src/main/java/de/yaacc/player/ThirdPartieMusicPlayerActivity.java b/yaacc/src/main/java/de/yaacc/player/ThirdPartieMusicPlayerActivity.java
index 6cf3ec87..c763ab23 100644
--- a/yaacc/src/main/java/de/yaacc/player/ThirdPartieMusicPlayerActivity.java
+++ b/yaacc/src/main/java/de/yaacc/player/ThirdPartieMusicPlayerActivity.java
@@ -17,7 +17,6 @@
  */
 package de.yaacc.player;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +28,8 @@
 import android.view.MenuItem;
 import android.widget.ImageButton;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import de.yaacc.R;
 import de.yaacc.settings.SettingsActivity;
 import de.yaacc.util.AboutActivity;
@@ -39,7 +40,7 @@
  *
  * @author Tobias Schoene (openbit)
  */
-public class ThirdPartieMusicPlayerActivity extends Activity implements ServiceConnection {
+public class ThirdPartieMusicPlayerActivity extends AppCompatActivity implements ServiceConnection {
 
     private PlayerService playerService;
 
diff --git a/yaacc/src/main/java/de/yaacc/settings/SettingsActivity.java b/yaacc/src/main/java/de/yaacc/settings/SettingsActivity.java
index a9b42e8e..b5970b28 100644
--- a/yaacc/src/main/java/de/yaacc/settings/SettingsActivity.java
+++ b/yaacc/src/main/java/de/yaacc/settings/SettingsActivity.java
@@ -17,23 +17,23 @@
  */
 package de.yaacc.settings;
 
-import android.app.Activity;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import de.yaacc.browser.TabBrowserActivity;
 
 /**
  * @author Christoph Hähnel (eyeless)
  */
-public class SettingsActivity extends Activity {
+public class SettingsActivity extends AppCompatActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getFragmentManager().beginTransaction()
+        getSupportFragmentManager().beginTransaction()
                 .replace(android.R.id.content, new SettingsFragment()).commit();
-
     }
 
     @Override
diff --git a/yaacc/src/main/java/de/yaacc/settings/SettingsFragment.java b/yaacc/src/main/java/de/yaacc/settings/SettingsFragment.java
index d847e735..7e35b152 100644
--- a/yaacc/src/main/java/de/yaacc/settings/SettingsFragment.java
+++ b/yaacc/src/main/java/de/yaacc/settings/SettingsFragment.java
@@ -18,9 +18,12 @@
 package de.yaacc.settings;
 
 import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.MultiSelectListPreference;
-import android.preference.PreferenceFragment;
+import android.text.InputType;
+
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.PreferenceFragmentCompat;
 
 import org.fourthline.cling.model.meta.Device;
 
@@ -35,13 +38,25 @@
 /**
  * @author Christoph Hähnel (eyeless)
  */
-public class SettingsFragment extends PreferenceFragment implements UpnpClientListener {
+public class SettingsFragment extends PreferenceFragmentCompat implements UpnpClientListener {
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.preference);
-
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.preference, rootKey);
+        EditTextPreference numberPreference = findPreference(getString(R.string.settings_device_playback_offset_key));
+        if (numberPreference != null) {
+            numberPreference.setOnBindEditTextListener(
+                    editText -> editText.setInputType(InputType.TYPE_CLASS_NUMBER));
+        }
+        numberPreference = findPreference(getString(R.string.settings_browse_load_threads_key));
+        if (numberPreference != null) {
+            numberPreference.setOnBindEditTextListener(
+                    editText -> editText.setInputType(InputType.TYPE_CLASS_NUMBER));
+        }
+        numberPreference = findPreference(getString(R.string.settings_browse_chunk_size_key));
+        if (numberPreference != null) {
+            numberPreference.setOnBindEditTextListener(
+                    editText -> editText.setInputType(InputType.TYPE_CLASS_NUMBER));
+        }
         populateDeviceLists();
         ((Yaacc) getActivity().getApplicationContext()).getUpnpClient().addUpnpClientListener(this);
 
diff --git a/yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerControlActivity.java b/yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerControlActivity.java
index 74c7253c..760fc9ac 100644
--- a/yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerControlActivity.java
+++ b/yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerControlActivity.java
@@ -17,7 +17,6 @@
  */
 package de.yaacc.upnp.server;
 
-import android.app.Activity;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
@@ -30,6 +29,8 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import de.yaacc.R;
 import de.yaacc.settings.SettingsActivity;
 import de.yaacc.util.AboutActivity;
@@ -40,7 +41,7 @@
  *
  * @author Tobias Schoene (openbit)
  */
-public class YaaccUpnpServerControlActivity extends Activity {
+public class YaaccUpnpServerControlActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/yaacc/src/main/java/de/yaacc/util/AboutActivity.java b/yaacc/src/main/java/de/yaacc/util/AboutActivity.java
index 4cfe7641..69a5915f 100644
--- a/yaacc/src/main/java/de/yaacc/util/AboutActivity.java
+++ b/yaacc/src/main/java/de/yaacc/util/AboutActivity.java
@@ -18,13 +18,14 @@
  */
 package de.yaacc.util;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import de.yaacc.R;
 
 /**
@@ -32,8 +33,8 @@
  *
  * @author Tobias Schoene (openbit)
  */
-public class AboutActivity extends Activity {
-    public static void showAbout(Activity activity) {
+public class AboutActivity extends AppCompatActivity {
+    public static void showAbout(AppCompatActivity activity) {
         activity.startActivity(new Intent(activity, AboutActivity.class));
     }
 
diff --git a/yaacc/src/main/java/de/yaacc/util/YaaccLogActivity.java b/yaacc/src/main/java/de/yaacc/util/YaaccLogActivity.java
index 7e013811..c66be4a1 100644
--- a/yaacc/src/main/java/de/yaacc/util/YaaccLogActivity.java
+++ b/yaacc/src/main/java/de/yaacc/util/YaaccLogActivity.java
@@ -18,19 +18,20 @@
  */
 package de.yaacc.util;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
 import de.yaacc.R;
 
-public class YaaccLogActivity extends Activity {
-    public static void showLog(Activity activity) {
+public class YaaccLogActivity extends AppCompatActivity {
+    public static void showLog(AppCompatActivity activity) {
         activity.startActivity(new Intent(activity, YaaccLogActivity.class));
     }
 
diff --git a/yaacc/src/main/java/org/fourthline/cling/model/meta/Service.java b/yaacc/src/main/java/org/fourthline/cling/model/meta/Service.java
index cc3aae84..e25f3717 100644
--- a/yaacc/src/main/java/org/fourthline/cling/model/meta/Service.java
+++ b/yaacc/src/main/java/org/fourthline/cling/model/meta/Service.java
@@ -15,12 +15,6 @@
 
 package org.fourthline.cling.model.meta;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
 import org.fourthline.cling.model.ServiceReference;
 import org.fourthline.cling.model.ValidationError;
 import org.fourthline.cling.model.ValidationException;
@@ -28,6 +22,12 @@
 import org.fourthline.cling.model.types.ServiceId;
 import org.fourthline.cling.model.types.ServiceType;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
 /**
  * The metadata of a service, with actions and state variables.
  *
@@ -35,7 +35,7 @@
  */
 public abstract class Service<D extends Device, S extends Service> {
 
-	final private static Logger log = Logger.getLogger(Service.class.getName());
+    final private static Logger log = Logger.getLogger(Service.class.getName());
 
     final private ServiceType serviceType;
     final private ServiceId serviceId;
@@ -103,7 +103,7 @@ public D getDevice() {
     }
 
     void setDevice(D device) {
-        if (this.device != null)
+        if (this.device != null && !this.device.equals(device))
             throw new IllegalStateException("Final value has been set already, model is immutable");
         this.device = device;
     }
@@ -186,13 +186,13 @@ public List<ValidationError> validate() {
                 // errors.addAll(action.validate());
 
                 List<ValidationError> actionErrors = action.validate();
-            	if(actionErrors.size() > 0) {
+                if (actionErrors.size() > 0) {
                     actions.remove(action.getName()); // Remove it
                     log.warning("Discarding invalid action of service '" + getServiceId() + "': " + action.getName());
                     for (ValidationError actionError : actionErrors) {
                         log.warning("Invalid action '" + action.getName() + "': " + actionError);
                     }
-            	}
+                }
             }
         }
 
diff --git a/yaacc/src/main/res/layout/activity_avtransport_player.xml b/yaacc/src/main/res/layout/activity_avtransport_player.xml
index 7a7dc0d8..d629d7bf 100644
--- a/yaacc/src/main/res/layout/activity_avtransport_player.xml
+++ b/yaacc/src/main/res/layout/activity_avtransport_player.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -18,41 +17,41 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".player.AVTransportPlayerActivity" >
-
+    tools:context=".player.AVTransportPlayerActivity">
 
 
     <Switch
+        android:id="@+id/avtransportPlayerActivityControlMuteSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/avtransportPlayerActivityControlMuteSwitch"
         android:layout_alignParentTop="true"
         android:text="@string/activity_remote_player_mute" />
+
     <TextView
+        android:id="@+id/avtransportPlayerActivityControlVolumeTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/activity_remote_player_volume"
         android:layout_below="@+id/avtransportPlayerActivityControlMuteSwitch"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:id="@+id/avtransportPlayerActivityControlVolumeTextView"
+        android:layout_alignParentLeft="true"
         android:labelFor="@+id/avtransportPlayerActivityControlVolumeSeekBar"
-        />
+        android:text="@string/activity_remote_player_volume"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <SeekBar
+        android:id="@+id/avtransportPlayerActivityControlVolumeSeekBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/avtransportPlayerActivityControlMuteSwitch"
         android:layout_above="@+id/avtransportPlayerActivityImageView"
-        android:id="@+id/avtransportPlayerActivityControlVolumeSeekBar"
-        android:layout_toEndOf="@+id/avtransportPlayerActivityControlVolumeTextView"
-        android:layout_toRightOf="@+id/avtransportPlayerActivityControlVolumeTextView"
+        android:layout_below="@+id/avtransportPlayerActivityControlMuteSwitch"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
+        android:layout_toEndOf="@+id/avtransportPlayerActivityControlVolumeTextView"
+        android:layout_toRightOf="@+id/avtransportPlayerActivityControlVolumeTextView" />
 
 
     <ImageView
@@ -62,7 +61,7 @@
         android:layout_above="@id/avtransportPlayerActivityCurrentItem"
         android:layout_below="@id/avtransportPlayerActivityControlVolumeTextView"
         android:contentDescription="@string/avtransportPlayerActivityImageView"
-        android:src="@drawable/device" />
+        app:srcCompat="@drawable/device" />
 
 
     <TextView
@@ -76,23 +75,22 @@
 
     <Space
         android:id="@+id/avtransportPlayerActivitySeparator3"
-        android:layout_toRightOf="@+id/avtransportPlayerActivityCurrentItem"
-        android:layout_toEndOf="@+id/avtransportPlayerActivityCurrentItem"
-        android:layout_alignBaseline="@+id/avtransportPlayerActivityCurrentItem"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/avtransportPlayerActivityCurrentItem"
+        android:layout_toEndOf="@+id/avtransportPlayerActivityCurrentItem"
+        android:layout_toRightOf="@+id/avtransportPlayerActivityCurrentItem" />
 
     <TextView
         android:id="@+id/avtransportPlayerActivityNextLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="50dp"
-        android:layout_marginStart="50dp"
         android:layout_alignBaseline="@+id/avtransportPlayerActivityCurrentItem"
+        android:layout_marginStart="50dp"
+        android:layout_marginLeft="50dp"
         android:layout_toEndOf="@+id/avtransportPlayerActivitySeparator3"
         android:layout_toRightOf="@+id/avtransportPlayerActivitySeparator3"
-        android:text="@string/avtransportPlayerActivityNextLabel"
-        />
+        android:text="@string/avtransportPlayerActivityNextLabel" />
 
 
     <TextView
@@ -100,13 +98,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/avtransportPlayerActivityCurrentItem"
-        android:text="@string/playerNextItem"
         android:layout_alignTop="@+id/avtransportPlayerActivityNextLabel"
-        android:layout_toRightOf="@+id/avtransportPlayerActivityNextLabel"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_toEndOf="@+id/avtransportPlayerActivityNextLabel"
+        android:layout_toRightOf="@+id/avtransportPlayerActivityNextLabel"
         android:gravity="end"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
+        android:text="@string/playerNextItem" />
 
 
     <TextView
@@ -114,78 +112,77 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@+id/avtransportPlayerActivitySeekBarLayout"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:text="@string/playerTimeElapsed"/>
+        android:layout_alignParentLeft="true"
+        android:text="@string/playerTimeElapsed" />
 
     <TextView
         android:id="@+id/avtransportPlayerActivitySeparator"
-        android:layout_alignBaseline="@+id/avtransportPlayerActivityElapsedTime"
-        android:layout_toRightOf="@id/avtransportPlayerActivityElapsedTime"
-        android:layout_toEndOf="@id/avtransportPlayerActivityElapsedTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerTimeSeparator"/>
+        android:layout_alignBaseline="@+id/avtransportPlayerActivityElapsedTime"
+        android:layout_toEndOf="@id/avtransportPlayerActivityElapsedTime"
+        android:layout_toRightOf="@id/avtransportPlayerActivityElapsedTime"
+        android:text="@string/playerTimeSeparator" />
 
     <TextView
         android:id="@+id/avtransportPlayerActivityDuration"
-        android:layout_alignBaseline="@+id/avtransportPlayerActivityElapsedTime"
-        android:layout_toRightOf="@id/avtransportPlayerActivitySeparator"
-        android:layout_toEndOf="@id/avtransportPlayerActivitySeparator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerTimeDuration"/>
+        android:layout_alignBaseline="@+id/avtransportPlayerActivityElapsedTime"
+        android:layout_toEndOf="@id/avtransportPlayerActivitySeparator"
+        android:layout_toRightOf="@id/avtransportPlayerActivitySeparator"
+        android:text="@string/playerTimeDuration" />
 
     <Space
         android:id="@+id/avtransportPlayerActivitySeparator2"
-        android:layout_alignBaseline="@+id/avtransportPlayerActivityElapsedTime"
-        android:layout_toRightOf="@id/avtransportPlayerActivityDuration"
-        android:layout_toEndOf="@id/avtransportPlayerActivityDuration"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        />
+        android:layout_alignBaseline="@+id/avtransportPlayerActivityElapsedTime"
+        android:layout_toEndOf="@id/avtransportPlayerActivityDuration"
+        android:layout_toRightOf="@id/avtransportPlayerActivityDuration" />
 
     <TextView
         android:id="@+id/avtransportPlayerActivityPosition"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_above="@+id/avtransportPlayerActivitySeekBarLayout"
-        android:gravity="end"
-        android:layout_toRightOf="@+id/avtransportPlayerActivitySeparator2"
-        android:layout_toEndOf="@+id/avtransportPlayerActivitySeparator2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerPosition"
+        android:layout_above="@+id/avtransportPlayerActivitySeekBarLayout"
         android:layout_alignBaseline="@+id/avtransportPlayerActivityDuration"
-        android:textAlignment="textEnd"
-        />
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_toEndOf="@+id/avtransportPlayerActivitySeparator2"
+        android:layout_toRightOf="@+id/avtransportPlayerActivitySeparator2"
+        android:gravity="end"
+        android:text="@string/playerPosition"
+        android:textAlignment="textEnd" />
 
     <RelativeLayout
         android:id="@+id/avtransportPlayerActivitySeekBarLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_above="@+id/avtransportPlayerActivityControls"
-        android:orientation="horizontal" >
-    <SeekBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/avtransportPlayerActivityControlSeekBar"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        />
+        android:layout_alignParentLeft="true"
+        android:orientation="horizontal">
+
+        <SeekBar
+            android:id="@+id/avtransportPlayerActivityControlSeekBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true" />
     </RelativeLayout>
+
     <RelativeLayout
         android:id="@+id/avtransportPlayerActivityControls"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
-        android:orientation="horizontal" >
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
 
         <ImageButton
             android:id="@+id/avtransportPlayerActivityControlPrev"
@@ -195,7 +192,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
             android:contentDescription="@string/previous"
-            android:src="@drawable/player_start" />
+            app:srcCompat="@drawable/player_start" />
 
         <ImageButton
             android:id="@+id/avtransportPlayerActivityControlPlay"
@@ -205,7 +202,7 @@
             android:layout_toEndOf="@+id/avtransportPlayerActivityControlPrev"
             android:layout_toRightOf="@+id/avtransportPlayerActivityControlPrev"
             android:contentDescription="@string/play"
-            android:src="@drawable/player_play" />
+            app:srcCompat="@drawable/player_play" />
 
         <ImageButton
             android:id="@+id/avtransportPlayerActivityControlPause"
@@ -215,7 +212,7 @@
             android:layout_toEndOf="@+id/avtransportPlayerActivityControlPlay"
             android:layout_toRightOf="@+id/avtransportPlayerActivityControlPlay"
             android:contentDescription="@string/pause"
-            android:src="@drawable/player_pause" />
+            app:srcCompat="@drawable/player_pause" />
 
         <ImageButton
             android:id="@+id/avtransportPlayerActivityControlStop"
@@ -226,7 +223,7 @@
             android:layout_toEndOf="@+id/avtransportPlayerActivityControlPause"
             android:layout_toRightOf="@+id/avtransportPlayerActivityControlPause"
             android:contentDescription="@string/stop"
-            android:src="@drawable/player_stop" />
+            app:srcCompat="@drawable/player_stop" />
 
         <ImageButton
             android:id="@+id/avtransportPlayerActivityControlNext"
@@ -236,7 +233,8 @@
             android:layout_toEndOf="@+id/avtransportPlayerActivityControlStop"
             android:layout_toRightOf="@+id/avtransportPlayerActivityControlStop"
             android:contentDescription="@string/next"
-            android:src="@drawable/player_end" />
+            app:srcCompat="@drawable/player_end" />
+
         <ImageButton
             android:id="@+id/avtransportPlayerActivityControlExit"
             android:layout_width="wrap_content"
@@ -245,7 +243,7 @@
             android:layout_toEndOf="@+id/avtransportPlayerActivityControlNext"
             android:layout_toRightOf="@+id/avtransportPlayerActivityControlNext"
             android:contentDescription="@string/exit"
-            android:src="@drawable/button_cancel" />
+            app:srcCompat="@drawable/button_cancel" />
     </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/yaacc/src/main/res/layout/activity_browse.xml b/yaacc/src/main/res/layout/activity_browse.xml
index 1b40dcd0..43eaf85b 100644
--- a/yaacc/src/main/res/layout/activity_browse.xml
+++ b/yaacc/src/main/res/layout/activity_browse.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -18,9 +17,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent">
 
     <ListView
         android:id="@+id/itemList"
@@ -33,7 +32,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <ImageButton
             android:id="@+id/controlDevices"
@@ -42,7 +41,7 @@
             android:layout_toStartOf="@+id/controlPrev"
             android:layout_toLeftOf="@+id/controlPrev"
             android:contentDescription="@string/browse_button_devices"
-            android:src="@drawable/device_48_48" />
+            app:srcCompat="@drawable/device_48_48" />
 
         <ImageButton
             android:id="@+id/controlPrev"
@@ -51,7 +50,7 @@
             android:layout_toStartOf="@+id/controlStop"
             android:layout_toLeftOf="@+id/controlStop"
             android:contentDescription="@string/browse_button_prev"
-            android:src="@drawable/player_play" />
+            app:srcCompat="@drawable/player_play" />
 
         <ImageButton
             android:id="@+id/controlStop"
@@ -59,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:contentDescription="@string/browse_button_stop"
-            android:src="@drawable/player_stop" />
+            app:srcCompat="@drawable/player_stop" />
 
         <ImageButton
             android:id="@+id/controlNext"
@@ -68,7 +67,7 @@
             android:layout_toEndOf="@+id/controlStop"
             android:layout_toRightOf="@+id/controlStop"
             android:contentDescription="@string/browse_button_next"
-            android:src="@drawable/refresh" />
+            app:srcCompat="@drawable/refresh" />
 
         <ImageButton
             android:id="@+id/controlReceiverDevices"
@@ -78,7 +77,7 @@
             android:layout_toEndOf="@+id/controlNext"
             android:layout_toRightOf="@+id/controlNext"
             android:contentDescription="@string/browse_button_devices"
-            android:src="@drawable/laptop_48_48" />
+            app:srcCompat="@drawable/laptop_48_48" />
 
     </RelativeLayout>
 
diff --git a/yaacc/src/main/res/layout/activity_image_viewer.xml b/yaacc/src/main/res/layout/activity_image_viewer.xml
index afc62c6f..99c17a61 100644
--- a/yaacc/src/main/res/layout/activity_image_viewer.xml
+++ b/yaacc/src/main/res/layout/activity_image_viewer.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -18,24 +17,23 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/imageView"
-        android:contentDescription="@string/images"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:src="@drawable/yaacc192_32" />
-
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:contentDescription="@string/images"
+        app:srcCompat="@drawable/yaacc192_32" />
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/yaacc/src/main/res/layout/activity_multi_content_player.xml b/yaacc/src/main/res/layout/activity_multi_content_player.xml
index 332aa467..afdac149 100644
--- a/yaacc/src/main/res/layout/activity_multi_content_player.xml
+++ b/yaacc/src/main/res/layout/activity_multi_content_player.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -18,92 +17,94 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".player.MultiContentPlayerActivity" >
+    tools:context=".player.MultiContentPlayerActivity">
 
-     <RelativeLayout
-         android:id="@+id/multiContentPlayerActivityControls"
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:layout_alignParentBottom="true"
-         android:layout_alignParentLeft="true"
-         android:layout_alignParentStart="true"
-         android:orientation="horizontal" >
+    <RelativeLayout
+        android:id="@+id/multiContentPlayerActivityControls"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
 
-         <ImageButton
-             android:id="@+id/multiContentPlayerActivityControlPrev"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentLeft="true"
-             android:layout_alignParentStart="true"
-             android:layout_alignParentTop="true"
-             android:contentDescription="@string/previous"
-             android:src="@drawable/player_start" />
+        <ImageButton
+            android:id="@+id/multiContentPlayerActivityControlPrev"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:contentDescription="@string/previous"
+            app:srcCompat="@drawable/player_start" />
 
-         <ImageButton
-             android:id="@+id/multiContentPlayerActivityControlPlay"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/multiContentPlayerActivityControlPrev"
-             android:layout_toRightOf="@+id/multiContentPlayerActivityControlPrev"
-             android:contentDescription="@string/play"
-             android:src="@drawable/player_play" />
+        <ImageButton
+            android:id="@+id/multiContentPlayerActivityControlPlay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/multiContentPlayerActivityControlPrev"
+            android:layout_toRightOf="@+id/multiContentPlayerActivityControlPrev"
+            android:contentDescription="@string/play"
+            app:srcCompat="@drawable/player_play" />
 
-         <ImageButton
-             android:id="@+id/multiContentPlayerActivityControlPause"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/multiContentPlayerActivityControlPlay"
-             android:layout_toRightOf="@+id/multiContentPlayerActivityControlPlay"
-             android:contentDescription="@string/pause"
-             android:src="@drawable/player_pause" />
+        <ImageButton
+            android:id="@+id/multiContentPlayerActivityControlPause"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/multiContentPlayerActivityControlPlay"
+            android:layout_toRightOf="@+id/multiContentPlayerActivityControlPlay"
+            android:contentDescription="@string/pause"
+            app:srcCompat="@drawable/player_pause" />
 
-         <ImageButton
-             android:id="@+id/multiContentPlayerActivityControlStop"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_centerHorizontal="true"
-             android:layout_toEndOf="@+id/multiContentPlayerActivityControlPause"
-             android:layout_toRightOf="@+id/multiContentPlayerActivityControlPause"
-             android:contentDescription="@string/stop"
-             android:src="@drawable/player_stop" />
+        <ImageButton
+            android:id="@+id/multiContentPlayerActivityControlStop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_toEndOf="@+id/multiContentPlayerActivityControlPause"
+            android:layout_toRightOf="@+id/multiContentPlayerActivityControlPause"
+            android:contentDescription="@string/stop"
+            app:srcCompat="@drawable/player_stop" />
 
-         <ImageButton
-             android:id="@+id/multiContentPlayerActivityControlNext"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/multiContentPlayerActivityControlStop"
-             android:layout_toRightOf="@+id/multiContentPlayerActivityControlStop"
-             android:contentDescription="@string/next"
-             android:src="@drawable/player_end" />
-          <ImageButton
-             android:id="@+id/multiContentPlayerActivityControlExit"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/multiContentPlayerActivityControlNext"
-             android:layout_toRightOf="@+id/multiContentPlayerActivityControlNext"
-             android:contentDescription="@string/exit"
-             android:src="@drawable/button_cancel" />
-     </RelativeLayout>
+        <ImageButton
+            android:id="@+id/multiContentPlayerActivityControlNext"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/multiContentPlayerActivityControlStop"
+            android:layout_toRightOf="@+id/multiContentPlayerActivityControlStop"
+            android:contentDescription="@string/next"
+            app:srcCompat="@drawable/player_end" />
 
-     <ImageView
-         android:id="@+id/multiContentPlayerActivityImageView"
-         android:contentDescription="@string/multiContentPlayerActivityImageView"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_above="@+id/multiContentPlayerActivityControls"
-         android:layout_alignParentStart="true"
-         android:layout_alignParentLeft="true"
-         android:layout_alignParentRight="true"
-         android:layout_alignParentEnd="true"
-         android:layout_alignParentTop="true"
-         android:src="@drawable/yaacc192_32" />
+        <ImageButton
+            android:id="@+id/multiContentPlayerActivityControlExit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/multiContentPlayerActivityControlNext"
+            android:layout_toRightOf="@+id/multiContentPlayerActivityControlNext"
+            android:contentDescription="@string/exit"
+            app:srcCompat="@drawable/button_cancel" />
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/multiContentPlayerActivityImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/multiContentPlayerActivityControls"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:contentDescription="@string/multiContentPlayerActivityImageView"
+        app:srcCompat="@drawable/yaacc192_32" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/yaacc/src/main/res/layout/activity_music_player.xml b/yaacc/src/main/res/layout/activity_music_player.xml
index 0d0b12d0..9e567dfd 100644
--- a/yaacc/src/main/res/layout/activity_music_player.xml
+++ b/yaacc/src/main/res/layout/activity_music_player.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -18,10 +17,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".player.MusicPlayerActivity" >
+    tools:context=".player.MusicPlayerActivity">
 
 
     <ImageView
@@ -41,40 +41,36 @@
         android:layout_marginRight="0dp"
         android:layout_marginBottom="0dp"
         android:contentDescription="@string/musicActivityImageView"
-        android:src="@drawable/cdtrack" />
-
-
-
+        app:srcCompat="@drawable/cdtrack" />
 
 
     <TextView
         android:id="@+id/musicActivityCurrentItem"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerCurrentItem"
         android:layout_above="@+id/musicActivityElapsedTime"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:text="@string/playerCurrentItem" />
 
     <Space
         android:id="@+id/musicActivitySeparator3"
-        android:layout_toRightOf="@+id/musicActivityCurrentItem"
-        android:layout_toEndOf="@+id/musicActivityCurrentItem"
-        android:layout_alignBaseline="@+id/musicActivityCurrentItem"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/musicActivityCurrentItem"
+        android:layout_toEndOf="@+id/musicActivityCurrentItem"
+        android:layout_toRightOf="@+id/musicActivityCurrentItem" />
 
     <TextView
         android:id="@+id/musicActivityNextLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="50dp"
-        android:layout_marginStart="50dp"
         android:layout_alignBaseline="@+id/musicActivityCurrentItem"
+        android:layout_marginStart="50dp"
+        android:layout_marginLeft="50dp"
         android:layout_toEndOf="@+id/musicActivitySeparator3"
         android:layout_toRightOf="@+id/musicActivitySeparator3"
-        android:text="@string/musicActivityNextLabel"
-        />
+        android:text="@string/musicActivityNextLabel" />
 
 
     <TextView
@@ -82,95 +78,92 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/musicActivityCurrentItem"
-        android:text="@string/playerNextItem"
         android:layout_alignTop="@+id/musicActivityNextLabel"
-        android:layout_toRightOf="@+id/musicActivityNextLabel"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_toEndOf="@+id/musicActivityNextLabel"
+        android:layout_toRightOf="@+id/musicActivityNextLabel"
         android:gravity="end"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
-
-
+        android:text="@string/playerNextItem" />
 
 
     <TextView
         android:id="@+id/musicActivityElapsedTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerTimeElapsed"
         android:layout_above="@+id/musicActivitySeekBarLayout"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:text="@string/playerTimeElapsed" />
 
     <TextView
         android:id="@+id/musicActivitySeparator"
-        android:layout_alignBaseline="@+id/musicActivityElapsedTime"
-        android:layout_toRightOf="@id/musicActivityElapsedTime"
-        android:layout_toEndOf="@id/musicActivityElapsedTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerTimeSeparator"/>
+        android:layout_alignBaseline="@+id/musicActivityElapsedTime"
+        android:layout_toEndOf="@id/musicActivityElapsedTime"
+        android:layout_toRightOf="@id/musicActivityElapsedTime"
+        android:text="@string/playerTimeSeparator" />
 
     <TextView
         android:id="@+id/musicActivityDuration"
-        android:layout_alignBaseline="@+id/musicActivityElapsedTime"
-        android:layout_toRightOf="@id/musicActivitySeparator"
-        android:layout_toEndOf="@id/musicActivitySeparator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerTimeDuration"/>
+        android:layout_alignBaseline="@+id/musicActivityElapsedTime"
+        android:layout_toEndOf="@id/musicActivitySeparator"
+        android:layout_toRightOf="@id/musicActivitySeparator"
+        android:text="@string/playerTimeDuration" />
+
     <Space
         android:id="@+id/musicActivitySeparator2"
-        android:layout_alignBaseline="@+id/musicActivityElapsedTime"
-        android:layout_toRightOf="@id/musicActivityDuration"
-        android:layout_toEndOf="@id/musicActivityDuration"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        />
+        android:layout_alignBaseline="@+id/musicActivityElapsedTime"
+        android:layout_toEndOf="@id/musicActivityDuration"
+        android:layout_toRightOf="@id/musicActivityDuration" />
 
     <TextView
         android:id="@+id/musicActivityPosition"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_above="@+id/musicActivitySeekBarLayout"
-        android:gravity="end"
-        android:layout_toRightOf="@+id/musicActivitySeparator2"
-        android:layout_toEndOf="@+id/musicActivitySeparator2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/playerPosition"
+        android:layout_above="@+id/musicActivitySeekBarLayout"
         android:layout_alignBaseline="@+id/musicActivityDuration"
-        android:textAlignment="textEnd"
-        />
-
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_toEndOf="@+id/musicActivitySeparator2"
+        android:layout_toRightOf="@+id/musicActivitySeparator2"
+        android:gravity="end"
+        android:text="@string/playerPosition"
+        android:textAlignment="textEnd" />
 
 
     <RelativeLayout
         android:id="@+id/musicActivitySeekBarLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_above="@+id/musicActivityControls"
-        android:orientation="horizontal" >
-    <SeekBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/musicActivitySeekBar"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
+        android:layout_alignParentLeft="true"
+        android:orientation="horizontal">
+
+        <SeekBar
+            android:id="@+id/musicActivitySeekBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true" />
     </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/musicActivityControls"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
-        android:orientation="horizontal" >
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
 
         <ImageButton
             android:id="@+id/musicActivityControlPrev"
@@ -180,7 +173,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
             android:contentDescription="@string/previous"
-            android:src="@drawable/player_start" />
+            app:srcCompat="@drawable/player_start" />
 
         <ImageButton
             android:id="@+id/musicActivityControlPlay"
@@ -190,7 +183,7 @@
             android:layout_toEndOf="@+id/musicActivityControlPrev"
             android:layout_toRightOf="@+id/musicActivityControlPrev"
             android:contentDescription="@string/play"
-            android:src="@drawable/player_play" />
+            app:srcCompat="@drawable/player_play" />
 
         <ImageButton
             android:id="@+id/musicActivityControlPause"
@@ -200,7 +193,7 @@
             android:layout_toEndOf="@+id/musicActivityControlPlay"
             android:layout_toRightOf="@+id/musicActivityControlPlay"
             android:contentDescription="@string/pause"
-            android:src="@drawable/player_pause" />
+            app:srcCompat="@drawable/player_pause" />
 
         <ImageButton
             android:id="@+id/musicActivityControlStop"
@@ -211,7 +204,7 @@
             android:layout_toEndOf="@+id/musicActivityControlPause"
             android:layout_toRightOf="@+id/musicActivityControlPause"
             android:contentDescription="@string/stop"
-            android:src="@drawable/player_stop" />
+            app:srcCompat="@drawable/player_stop" />
 
         <ImageButton
             android:id="@+id/musicActivityControlNext"
@@ -221,7 +214,8 @@
             android:layout_toEndOf="@+id/musicActivityControlStop"
             android:layout_toRightOf="@+id/musicActivityControlStop"
             android:contentDescription="@string/next"
-            android:src="@drawable/player_end" />
+            app:srcCompat="@drawable/player_end" />
+
         <ImageButton
             android:id="@+id/musicActivityControlExit"
             android:layout_width="wrap_content"
@@ -230,7 +224,7 @@
             android:layout_toEndOf="@+id/musicActivityControlNext"
             android:layout_toRightOf="@+id/musicActivityControlNext"
             android:contentDescription="@string/exit"
-            android:src="@drawable/button_cancel" />
+            app:srcCompat="@drawable/button_cancel" />
     </RelativeLayout>
 
 
diff --git a/yaacc/src/main/res/layout/activity_third_partie_music_player.xml b/yaacc/src/main/res/layout/activity_third_partie_music_player.xml
index 25732176..79389130 100644
--- a/yaacc/src/main/res/layout/activity_third_partie_music_player.xml
+++ b/yaacc/src/main/res/layout/activity_third_partie_music_player.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -18,92 +17,94 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".player.ThirdPartieMusicPlayerActivity" >
+    tools:context=".player.ThirdPartieMusicPlayerActivity">
 
-     <RelativeLayout
-         android:id="@+id/thirdPartieMusicActivityControls"
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:layout_alignParentBottom="true"
-         android:layout_alignParentStart="true"
-         android:layout_alignParentLeft="true"
-         android:orientation="horizontal" >
+    <RelativeLayout
+        android:id="@+id/thirdPartieMusicActivityControls"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
 
-         <ImageButton
-             android:id="@+id/thirdPratieMusicActivityControlPrev"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentStart="true"
-             android:layout_alignParentLeft="true"
-             android:layout_alignParentTop="true"
-             android:contentDescription="@string/previous"
-             android:src="@drawable/player_start" />
+        <ImageButton
+            android:id="@+id/thirdPratieMusicActivityControlPrev"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:contentDescription="@string/previous"
+            app:srcCompat="@drawable/player_start" />
 
-         <ImageButton
-             android:id="@+id/thirdPratieMusicActivityControlPlay"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/thirdPratieMusicActivityControlPrev"
-             android:layout_toRightOf="@+id/thirdPratieMusicActivityControlPrev"
-             android:contentDescription="@string/play"
-             android:src="@drawable/player_play" />
+        <ImageButton
+            android:id="@+id/thirdPratieMusicActivityControlPlay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/thirdPratieMusicActivityControlPrev"
+            android:layout_toRightOf="@+id/thirdPratieMusicActivityControlPrev"
+            android:contentDescription="@string/play"
+            app:srcCompat="@drawable/player_play" />
 
-         <ImageButton
-             android:id="@+id/thirdPratieMusicActivityControlPause"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/thirdPratieMusicActivityControlPlay"
-             android:layout_toRightOf="@+id/thirdPratieMusicActivityControlPlay"
-             android:contentDescription="@string/pause"
-             android:src="@drawable/player_pause" />
+        <ImageButton
+            android:id="@+id/thirdPratieMusicActivityControlPause"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/thirdPratieMusicActivityControlPlay"
+            android:layout_toRightOf="@+id/thirdPratieMusicActivityControlPlay"
+            android:contentDescription="@string/pause"
+            app:srcCompat="@drawable/player_pause" />
 
-         <ImageButton
-             android:id="@+id/thirdPratieMusicActivityControlStop"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_centerHorizontal="true"
-             android:layout_toEndOf="@+id/thirdPratieMusicActivityControlPause"
-             android:layout_toRightOf="@+id/thirdPratieMusicActivityControlPause"
-             android:contentDescription="@string/stop"
-             android:src="@drawable/player_stop" />
+        <ImageButton
+            android:id="@+id/thirdPratieMusicActivityControlStop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_toEndOf="@+id/thirdPratieMusicActivityControlPause"
+            android:layout_toRightOf="@+id/thirdPratieMusicActivityControlPause"
+            android:contentDescription="@string/stop"
+            app:srcCompat="@drawable/player_stop" />
 
-         <ImageButton
-             android:id="@+id/thirdPratieMusicActivityControlNext"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/thirdPratieMusicActivityControlStop"
-             android:layout_toRightOf="@+id/thirdPratieMusicActivityControlStop"
-             android:contentDescription="@string/next"
-             android:src="@drawable/player_end" />
-          <ImageButton
-             android:id="@+id/thirdPratieMusicActivityControlExit"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_alignParentTop="true"
-             android:layout_toEndOf="@+id/thirdPratieMusicActivityControlNext"
-             android:layout_toRightOf="@+id/thirdPratieMusicActivityControlNext"
-             android:contentDescription="@string/exit"
-             android:src="@drawable/button_cancel" />
-     </RelativeLayout>
+        <ImageButton
+            android:id="@+id/thirdPratieMusicActivityControlNext"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/thirdPratieMusicActivityControlStop"
+            android:layout_toRightOf="@+id/thirdPratieMusicActivityControlStop"
+            android:contentDescription="@string/next"
+            app:srcCompat="@drawable/player_end" />
 
-     <ImageView
-         android:id="@+id/thirdPratieMusicActivityImageView"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_above="@+id/thirdPartieMusicActivityControls"
-         android:layout_alignParentStart="true"
-         android:layout_alignParentEnd="true"
-         android:layout_alignParentLeft="true"
-         android:layout_alignParentRight="true"
-         android:layout_alignParentTop="true"
-         android:contentDescription="@string/musicActivityImageView"
-         android:src="@drawable/cdtrack" />
+        <ImageButton
+            android:id="@+id/thirdPratieMusicActivityControlExit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@+id/thirdPratieMusicActivityControlNext"
+            android:layout_toRightOf="@+id/thirdPratieMusicActivityControlNext"
+            android:contentDescription="@string/exit"
+            app:srcCompat="@drawable/button_cancel" />
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/thirdPratieMusicActivityImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/thirdPartieMusicActivityControls"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:contentDescription="@string/musicActivityImageView"
+        app:srcCompat="@drawable/cdtrack" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/yaacc/src/main/res/values-de/strings.xml b/yaacc/src/main/res/values-de/strings.xml
index eee155ea..12abbc89 100644
--- a/yaacc/src/main/res/values-de/strings.xml
+++ b/yaacc/src/main/res/values-de/strings.xml
@@ -96,10 +96,14 @@
     <string name="icon">Icon</string>
     <string name="not_yet_implemented">not yet implemented</string>
     <string name="avtransportPlayerActivityNextLabel">Nächstes:</string>
-    <string name="browse_context_control_device">Control device</string>
+    <string name="browse_context_control_device">Gerät steuern</string>
     <string name="channel_name">Yaacc</string>
     <string name="channel_description">Yaacc notifications</string>
     <string name="playerNameImageShort">Images</string>
     <string name="playerShortNameMusic">Music</string>
     <string name="playerShortNameMultiContent">multi</string>
+    <string name="settings_browse_chunk_size">Abfragegröße</string>
+    <string name="settings_browse_chunk_size_key">browse_chunk_size_key</string>
+    <string name="settings_browse_chunk_size_summ">Anzahl der abzufragenden Einträge je Anfrage</string>
+
 </resources>
diff --git a/yaacc/src/main/res/values/strings.xml b/yaacc/src/main/res/values/strings.xml
index 8b11ca9a..be36c9ef 100644
--- a/yaacc/src/main/res/values/strings.xml
+++ b/yaacc/src/main/res/values/strings.xml
@@ -102,6 +102,9 @@
     <string name="playerNameImageShort">Images</string>
     <string name="playerShortNameMusic">Music</string>
     <string name="playerShortNameMultiContent">multi</string>
+    <string name="settings_browse_chunk_size">chunk size when browsing</string>
+    <string name="settings_browse_chunk_size_key">browse_chunk_size_key</string>
+    <string name="settings_browse_chunk_size_summ">amount of items fetched from server in one request</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/yaacc/src/main/res/values/styles.xml b/yaacc/src/main/res/values/styles.xml
index 308823f9..2241bcb1 100644
--- a/yaacc/src/main/res/values/styles.xml
+++ b/yaacc/src/main/res/values/styles.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -19,16 +18,16 @@
  -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="AppTheme" parent="android:Theme.Holo">
+    <style name="AppTheme" parent="Theme.AppCompat">
         <item name="android:textColor">@android:color/primary_text_dark</item>
     </style>
 
     <style name="Theme.Transparent" parent="android:Theme">
-        <item name="android:background">@null</item>
+        <item name="background">@null</item>
         <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="windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
     </style>
diff --git a/yaacc/src/main/res/xml/preference.xml b/yaacc/src/main/res/xml/preference.xml
index 7eb5c381..bb104afc 100644
--- a/yaacc/src/main/res/xml/preference.xml
+++ b/yaacc/src/main/res/xml/preference.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--
  *
  * Copyright (C) 2013 www.yaacc.de 
  *
@@ -17,27 +16,28 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceScreen android:title="@string/settings_category_send_rec">
-      <ListPreference android:title="@string/settings_selected_provider_title" android:key="@string/settings_selected_provider_title"/>  
-      <MultiSelectListPreference android:title="@string/settings_selected_receivers_title" android:key="@string/settings_selected_receivers_title"/>      
-      <!--CheckBoxPreference android:defaultValue="true" android:summaryOff="@string/settings_image_app_off" android:disableDependentsState="true" android:summaryOn="@string/settings_image_app_on" android:key="@string/settings_image_app"/-->
-      <!--CheckBoxPreference android:defaultValue="true" android:summaryOff="@string/settings_video_app_off" android:disableDependentsState="true" android:summaryOn="@string/settings_video_app_on" android:key="@string/settings_video_app"/-->
-      <!--CheckBoxPreference android:defaultValue="true" android:summaryOff="@string/settings_audio_app_off" android:disableDependentsState="true" android:summaryOn="@string/settings_audio_app_on" android:key="@string/settings_audio_app"/-->
-    </PreferenceScreen>
-    <PreferenceScreen android:title="@string/settings_category_browsing">
+    <PreferenceCategory android:title="@string/settings_category_send_rec">
+        <ListPreference
+            android:key="@string/settings_selected_provider_title"
+            android:title="@string/settings_selected_provider_title" />
+        <MultiSelectListPreference
+            android:key="@string/settings_selected_receivers_title"
+            android:title="@string/settings_selected_receivers_title" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/settings_category_browsing">
         <CheckBoxPreference
-            android:summaryOn="@string/settings_browse_thumbnails_on"
-            android:summaryOff="@string/settings_browse_thumbnails_off"
             android:defaultValue="true"
-            android:key="@string/settings_thumbnails_chkbx"/>
+            android:key="@string/settings_thumbnails_chkbx"
+            android:summaryOff="@string/settings_browse_thumbnails_off"
+            android:summaryOn="@string/settings_browse_thumbnails_on" />
         <CheckBoxPreference
-            android:summaryOn="@string/settings_browse_thumbnails_coverlookup_on"
-            android:summaryOff="@string/settings_browse_thumbnails_coverlookup_off"
-            android:key="@string/settings_browse_thumbnails_coverlookup_chkbx"
             android:defaultValue="true"
-            android:dependency="@string/settings_thumbnails_chkbx"/>
+            android:dependency="@string/settings_thumbnails_chkbx"
+            android:key="@string/settings_browse_thumbnails_coverlookup_chkbx"
+            android:summaryOff="@string/settings_browse_thumbnails_coverlookup_off"
+            android:summaryOn="@string/settings_browse_thumbnails_coverlookup_on" />
         <EditTextPreference
             android:defaultValue="10"
             android:dialogTitle="@string/settings_browse_load_threads"
@@ -45,96 +45,107 @@
             android:key="@string/settings_browse_load_threads_key"
             android:summary="@string/settings_browse_load_threads_summ"
             android:title="@string/settings_browse_load_threads" />
-    </PreferenceScreen>
-    <PreferenceScreen android:title="@string/settings_category_playing">
+        <EditTextPreference
+            android:defaultValue="50"
+            android:dialogTitle="@string/settings_browse_chunk_size"
+            android:inputType="number"
+            android:key="@string/settings_browse_chunk_size_key"
+            android:summary="@string/settings_browse_chunk_size_summ"
+            android:title="@string/settings_browse_chunk_size" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/settings_category_playing">
         <ListPreference
-            android:title="@string/settings_default_duration"
-            android:key="@string/settings_default_duration_key"
             android:defaultValue="2000"
             android:entries="@array/duration_entries_with_never"
-            android:entryValues="@array/duration_values_with_never" />
+            android:entryValues="@array/duration_values_with_never"
+            android:key="@string/settings_default_duration_key"
+            android:title="@string/settings_default_duration" />
         <ListPreference
-            android:title="@string/settings_silence_duration"
-            android:key="@string/settings_silence_duration_key"
             android:defaultValue="2000"
             android:entries="@array/duration_entries"
-            android:entryValues="@array/duration_values" />
+            android:entryValues="@array/duration_values"
+            android:key="@string/settings_silence_duration_key"
+            android:title="@string/settings_silence_duration" />
         <CheckBoxPreference
             android:defaultValue="true"
-            android:summaryOn="@string/settings_replay_playlist_on"
             android:disableDependentsState="true"
+            android:key="@string/settings_replay_playlist_chkbx"
             android:summaryOff="@string/settings_replay_playlist_off"
-            android:key="@string/settings_replay_playlist_chkbx"/>
+            android:summaryOn="@string/settings_replay_playlist_on" />
         <CheckBoxPreference
             android:defaultValue="false"
-            android:summaryOn="@string/settings_music_player_shuffle_on"
             android:disableDependentsState="true"
+            android:key="@string/settings_music_player_shuffle_chkbx"
             android:summaryOff="@string/settings_music_player_shuffle_off"
-            android:key="@string/settings_music_player_shuffle_chkbx"/>
-    </PreferenceScreen>
-    <PreferenceScreen android:title="@string/settings_local_server_title">
+            android:summaryOn="@string/settings_music_player_shuffle_on" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/settings_local_server_title">
         <CheckBoxPreference
+            android:key="@string/settings_local_server_chkbx"
             android:summaryOff="@string/settings_local_server_stopped"
-            android:summaryOn="@string/settings_local_server_started"
-            android:key="@string/settings_local_server_chkbx"/>
+            android:summaryOn="@string/settings_local_server_started" />
         <CheckBoxPreference
-            android:summaryOff="@string/settings_local_server_autostart_deactivated"
-            android:summaryOn="@string/settings_local_server_autostart_activated"
+            android:dependency="@string/settings_local_server_chkbx"
             android:key="@string/settings_local_server_autostart_chkbx"
-            android:dependency="@string/settings_local_server_chkbx"/>
+            android:summaryOff="@string/settings_local_server_autostart_deactivated"
+            android:summaryOn="@string/settings_local_server_autostart_activated" />
         <CheckBoxPreference
+            android:key="@string/settings_local_server_receiver_chkbx"
             android:summaryOff="@string/settings_local_server_receiver_off"
-            android:summaryOn="@string/settings_local_server_receiver_on"
-            android:key="@string/settings_local_server_receiver_chkbx"/>
+            android:summaryOn="@string/settings_local_server_receiver_on" />
         <CheckBoxPreference
+            android:key="@string/settings_local_server_provider_chkbx"
             android:summaryOff="@string/settings_local_server_provider_off"
-            android:summaryOn="@string/settings_local_server_provider_on"
-            android:key="@string/settings_local_server_provider_chkbx"/>
-		<CheckBoxPreference
+            android:summaryOn="@string/settings_local_server_provider_on" />
+        <CheckBoxPreference
+            android:key="@string/settings_local_server_testcontent_chkbx"
             android:summaryOff="@string/settings_local_server_mediastore"
-            android:summaryOn="@string/settings_local_server_testcontent"
-            android:key="@string/settings_local_server_testcontent_chkbx"/>
+            android:summaryOn="@string/settings_local_server_testcontent" />
         <CheckBoxPreference
             android:defaultValue="true"
+            android:key="@string/settings_local_server_serve_images_chkbx"
             android:summaryOff="@string/settings_local_server_serve_images_on"
-            android:summaryOn="@string/settings_local_server_serve_images_on"
-            android:key="@string/settings_local_server_serve_images_chkbx"/>
+            android:summaryOn="@string/settings_local_server_serve_images_on" />
         <CheckBoxPreference
             android:defaultValue="true"
+            android:key="@string/settings_local_server_serve_video_chkbx"
             android:summaryOff="@string/settings_local_server_serve_video_on"
-            android:summaryOn="@string/settings_local_server_serve_video_on"
-            android:key="@string/settings_local_server_serve_video_chkbx"/>
+            android:summaryOn="@string/settings_local_server_serve_video_on" />
         <CheckBoxPreference
             android:defaultValue="true"
+            android:key="@string/settings_local_server_serve_music_chkbx"
             android:summaryOff="@string/settings_local_server_serve_music_on"
-            android:summaryOn="@string/settings_local_server_serve_music_on"
-            android:key="@string/settings_local_server_serve_music_chkbx"/>
-		<ListPreference
-            android:title="@string/settings_sending_upnp_alive_interval"
-            android:key="@string/settings_sending_upnp_alive_interval_key"
+            android:summaryOn="@string/settings_local_server_serve_music_on" />
+        <ListPreference
             android:defaultValue="30000"
             android:entries="@array/duration_entries_with_never"
-            android:entryValues="@array/duration_values_with_never" />
-        <EditTextPreference android:title="@string/settings_local_server_name" android:key="@string/settings_local_server_name_key"/>
-    </PreferenceScreen>
-    <PreferenceScreen android:title="@string/settings_category_synchronization">
+            android:entryValues="@array/duration_values_with_never"
+            android:key="@string/settings_sending_upnp_alive_interval_key"
+            android:title="@string/settings_sending_upnp_alive_interval" />
+        <EditTextPreference
+            android:key="@string/settings_local_server_name_key"
+            android:title="@string/settings_local_server_name" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/settings_category_synchronization">
         <ListPreference
-            android:title="@string/settings_default_playback_delay"
-            android:key="@string/settings_default_playback_delay_key"
             android:entries="@array/duration_entries"
-            android:entryValues="@array/duration_values" />
+            android:entryValues="@array/duration_values"
+            android:key="@string/settings_default_playback_delay_key"
+            android:title="@string/settings_default_playback_delay" />
         <EditTextPreference
-        android:defaultValue="0"
-        android:dialogTitle="@string/settings_device_playback_offset"
-        android:inputType="number"
-        android:key="@string/settings_device_playback_offset_key"
-        android:summary="@string/settings_device_playback_offset_summ"
-        android:title="@string/settings_device_playback_offset" />
-    </PreferenceScreen>
+            android:defaultValue="0"
+            android:dialogTitle="@string/settings_device_playback_offset"
+            android:inputType="number"
+            android:key="@string/settings_device_playback_offset_key"
+            android:summary="@string/settings_device_playback_offset_summ"
+            android:title="@string/settings_device_playback_offset" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/settings_image_app">
     <ListPreference
-        android:title="@string/image_viewer_settings_duration"
-        android:key="@string/image_viewer_settings_duration_key"
         android:defaultValue="5000"
         android:entries="@array/duration_entries_with_never"
-        android:entryValues="@array/duration_values_with_never" />
+        android:entryValues="@array/duration_values_with_never"
+        android:key="@string/image_viewer_settings_duration_key"
+        android:title="@string/image_viewer_settings_duration" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file