diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/constants/Prefs.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/constants/Prefs.kt
index 572a15250..308124c8c 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/constants/Prefs.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/constants/Prefs.kt
@@ -34,7 +34,7 @@ class Prefs {
             val CERT_VALIDATION_DISABLED = false
             val TRANSCODER_BITRATE_INDEX = 0
             val DISK_CACHE_SIZE_INDEX = 2
-            val PLAYBACK_ENGINE_INDEX = 0
+            val PLAYBACK_ENGINE_INDEX = 1
         }
     }
 
diff --git a/src/musikdroid/app/src/main/res/layout/activity_remote_settings.xml b/src/musikdroid/app/src/main/res/layout/activity_remote_settings.xml
index a59562722..a639d40de 100644
--- a/src/musikdroid/app/src/main/res/layout/activity_remote_settings.xml
+++ b/src/musikdroid/app/src/main/res/layout/activity_remote_settings.xml
@@ -44,10 +44,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="24dp"/>
 
-            <android.support.v4.widget.Space
-                android:layout_width="0dp"
-                android:layout_height="24dp"/>
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -61,10 +57,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="24dp"/>
 
-            <android.support.v4.widget.Space
-                android:layout_width="0dp"
-                android:layout_height="24dp"/>
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -90,7 +82,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="24dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="16dp"
                 android:orientation="vertical">
 
                 <SeekBar
@@ -112,10 +104,6 @@
 
             </LinearLayout>
 
-            <android.support.v4.widget.Space
-                android:layout_width="0dp"
-                android:layout_height="24dp"/>
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -127,7 +115,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="24dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="16dp"
                 android:orientation="horizontal">
 
                 <TextView
diff --git a/src/musikdroid/app/src/main/res/values/strings.xml b/src/musikdroid/app/src/main/res/values/strings.xml
index ba3f9f451..e7107a815 100644
--- a/src/musikdroid/app/src/main/res/values/strings.xml
+++ b/src/musikdroid/app/src/main/res/values/strings.xml
@@ -116,8 +116,8 @@
     <string name="settings_confirm_delete_message">are you sure you want to delete \'%s\'?</string>
     <string name="settings_playback_engine">playback engine</string>
     <string name="settings_playback_engine_exo">ExoPlayer (stable)</string>
-    <string name="settings_playback_engine_exo_gapless">ExoPlayer Gapless (experimental)</string>
-    <string name="settings_playback_engine_mp">MediaPlayer (deprecated)</string>
+    <string name="settings_playback_engine_exo_gapless">ExoPlayer Gapless (default)</string>
+    <string name="settings_playback_engine_mp">MediaPlayer (legacy)</string>
     <string name="remote_settings_title">remote management</string>
     <string name="remote_settings_output_driver">output driver</string>
     <string name="remote_settings_output_device">output device</string>
diff --git a/src/musikdroid/build.gradle b/src/musikdroid/build.gradle
index 8480d6444..ac210ee8e 100644
--- a/src/musikdroid/build.gradle
+++ b/src/musikdroid/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.10'
 
     repositories {
         jcenter()