diff --git a/app/src/main/java/com/kabouzeid/gramophone/prefs/ColorChooserPreference.java b/app/src/main/java/com/kabouzeid/gramophone/prefs/ColorChooserPreference.java
index f1bf6ca4..587cc232 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/prefs/ColorChooserPreference.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/prefs/ColorChooserPreference.java
@@ -25,7 +25,8 @@ public class ColorChooserPreference extends Preference {
 
     public ColorChooserPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        setLayoutResource(R.layout.preference_color_chooser);
+        setLayoutResource(R.layout.preference_custom);
+        setWidgetLayoutResource(R.layout.preference_color_widget);
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
index f2012305..cd21ce4d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
@@ -83,8 +83,8 @@ public class MusicControllerActivity extends AbsFabActivity {
     private final boolean opaqueStatusBar = PreferenceUtils.getInstance(this).opaqueStatusbarNowPlaying();
     private final boolean opaqueToolBar = opaqueStatusBar && PreferenceUtils.getInstance(this).opaqueToolbarNowPlaying();
     private final boolean forceSquareAlbumArt = PreferenceUtils.getInstance(this).forceAlbumArtSquared();
-    private final boolean smallerTitleBox = PreferenceUtils.getInstance(this).smallerTitileBoxNowPlaying();
-    private final boolean traditionalProgressSlider = PreferenceUtils.getInstance(this).traditionalProgressSliderNowPlaying();
+    private final boolean largerTitleBox = PreferenceUtils.getInstance(this).largerTitleBoxNowPlaying();
+    private final boolean alternativeProgressSlider = PreferenceUtils.getInstance(this).alternativeProgressSliderNowPlaying();
     private final boolean showPlaybackControllerCard = PreferenceUtils.getInstance(this).playbackControllerCardNowPlaying();
 
     @Override
@@ -92,7 +92,7 @@ public class MusicControllerActivity extends AbsFabActivity {
         setStatusBarTransparent();
         super.onCreate(savedInstanceState);
 
-        setContentView(traditionalProgressSlider ? R.layout.activity_music_controller_traditional_progress_slider : R.layout.activity_music_controller);
+        setContentView(alternativeProgressSlider ? R.layout.activity_music_controller_alternative_progress_slider : R.layout.activity_music_controller);
 
         initViews();
         moveSeekBarIntoPlace();
@@ -149,7 +149,7 @@ public class MusicControllerActivity extends AbsFabActivity {
 
 
     private void moveSeekBarIntoPlace() {
-        if (traditionalProgressSlider) {
+        if (!alternativeProgressSlider) {
             RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) progressSlider.getLayoutParams();
             progressSlider.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
             final int seekBarMarginLeftRight = getResources().getDimensionPixelSize(R.dimen.seek_bar_margin_left_right);
@@ -159,14 +159,14 @@ public class MusicControllerActivity extends AbsFabActivity {
     }
 
     private void adjustTitleBoxSize() {
-        int paddingTopBottom = smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_padding_small) : getResources().getDimensionPixelSize(R.dimen.title_box_padding_large);
+        int paddingTopBottom = largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_padding_large) : getResources().getDimensionPixelSize(R.dimen.title_box_padding_small);
         footer.setPadding(footer.getPaddingLeft(), paddingTopBottom, footer.getPaddingRight(), paddingTopBottom);
 
-        songTitle.setPadding(songTitle.getPaddingLeft(), songTitle.getPaddingTop(), songTitle.getPaddingRight(), smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large));
-        songArtist.setPadding(songArtist.getPaddingLeft(), smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large), songArtist.getPaddingRight(), songArtist.getPaddingBottom());
+        songTitle.setPadding(songTitle.getPaddingLeft(), songTitle.getPaddingTop(), songTitle.getPaddingRight(), largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small));
+        songArtist.setPadding(songArtist.getPaddingLeft(), largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small), songArtist.getPaddingRight(), songArtist.getPaddingBottom());
 
-        songTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_small) : getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_large));
-        songArtist.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_small) : getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_large));
+        songTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_large) : getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_small));
+        songArtist.setTextSize(TypedValue.COMPLEX_UNIT_PX, largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_large) : getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_small));
     }
 
     private void setUpPlaybackControllerCard() {
@@ -203,10 +203,10 @@ public class MusicControllerActivity extends AbsFabActivity {
         ColorStateList s1 = ColorStateList.valueOf(color);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             seekBar.setThumbTintList(s1);
-            if (traditionalProgressSlider) seekBar.setProgressTintList(s1);
+            if (!alternativeProgressSlider) seekBar.setProgressTintList(s1);
         } else {
             seekBar.getThumb().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-            if (traditionalProgressSlider)
+            if (!alternativeProgressSlider)
                 seekBar.getProgressDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
         }
     }
@@ -487,7 +487,7 @@ public class MusicControllerActivity extends AbsFabActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        if(progressViewsUpdateThread != null) progressViewsUpdateThread.interrupt();
+        if (progressViewsUpdateThread != null) progressViewsUpdateThread.interrupt();
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
index b9a085bd..ddec7935 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
@@ -37,8 +37,8 @@ public final class PreferenceUtils {
     public static final String OPAQUE_TOOLBAR_NOW_PLAYING = "opaque_toolbar_now_playing";
     public static final String OPAQUE_STATUSBAR_NOW_PLAYING = "opaque_statusbar_now_playing";
     public static final String FORCE_SQUARE_ALBUM_ART = "force_square_album_art";
-    public static final String SMALLER_TITLE_BOX_NOW_PLAYING = "smaller_title_box_now_playing";
-    public static final String TRADITIONAL_PROGRESS_SLIDER_NOW_PLAYING = "traditional_progress_slider_now_playing";
+    public static final String LARGER_TITLE_BOX_NOW_PLAYING = "larger_title_box_now_playing";
+    public static final String ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING = "alternative_progress_slider_now_playing";
     public static final String PLAYBACK_CONTROLLER_CARD_NOW_PLAYING = "playback_controller_card_now_playing";
 
     private static PreferenceUtils sInstance;
@@ -179,12 +179,12 @@ public final class PreferenceUtils {
         return mPreferences.getBoolean(PLAYBACK_CONTROLLER_CARD_NOW_PLAYING, false);
     }
 
-    public final boolean smallerTitileBoxNowPlaying() {
-        return mPreferences.getBoolean(SMALLER_TITLE_BOX_NOW_PLAYING, false);
+    public final boolean largerTitleBoxNowPlaying() {
+        return mPreferences.getBoolean(LARGER_TITLE_BOX_NOW_PLAYING, false);
     }
 
-    public final boolean traditionalProgressSliderNowPlaying() {
-        return mPreferences.getBoolean(TRADITIONAL_PROGRESS_SLIDER_NOW_PLAYING, false);
+    public final boolean alternativeProgressSliderNowPlaying() {
+        return mPreferences.getBoolean(ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING, false);
     }
 
 //    public final boolean downloadMissingArtistImages() {
diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml
index d201a612..58ed95e8 100644
--- a/app/src/main/res/layout/activity_music_controller.xml
+++ b/app/src/main/res/layout/activity_music_controller.xml
@@ -1,9 +1,9 @@
 <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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">
 
     <!-- BOTTOM-->
@@ -16,52 +16,6 @@
         android:background="?android:colorBackground"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/progress_container"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/progress_container_height"
-            android:background="?music_controller_container_color"
-            android:elevation="@dimen/toolbar_elevation"
-            tools:ignore="UnusedAttribute">
-
-            <TextView
-                android:id="@+id/song_current_progress"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
-                android:fontFamily="sans-serif-medium"
-                android:gravity="center_vertical|left|end"
-                android:paddingLeft="8dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?themed_drawable_color"
-                android:textSize="10sp"
-                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
-
-            <TextView
-                android:id="@+id/song_total_time"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:fontFamily="sans-serif-medium"
-                android:gravity="center_vertical|right|end"
-                android:paddingRight="8dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?themed_drawable_color"
-                android:textSize="10sp"
-                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
-
-            <SeekBar
-                android:id="@+id/progress_slider"
-                style="@style/MusicProgressSlider"
-                android:layout_height="match_parent"
-                android:layout_toLeftOf="@id/song_total_time"
-                android:layout_toRightOf="@id/song_current_progress"
-                tools:ignore="RtlHardcoded,UnusedAttribute" />
-
-        </RelativeLayout>
-
         <LinearLayout
             android:id="@+id/footer"
             android:layout_width="match_parent"
@@ -206,8 +160,54 @@
             android:src="@drawable/default_album_art"
             android:transitionName="@string/transition_album_cover"
             tools:ignore="ContentDescription,UnusedAttribute" />
+
+        <RelativeLayout
+            android:id="@+id/progress_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:background="@drawable/shadow_up">
+
+            <TextView
+                android:id="@+id/song_current_progress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center_vertical|left|end"
+                android:padding="16dp"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
+
+            <TextView
+                android:id="@+id/song_total_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center_vertical|right|end"
+                android:padding="16dp"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
+
+        </RelativeLayout>
     </FrameLayout>
 
+    <!-- PROGRESS SLIDER-->
+
+    <SeekBar
+        android:id="@+id/progress_slider"
+        style="@style/TraditionalMusicProgressSlider"
+        android:layout_above="@+id/footer_frame"
+        android:elevation="2dp"
+        tools:ignore="UnusedAttribute" />
+
     <!-- TOOLBAR-->
 
     <include layout="@layout/shadow_statusbar_actionbar" />
diff --git a/app/src/main/res/layout/activity_music_controller_traditional_progress_slider.xml b/app/src/main/res/layout/activity_music_controller_alternative_progress_slider.xml
similarity index 89%
rename from app/src/main/res/layout/activity_music_controller_traditional_progress_slider.xml
rename to app/src/main/res/layout/activity_music_controller_alternative_progress_slider.xml
index 58ed95e8..d201a612 100644
--- a/app/src/main/res/layout/activity_music_controller_traditional_progress_slider.xml
+++ b/app/src/main/res/layout/activity_music_controller_alternative_progress_slider.xml
@@ -1,9 +1,9 @@
 <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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">
 
     <!-- BOTTOM-->
@@ -16,6 +16,52 @@
         android:background="?android:colorBackground"
         android:orientation="vertical">
 
+        <RelativeLayout
+            android:id="@+id/progress_container"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/progress_container_height"
+            android:background="?music_controller_container_color"
+            android:elevation="@dimen/toolbar_elevation"
+            tools:ignore="UnusedAttribute">
+
+            <TextView
+                android:id="@+id/song_current_progress"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentLeft="true"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center_vertical|left|end"
+                android:paddingLeft="8dp"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:textColor="?themed_drawable_color"
+                android:textSize="10sp"
+                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
+
+            <TextView
+                android:id="@+id/song_total_time"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center_vertical|right|end"
+                android:paddingRight="8dp"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:textColor="?themed_drawable_color"
+                android:textSize="10sp"
+                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
+
+            <SeekBar
+                android:id="@+id/progress_slider"
+                style="@style/MusicProgressSlider"
+                android:layout_height="match_parent"
+                android:layout_toLeftOf="@id/song_total_time"
+                android:layout_toRightOf="@id/song_current_progress"
+                tools:ignore="RtlHardcoded,UnusedAttribute" />
+
+        </RelativeLayout>
+
         <LinearLayout
             android:id="@+id/footer"
             android:layout_width="match_parent"
@@ -160,54 +206,8 @@
             android:src="@drawable/default_album_art"
             android:transitionName="@string/transition_album_cover"
             tools:ignore="ContentDescription,UnusedAttribute" />
-
-        <RelativeLayout
-            android:id="@+id/progress_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="@drawable/shadow_up">
-
-            <TextView
-                android:id="@+id/song_current_progress"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:fontFamily="sans-serif-medium"
-                android:gravity="center_vertical|left|end"
-                android:padding="16dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="@android:color/white"
-                android:textSize="16sp"
-                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
-
-            <TextView
-                android:id="@+id/song_total_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:fontFamily="sans-serif-medium"
-                android:gravity="center_vertical|right|end"
-                android:padding="16dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="@android:color/white"
-                android:textSize="16sp"
-                tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
-
-        </RelativeLayout>
     </FrameLayout>
 
-    <!-- PROGRESS SLIDER-->
-
-    <SeekBar
-        android:id="@+id/progress_slider"
-        style="@style/TraditionalMusicProgressSlider"
-        android:layout_above="@+id/footer_frame"
-        android:elevation="2dp"
-        tools:ignore="UnusedAttribute" />
-
     <!-- TOOLBAR-->
 
     <include layout="@layout/shadow_statusbar_actionbar" />
diff --git a/app/src/main/res/layout/preference_color_widget.xml b/app/src/main/res/layout/preference_color_widget.xml
new file mode 100644
index 00000000..9a9ca8b7
--- /dev/null
+++ b/app/src/main/res/layout/preference_color_widget.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.kabouzeid.gramophone.views.ColorView
+    android:id="@+id/circle"
+    android:layout_width="32dp"
+    android:layout_height="32dp"
+    android:layout_gravity="center_vertical|end"
+    xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_color_chooser.xml b/app/src/main/res/layout/preference_custom.xml
similarity index 88%
rename from app/src/main/res/layout/preference_color_chooser.xml
rename to app/src/main/res/layout/preference_custom.xml
index c7097e48..17a5b82c 100644
--- a/app/src/main/res/layout/preference_color_chooser.xml
+++ b/app/src/main/res/layout/preference_custom.xml
@@ -66,14 +66,4 @@
         android:gravity="center_vertical"
         android:orientation="vertical" />
 
-    <com.kabouzeid.gramophone.views.ColorView
-        android:id="@+id/circle"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="center_vertical|end"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a773794e..afed08cd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="what_do_you_want_to_share">Was willst du teilen?</string>
+    <string name="what_do_you_want_to_share">Was willst du senden?</string>
     <string name="currently_listening_to_x_by_x">Höre gerade %1$s von %2$s</string>
-    <string name="the_audio_file">Die Audiodatei</string>
-    <string name="do_you_want_to_set_x_as_ringtone">Willst du %1$s als deinen Klingelton verwenden?</string>
-    <string name="x_has_been_set_as_ringtone">%1$s wird jetzt als dein Klingelton verwendet.</string>
+    <string name="the_audio_file">Audiodatei</string>
+    <string name="do_you_want_to_set_x_as_ringtone">Willst du %1$s als Klingelton verwenden?</string>
+    <string name="x_has_been_set_as_ringtone">%1$s wird jetzt als Klingelton verwendet.</string>
     <string name="action_set_as_ringtone">Als Klingelton verwenden</string>
-    <string name="action_share">Teilen</string>
+    <string name="action_share">Senden</string>
     <string name="action_settings">"Einstellungen"</string>
-    <string name="action_about">Über</string>
+    <string name="action_about">Infos</string>
     <string name="action_currently_playing">Aktuelle Wiedergabe</string>
     <string name="action_playing_queue">Wiedergabeliste</string>
     <string name="action_search">Suche</string>
     <string name="action_play_next">Als nächstes spielen</string>
-    <string name="action_add_to_playing_queue">Zur Wiedergabe hinzufügen</string>
-    <string name="action_remove_from_playing_queue">Von aktueller Wiedergabe entfernen</string>
+    <string name="action_add_to_playing_queue">Zur Wiedergabeliste</string>
+    <string name="action_remove_from_playing_queue">Von Wiedergabeliste entfernen</string>
     <string name="action_add_to_playlist">Zu Playlist hinzufügen...</string>
-    <string name="action_tag_editor">Tag Editor</string>
-    <string name="action_delete_from_disk">Von Gerät löschen</string>
+    <string name="action_tag_editor">Tags ändern...</string>
+    <string name="action_delete_from_disk">Löschen</string>
     <string name="action_details">Details</string>
     <string name="albums">Alben</string>
     <string name="artists">Interpreten</string>
     <string name="songs">Titel</string>
     <string name="playlists">Playlists</string>
     <string name="nothing_playing">Keine Wiedergabe</string>
-    <string name="unplayable_file">Sorry - es gab einen Fehler bei dem Versuch, diesen Song abzuspielen.</string>
+    <string name="unplayable_file">Sorry - der Song kann nicht abgespielt werden.</string>
     <string name="biography_unavailable">Sorry, es konnte keine passende Biografie für diesen Interpreten gefunden werden.</string>
     <string name="biography">Biografie</string>
     <string name="audio_focus_denied">Wir konnten keinen Audiofokus erlangen.</string>
-    <string name="title_activity_tag_editor">Tag Editor</string>
-    <string name="tag_editor">Tags bearbeiten</string>
+    <string name="title_activity_tag_editor">Tags ändern</string>
+    <string name="tag_editor">Tags ändern</string>
     <string name="album">Album</string>
     <string name="artist">Interpret</string>
     <string name="genre">Genre</string>
-    <string name="album_artist">Album Interpret</string>
+    <string name="album_artist">Albuminterpret</string>
     <string name="year">Jahr</string>
-    <string name="track">Track</string>
+    <string name="track">Titel</string>
     <string name="track_hint">"Track (2 für Track 2 oder 3004 für CD 3 Track 4)"</string>
-    <string name="album_or_artist_empty">Das Feld \"Album Titel\" oder \"Album Interpret\" ist leer.</string>
-    <string name="writing_file_number">Schreibe Datei</string>
+    <string name="album_or_artist_empty">Das Feld \"Albumtitel\" oder \"Albuminterpret\" ist leer.</string>
+    <string name="writing_file_number">Datei schreiben...</string>
     <string name="saving_changes">Speichere Änderungen...</string>
-    <string name="title_activity_album_tag_editor">Album Tag Editor</string>
+    <string name="title_activity_album_tag_editor">Albumtags bearbeiten</string>
     <string name="label_details">Details</string>
     <string name="label_file_name">Dateiname</string>
     <string name="label_file_path">Dateipfad</string>
     <string name="label_file_size">Größe</string>
     <string name="label_file_format">Format</string>
-    <string name="label_track_length">Länge</string>
+    <string name="label_track_length">Dauer</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_sampling_rate">Sampling Rate</string>
-    <string name="action_go_to_artist">Gehe zu Interpret</string>
+    <string name="label_sampling_rate">Samplingrate</string>
+    <string name="action_go_to_artist">Interpret öffnen</string>
     <string name="action_go_to_album">Gehe zum Album</string>
     <string name="label_current_playing_queue">Wiedergabeliste</string>
     <string name="save_as_playlist">Als Playlist speichern</string>
     <string name="credits_3">Icon von</string>
-    <string name="credits_1">"Phonograph ist ein komplett kostenloser Musik Player im Material Design gemacht von"</string>
+    <string name="credits_1">"Phonograph ist ein kostenloser Musikplayer im Material Design. Gemacht von"</string>
     <string name="title_activity_search">Suche</string>
     <string name="no_results">Keine Ergebnisse</string>
     <string name="action_re_download_artist_image">Interpretenbild aktualisieren</string>
@@ -64,64 +64,58 @@
     <string name="action_remove_from_playlist">Aus Playlist entfernen</string>
     <string name="new_playlist_action">Neue Playlist…</string>
     <string name="action_grid_columns">Rastergröße</string>
-    <string name="action_grid_columns_land">Rastergröße (Land)</string>
+    <string name="action_grid_columns_land">Rastergröße (Quer)</string>
     <string name="inserted_x_songs_into_playlist">%1$d Titel zur Playlist hinzugefügt</string>
     <string name="created_playlist_x">Playlist %1$s erstellt</string>
     <string name="deleted_playlist_x">Playlist %1$s gelöscht</string>
     <string name="couldnot_create_playlist_x">Playlist %1$s konnte nicht erstellt werden</string>
     <string name="delete_playlist_x"><![CDATA[Willst du die Playlist <b>%1$s</b> löschen?]]></string>
-    <string name="delete_x_playlists"><![CDATA[
-Willst du <b>%1$d</b> Playlists löschen?
-    ]]></string>
+    <string name="delete_x_playlists"><![CDATA[Willst du <b>%1$d</b> Playlists löschen?]]></string>
     <string name="delete_song_x"><![CDATA[Willst du den Titel <b>%1$s</b> löschen?]]></string>
     <string name="delete_x_songs"><![CDATA[Willst du <b>%1$d</b> Titel löschen?]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[
-Willst du den Titel <b>%1$s</b> aus der Playlist entfernen?
-    ]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[
-Willst du <b>%1$d</b> Titel aus der Playlist entfernen?
-    ]]></string>
-    <string name="delete_song_title">Lösche Titel</string>
-    <string name="delete_songs_title">Lösche Titel</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Willst du den Titel <b>%1$s</b> aus der Playlist entfernen?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Willst du <b>%1$d</b> Titel aus der Playlist entfernen?]]></string>
+    <string name="delete_song_title">Titel löschen</string>
+    <string name="delete_songs_title">Titel löschen</string>
     <string name="remove_song_from_playlist_title">Entferne Titel von Playlist</string>
-    <string name="remove_songs_from_playlist_title">Entferne Titel von Playlist</string>
+    <string name="remove_songs_from_playlist_title">Titel von Playlist entfernen</string>
     <string name="rename_playlist_title">Playlist umbenennen</string>
-    <string name="delete_playlist_title">Lösche Playlist</string>
-    <string name="delete_playlists_title">Lösche Playlists</string>
-    <string name="add_playlist_title">"Zur Playlist hinzufügen"</string>
+    <string name="delete_playlist_title">Playlist löschen</string>
+    <string name="delete_playlists_title">Playlists löschen</string>
+    <string name="add_playlist_title">"Zu Playlist hinzufügen"</string>
     <string name="new_playlist_title">Neue Playlist</string>
     <string name="delete_warning">"Achtung: Diese Operation kann nicht rückgängig gemacht werden."</string>
-    <string name="shuffle_all">Alle zufällig wiedergeben</string>
+    <string name="shuffle_all">Zufällig</string>
     <string name="last_opened">Zuletzt geöffnet</string>
     <string name="light_theme_name">Hell</string>
     <string name="dark_theme_name">Dunkel</string>
     <string name="equalizer">Equalizer</string>
     <string name="pref_header_colors">Farben</string>
-    <string name="pref_header_now_playing_screen">Now Playing Ansicht</string>
+    <string name="pref_header_now_playing_screen">Aktuelle Wiedergabe</string>
     <string name="pref_title_general_theme">Generelles Design</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Generell</string>
-    <string name="pref_summary_colored_navigation_bar">In welchen Ansichten die Navigationsleiste gefärbt werden soll.</string>
-    <string name="pref_title_navigation_bar">Gefärbte Navigationsleiste</string>
+    <string name="pref_summary_colored_navigation_bar">In welchen Ansichten die Navigationsleiste gefärbt werden soll</string>
+    <string name="pref_title_navigation_bar">Farbige Navigationsleiste</string>
     <string name="pref_title_set_default_start_page">Startseite</string>
     <string name="title_activity_settings">Einstellungen</string>
-    <string name="pref_title_colored_navigation_bar_artists">Interpreten Ansicht</string>
-    <string name="pref_title_colored_navigation_bar_albums">Album Ansicht</string>
-    <string name="pref_title_colored_navigation_bar_current_playing">Wiedergabe Ansicht</string>
-    <string name="pref_title_colored_navigation_bar_playlists">Playlist Ansicht</string>
-    <string name="pref_title_colored_navigation_bar_tag_editor">Tag Editor</string>
+    <string name="pref_title_colored_navigation_bar_artists">Interpreten</string>
+    <string name="pref_title_colored_navigation_bar_albums">Albumansicht</string>
+    <string name="pref_title_colored_navigation_bar_current_playing">Aktuelle Wiedergabe</string>
+    <string name="pref_title_colored_navigation_bar_playlists">Playlist-Ansicht</string>
+    <string name="pref_title_colored_navigation_bar_tag_editor">Tag-Editor</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Überall sonst</string>
     <string name="pref_title_colored_album_footers">Farbige Balken unter den Alben</string>
-    <string name="pref_title_force_square_album_art">Quadratisches Album Cover erzwingen</string>
+    <string name="pref_title_force_square_album_art">Quadratisches Albumcover erzwingen</string>
     <string name="pref_title_opaque_toolbar_now_playing">Undurchsichtige Toolbar</string>
-    <string name="pref_title_opaque_statusbar_now_playing">Undurchsichtige Statusbar</string>
-    <string name="pref_title_smaller_title_box_now_playing">Kleinere Titel Box</string>
-    <string name="pref_title_traditional_progress_slider_now_playing">Traditioneller Progress Slider</string>
-    <string name="pref_title_playback_controller_card_now_playing">Zeige Karte unter wiedergabe Bedienelementen</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Undurchsichtige Statusleiste</string>
+    <string name="pref_title_larger_title_box_now_playing">Größere Titel Bar</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Alternativer Progress Slider</string>
+    <string name="pref_title_playback_controller_card_now_playing">Karte hinter Wiedergabesteuerung</string>
     <string name="no_equalizer">Es wurde kein Equalizer gefunden</string>
     <string name="no_audio_ID">"Keine Audio ID, spiele etwas ab und versuche es erneut."</string>
-    <string name="navigation_drawer_open">Öffne Navigation Drawer</string>
-    <string name="navigation_drawer_close">"Schließe Navigation Drawer"</string>
+    <string name="navigation_drawer_open">Navigationsdrawer öffnen</string>
+    <string name="navigation_drawer_close">"Navigationsdrawer schliessen"</string>
     <string name="delete_action">Löschen</string>
     <string name="remove_action">Entfernen</string>
     <string name="rename_action">Umbenennen</string>
@@ -129,10 +123,10 @@ Willst du <b>%1$d</b> Titel aus der Playlist entfernen?
     <string name="x_selected">%1$d ausgewählt</string>
     <string name="select">Auswählen</string>
     <string name="default_str">Standard</string>
-    <string name="primary_color">Primäre Farbe</string>
-    <string name="accent_color">Akzent Farbe</string>
-    <string name="primary_color_desc">Die primäre Design Farbe, standard ist indigo.</string>
-    <string name="accent_color_desc">Die Akzent Farbe, standard ist pink.</string>
+    <string name="primary_color">Hauptfarbe</string>
+    <string name="accent_color">Akzentfarbe</string>
+    <string name="primary_color_desc">Die primäre Farbe, Standard ist indigo.</string>
+    <string name="accent_color_desc">Die Akzentfarbe, Standard ist pink.</string>
     <string name="update_image">Bild aktualisieren</string>
     <string name="playlist_empty_text">Die Playlist ist leer</string>
     <string name="no_playlists">Keine Playlists</string>
@@ -140,24 +134,24 @@ Willst du <b>%1$d</b> Titel aus der Playlist entfernen?
     <string name="no_songs">Keine Songs</string>
     <string name="no_artists">Keine Interpreten</string>
     <string name="empty">Leer</string>
-    <string name="playlist_name">Playlist Name</string>
+    <string name="playlist_name">Name</string>
     <string name="song">Titel</string>
-    <string name="pref_only_lollipop">"Nur auf Android Lollipop verfügbar"</string>
-    <string name="pref_summary_colored_album_footers">"Die Titel der Alben im Raster passend zu ihrer Cover Farbe färben."</string>
-    <string name="pref_summary_force_square_album_art">Das Album Cover in der now playing Ansicht wird gezwungen quadratisch zu sein</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">Die Toolbar ist undurchsichtig und bedeckt nicht das Album Cover.</string>
-    <string name="pref_summary_opaque_statusbar_now_playing">Die Statusbar ist undurchsichtig und bedeckt nicht das Album Cover.</string>
-    <string name="pref_summary_smaller_title_box_now_playing">Die Box unter dem Album Cover wo der Song Titel und Interpret ist ist kleiner.</string>
-    <string name="pref_summary_traditional_progress_slider_now_playing">Benutzt den normalen Progress Slider anstatt der kleinen Leiste unter dem Album Cover.</string>
-    <string name="pref_summary_playback_controller_card_now_playing">Zeigt eine Karte unter den wiedergabe Bedienelementen (play/pause etc.).</string>
+    <string name="pref_only_lollipop">"Nur auf Lollipop verfügbar"</string>
+    <string name="pref_summary_colored_album_footers">"Farbe der Box unter jedem Album dem Cover anpassen"</string>
+    <string name="pref_summary_force_square_album_art">Das Cover in der aktuellen Wiedergabe wird gezwungen, quadratisch zu sein.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">Die Toolbar ist undurchsichtig und bedeckt das Album Cover nicht.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">Die Statusleiste ist undurchsichtig und bedeckt nicht das Album Cover.</string>
+    <string name="pref_summary_larger_title_box_now_playing">Die Bar unter dem Album Cover wo sich der Titel und Interpret befinden ist höher.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Benutzt einen Balken als Progress Slider anstatt dem normalen Progress Slider.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Zeigt eine Karte hinter der Wiedergabesteuerung</string>
     <string name="failed_download_albumart">"Das Cover für dieses Album konnte nicht heruntergeladen werden."</string>
     <string name="search_hint">Durchsuche deine Mediathek</string>
-    <string name="rescanning_media">Medien werden erneut eingescannt...</string>
+    <string name="rescanning_media">Medien neu scannen...</string>
     <string name="other">Andere</string>
     <string-array name="update_album_cover_options">
         <item>Von Last.fm herunterladen</item>
         <item>Aus lokalem Speicher wählen</item>
-        <item>Web suche</item>
+        <item>Websuche</item>
         <item>Cover entfernen</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f0893430..e8b070b6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -90,6 +90,8 @@
     <string name="light_theme_name">Clair</string>
     <string name="dark_theme_name">Sombre</string>
     <string name="equalizer">Égaliseur</string>
+    <string name="pref_header_colors">Couleurs</string>
+    <string name="pref_header_now_playing_screen">Écran de lecture en cours</string>
     <string name="pref_title_general_theme">Thème général</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Général</string>
@@ -106,6 +108,8 @@
     <string name="pref_title_colored_album_footers">Bas d\'album coloré</string>
     <string name="pref_title_force_square_album_art">Vignette carrée</string>
     <string name="pref_title_opaque_toolbar_now_playing">Barre d\'outil opaque</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Barre de statut opaque</string>
+    <string name="pref_title_playback_controller_card_now_playing">Afficher le rectangle sous les boutons de lecture</string>
     <string name="no_equalizer">Aucun égaliseur trouvé</string>
     <string name="no_audio_ID">"Aucun ID audio, jouez quelque chose et réessayez."</string>
     <string name="navigation_drawer_open">Ouvrir le volet de navigation</string>
@@ -134,6 +138,7 @@
     <string name="pref_summary_colored_album_footers">"Les bas d\'album dans la grille sont colorés avec la palette de la vignette."</string>
     <string name="pref_summary_force_square_album_art">La vignette de l\'album dans l\'écran de lecture en cours est forcée à rester carrée.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">La barre d\'outil dans l\'écran de lecture en cours est opaque et recouvre maintenant l\'album.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">La barre de statut est opaque et recouvre la vignette.</string>
     <string name="failed_download_albumart">"Impossible de télécharger la vignette pour cet album."</string>
     <string name="search_hint">Rechercher votre bibliothèque...</string>
     <string name="rescanning_media">Réanalyse des médias…</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0b419c21..ecd9b94d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -72,8 +72,8 @@
     <string name="couldnot_create_playlist_x">Nie można utworzyć listy odtwarzania %1$s</string>
     <string name="delete_playlist_x"><![CDATA[Czy chcesz usunąć listę odtwarzania <b>%1$s</b>?]]></string>
     <string name="delete_x_playlists"><![CDATA[Czy chcesz usunąć <b>%1$d</b> listy odtwarzania?]]></string>
-    <string name="delete_song_x"><![CDATA[ Czy chcesz usunąć utwór <b>%1$s</b>? ]]></string>
-    <string name="delete_x_songs"><![CDATA[ Czy chcesz usunąć  <b>%1$d</b> utworów? ]]></string>
+    <string name="delete_song_x"><![CDATA[Czy chcesz usunąć utwór <b>%1$s</b>?]]></string>
+    <string name="delete_x_songs"><![CDATA[Czy chcesz usunąć  <b>%1$d</b> utworów?]]></string>
     <string name="remove_song_x_from_playlist"><![CDATA[Czy chcesz usunąć <b>%1$s</b> z listy odtwarzania?]]></string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Czy chcesz usunąć <b>%1$d</b> z listy odtwarzania?]]></string>
     <string name="delete_song_title">Usuwanie utworu</string>
@@ -91,6 +91,8 @@
     <string name="light_theme_name">Jasny</string>
     <string name="dark_theme_name">Ciemny</string>
     <string name="equalizer">Korektor</string>
+    <string name="pref_header_colors">Kolory</string>
+    <string name="pref_header_now_playing_screen">Ekran \'\'Obecnie Grane\'\'</string>
     <string name="pref_title_general_theme">Styl tła motywu</string>
     <string name="pref_header_audio">Dźwięk</string>
     <string name="pref_header_general">Ogólne</string>
@@ -106,7 +108,9 @@
     <string name="pref_title_colored_navigation_bar_other_screens">W każdym innym miejscu</string>
     <string name="pref_title_colored_album_footers">Kolorowa stopka albumu</string>
     <string name="pref_title_force_square_album_art">Kadrowanie okładek</string>
-    <string name="pref_title_opaque_toolbar_now_playing">Nieprzeźroczystość paska narzędzi na ekranie \'\'Obecnie Grane\'\'</string>
+    <string name="pref_title_opaque_toolbar_now_playing">Nieprzeźroczystość paska narzędzi</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Nieprzeźroczystość paska stanu</string>
+    <string name="pref_title_playback_controller_card_now_playing">Wyświetlanie karty pod przyciskami odtwarzania</string>
     <string name="no_equalizer">Nie znaleziono korektora</string>
     <string name="no_audio_ID">"Brak ID dźwięku, puść coś i spróbuj ponownie"</string>
     <string name="navigation_drawer_open">Otwórz pasek nawigacji</string>
@@ -128,13 +132,15 @@
     <string name="no_albums">Brak albumów</string>
     <string name="no_songs">Brak utworów</string>
     <string name="no_artists">Brak wykonawców</string>
-    <string name="empty">Pusty</string>
+    <string name="empty">Pusto</string>
     <string name="playlist_name">Nazwa listy odtwarzania</string>
     <string name="song">Utwór</string>
     <string name="pref_only_lollipop">"Dostępne tylko w androidzie Lollipop"</string>
     <string name="pref_summary_colored_album_footers">"Stopki albumów w widoku siatki mają tonacje okładek"</string>
-    <string name="pref_summary_force_square_album_art">Wymusza kadrowanie okładek na ekranie \'\'Obecnie Grane\'\'</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">Zaznacz, a pasek narzędzi na ekranie \'\'Obecnie Grane\'\' będzie nieprzeźroczysty i nie zasłoni już okładki</string>
+    <string name="pref_summary_force_square_album_art">Zaznacz, a wymuszone zostanie kadrowanie okładek na ekranie \'\'Obecnie Grane\'\'</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">Zaznacz, a pasek narzędzi będzie nieprzeźroczysty i nie zasłoni już okładki</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">Zaznacz, a pasek stanu będzie nieprzeźroczysty i nie zasłoni już okładki albumu</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Zaznacz, a pod przyciskami sterującymi odtwarzaczem (odtwarzanie/pauza, itp.) zostanie wyświetlona karta</string>
     <string name="failed_download_albumart">"Nie można pobrać okładki dla tego albumu"</string>
     <string name="search_hint">Szukaj w bibliotece...</string>
     <string name="rescanning_media">Ponowny skan nośnika...</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 66c277ed..d7ec4e29 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -54,7 +54,7 @@
     <string name="label_current_playing_queue">Çalma sırası</string>
     <string name="save_as_playlist">Çalma listesi olarak kaydet</string>
     <string name="credits_3">Simge tasarımı</string>
-    <string name="credits_1">"Phonograph tamamen ücretsiz material tasarımlı müzik çalar. Yapan"</string>
+    <string name="credits_1">"Phonograph tamamen ücretsiz material tasarıma sahip bir müzik çalardır. Yapan"</string>
     <string name="title_activity_search">Ara</string>
     <string name="no_results">Sonuç bulunamadı</string>
     <string name="action_re_download_artist_image">Sanatçı resmini güncelle</string>
@@ -62,19 +62,24 @@
     <string name="added_title_to_playing_queue">"Çalma kuyruğuna 1 başlık eklendi"</string>
     <string name="added_x_titles_to_playing_queue">Çalma kuyruğuna %1$d başlıkları eklendi.</string>
     <string name="title_activity_playlist_detail">Çalma listesi etkinliği</string>
+    <string name="action_remove_from_playlist">Çalma listesinden kaldır</string>
     <string name="new_playlist_action">Yeni çalma listesi</string>
     <string name="action_grid_columns">Izgara sütunları</string>
-    <string name="action_grid_columns_land">Izgara sütunları (Manzara)</string>
+    <string name="action_grid_columns_land">Izgara sütunları (Yatay)</string>
     <string name="inserted_x_songs_into_playlist">Bu çalma listesine %1$d şarkı eklenmiştir.</string>
     <string name="created_playlist_x">Çalma listesi %1$s oluşturuldu</string>
     <string name="deleted_playlist_x">Çalma listesi %1$s silindi</string>
     <string name="couldnot_create_playlist_x">Çalma listesi %1$s oluşturulamadı</string>
-    <string name="delete_playlist_x"><![CDATA[ Çalma listesi <b>%1$s</b>\'yi silmek istiyor musunuz ? ]]></string>
-    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> oynatma listelerini silmek istiyor musunuz?]]></string>
-    <string name="delete_song_x"><![CDATA[ <b>%1$s</b> şarkısını silmek istiyor musunuz? ]]></string>
-    <string name="delete_x_songs"><![CDATA[ <b>%1$d</b> bu şarkıları silmek istiyor musunuz? ]]></string>
+    <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> çalma listesini silmek istiyor musunuz?]]></string>
+    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> çalma listelerini silmek istiyor musunuz?]]></string>
+    <string name="delete_song_x"><![CDATA[<b>%1$s</b> şarkıyı silmek istiyor musunuz?]]></string>
+    <string name="delete_x_songs"><![CDATA[<b>%1$d</b> bu şarkıları silmek istiyor musunuz?]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Çalma listesinden <b>%1$s</b> şarkıyı kaldırmak istiyor musunuz?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Çalma listesinden <b>%1$d</b> şarkıları kaldırmak istiyor musunuz?]]></string>
     <string name="delete_song_title">Şarkıyı Sil</string>
     <string name="delete_songs_title">Şarkıları Sil</string>
+    <string name="remove_song_from_playlist_title">Şarkıyı Çalma Listesinden Kaldır</string>
+    <string name="remove_songs_from_playlist_title">Şarkıları Çalma Listesinden Kaldır</string>
     <string name="rename_playlist_title">Çalma Listesini Yeniden Adlandır</string>
     <string name="delete_playlist_title">Çalma Listesini Sil</string>
     <string name="delete_playlists_title">Çalma listelerini sil</string>
@@ -85,7 +90,9 @@
     <string name="last_opened">Son dinlenenler</string>
     <string name="light_theme_name">Açık</string>
     <string name="dark_theme_name">Koyu</string>
-    <string name="equalizer">Ekolayzır</string>
+    <string name="equalizer">Ekolayzer</string>
+    <string name="pref_header_colors">Renkler</string>
+    <string name="pref_header_now_playing_screen">Şimdi çalınıyor ekranı</string>
     <string name="pref_title_general_theme">Genel tema</string>
     <string name="pref_header_audio">Ses</string>
     <string name="pref_header_general">Genel</string>
@@ -95,20 +102,24 @@
     <string name="title_activity_settings">Ayarlar</string>
     <string name="pref_title_colored_navigation_bar_artists">Sanatçı görünümü</string>
     <string name="pref_title_colored_navigation_bar_albums">Albüm görünümü</string>
-    <string name="pref_title_colored_navigation_bar_current_playing">Şimdi çalınan görünümü</string>
+    <string name="pref_title_colored_navigation_bar_current_playing">Şuan çalınan görünümü</string>
     <string name="pref_title_colored_navigation_bar_playlists">Çalma listesi görünümü</string>
     <string name="pref_title_colored_navigation_bar_tag_editor">Etiket düxenleyici</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Başka her yer</string>
     <string name="pref_title_colored_album_footers">Renkli albüm alt bilgileri</string>
     <string name="pref_title_force_square_album_art">Kare albüm kapağına zorla</string>
-    <string name="pref_title_opaque_toolbar_now_playing">Opak şimdi çalınan araç çubuğu</string>
-    <string name="no_equalizer">Hiç ekolayzır bulunamadı</string>
+    <string name="pref_title_opaque_toolbar_now_playing">Opak araç çubuğu</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Opak durum çubuğu</string>
+    <string name="pref_title_playback_controller_card_now_playing">Oynatma kontrolleri altında kartı göster</string>
+    <string name="no_equalizer">Ekolayzer bulunamadı</string>
     <string name="no_audio_ID">"Hiçbir ses kimliği yok, bir şarkı çalın ve tekrar deneyin."</string>
     <string name="navigation_drawer_open">Gezinti çekmecesini aç</string>
     <string name="navigation_drawer_close">"Gezinti çekmecesini kapat"</string>
     <string name="delete_action">Sil</string>
+    <string name="remove_action">Kaldır</string>
     <string name="rename_action">Yeniden adlandır</string>
     <string name="create_action">Oluştur</string>
+    <string name="x_selected">%1$d seçildi</string>
     <string name="select">Seç</string>
     <string name="default_str">Varsayılan</string>
     <string name="primary_color">Ana Renk</string>
@@ -116,14 +127,20 @@
     <string name="primary_color_desc">Varsayılan tema ana rengi mavi.</string>
     <string name="accent_color_desc">Varsayılan tema vurgu rengi pembe.</string>
     <string name="update_image">Resimleri Güncelle</string>
-    <string name="playlist_empty_text">Bu oynatma listesi boş</string>
+    <string name="playlist_empty_text">Bu çalma listesi boş</string>
     <string name="no_playlists">Çalma listesi yok</string>
-    <string name="playlist_name">Oynatma Listesi adı</string>
+    <string name="no_albums">Albüm yok</string>
+    <string name="no_songs">Şarkı yok</string>
+    <string name="no_artists">Sanatcı yok</string>
+    <string name="empty">Boş</string>
+    <string name="playlist_name">Çalma listesi adı</string>
     <string name="song">Şarkı</string>
     <string name="pref_only_lollipop">"Sadece Lollipop için"</string>
     <string name="pref_summary_colored_album_footers">"Izgara içindeki albüm alt bilgisi albüm arkaplanı paletiyle renklendirildi."</string>
-    <string name="pref_summary_force_square_album_art">Şu anda çalınan albüm kapağı görüntüsü kare olmaya zorlandı.</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">Şimdi çalınandaki araç çubuğu opak ve artık albüm kapağı var.</string>
+    <string name="pref_summary_force_square_album_art">Şu anda çalınan albüm kapağı görüntüsünü kare olmaya zorlar.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">Şimdi çalınanda ki araç çubuğu opak ve artık albüm kapağı var.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">Durum çubuğu opak ve albüm kapak resmi yok.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Oynatma kontrol düğmelerinin altında bir kart görüntüler (oynat/duraklatma, vb).</string>
     <string name="failed_download_albumart">"Bu albüm için kapak indirilemiyor."</string>
     <string name="search_hint">Kütüphaneniz taranıyor...</string>
     <string name="rescanning_media">Medyayı yeniden tara</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ff4cd36d..e1b86349 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -97,6 +97,8 @@
     <string name="light_theme_name">浅色</string>
     <string name="dark_theme_name">暗色</string>
     <string name="equalizer">均衡器</string>
+    <string name="pref_header_colors">色彩</string>
+    <string name="pref_header_now_playing_screen">正在播放界面</string>
     <string name="pref_title_general_theme">全局主题</string>
     <string name="pref_header_audio">声音</string>
     <string name="pref_header_general">通用</string>
@@ -113,6 +115,8 @@
     <string name="pref_title_colored_album_footers">使用变色的专辑标签</string>
     <string name="pref_title_force_square_album_art">强制使用方形专辑封面</string>
     <string name="pref_title_opaque_toolbar_now_playing">正在播放界面使用不透明工具栏</string>
+    <string name="pref_title_opaque_statusbar_now_playing">不透明状态栏</string>
+    <string name="pref_title_playback_controller_card_now_playing">显示播放控制按钮后的卡片背景</string>
     <string name="no_equalizer">没有找到均衡器</string>
     <string name="no_audio_ID">"没有音频ID，请播放并重试。"</string>
     <string name="navigation_drawer_open">弹出导航抽屉</string>
@@ -141,6 +145,8 @@
     <string name="pref_summary_colored_album_footers">"专辑队列视图中专辑页脚会根据专辑封面的色调进行变色。"</string>
     <string name="pref_summary_force_square_album_art">在正在播放界中强制使用方形专辑封面</string>
     <string name="pref_summary_opaque_toolbar_now_playing">使正在播放界面的工具栏不透明并且并遮盖住部分专辑封面</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">状态栏不透明并且不会遮挡专辑封面</string>
+    <string name="pref_summary_playback_controller_card_now_playing">在播放控制按钮（播放/暂停等）下方显示卡片背景</string>
     <string name="failed_download_albumart">"专辑信息下载失败"</string>
     <string name="search_hint">正在扫描</string>
     <string name="rescanning_media">正在重新扫描媒体库…</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3a19d36c..5ea30c3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,8 +110,8 @@
     <string name="pref_title_force_square_album_art">Force square album art</string>
     <string name="pref_title_opaque_toolbar_now_playing">Opaque toolbar</string>
     <string name="pref_title_opaque_statusbar_now_playing">Opaque statusbar</string>
-    <string name="pref_title_smaller_title_box_now_playing">Smaller title box</string>
-    <string name="pref_title_traditional_progress_slider_now_playing">Traditional progress slider</string>
+    <string name="pref_title_larger_title_box_now_playing">Larger title box</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Alternative progress slider</string>
     <string name="pref_title_playback_controller_card_now_playing">Show card below playback controllers</string>
     <string name="no_equalizer">No equalizer found</string>
     <string name="no_audio_ID">"No audio ID, play something and try again."</string>
@@ -142,8 +142,8 @@
     <string name="pref_summary_force_square_album_art">Album art in the now playing view is forced to be squared.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">The toolbar is opaque and do not cover the album art.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">The statusbar is opaque and do not cover the album art.</string>
-    <string name="pref_summary_smaller_title_box_now_playing">The box below the album art where the song title and artist goes is smaller.</string>
-    <string name="pref_summary_traditional_progress_slider_now_playing">Uses the normal progress slider instead of the small bar below the album art.</string>
+    <string name="pref_summary_larger_title_box_now_playing">The box below the album art where the song title and artist goes is larger in its height.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Uses a progressbar which do not cover the album art instead of the normal progress slider.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Displays a card below the playback controller buttons (play/pause etc.).</string>
     <string name="failed_download_albumart">"Unable to download the art for this album."</string>
     <string name="search_hint">Search your library…</string>
diff --git a/app/src/main/res/xml/pref_colors.xml b/app/src/main/res/xml/pref_colors.xml
index 87f49270..1678038d 100644
--- a/app/src/main/res/xml/pref_colors.xml
+++ b/app/src/main/res/xml/pref_colors.xml
@@ -22,6 +22,7 @@
             android:summary="@string/accent_color_desc" />
 
         <CheckBoxPreference
+            android:layout="@layout/preference_custom"
             android:defaultValue="true"
             android:key="colored_album_footers"
             android:title="@string/pref_title_colored_album_footers"
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing_screen.xml
index ca970d94..05a6ab97 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -6,6 +6,7 @@
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="opaque_statusbar_now_playing"
+            android:layout="@layout/preference_custom"
             android:summary="@string/pref_summary_opaque_statusbar_now_playing"
             android:title="@string/pref_title_opaque_statusbar_now_playing"
             android:widgetLayout="@layout/preference_dynamic_checkbox" />
@@ -14,6 +15,7 @@
             android:defaultValue="false"
             android:dependency="opaque_statusbar_now_playing"
             android:key="opaque_toolbar_now_playing"
+            android:layout="@layout/preference_custom"
             android:summary="@string/pref_summary_opaque_toolbar_now_playing"
             android:title="@string/pref_title_opaque_toolbar_now_playing"
             android:widgetLayout="@layout/preference_dynamic_checkbox" />
@@ -21,27 +23,31 @@
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="force_square_album_art"
+            android:layout="@layout/preference_custom"
             android:summary="@string/pref_summary_force_square_album_art"
             android:title="@string/pref_title_force_square_album_art"
             android:widgetLayout="@layout/preference_dynamic_checkbox" />
 
         <CheckBoxPreference
             android:defaultValue="false"
-            android:key="smaller_title_box_now_playing"
-            android:summary="@string/pref_summary_smaller_title_box_now_playing"
-            android:title="@string/pref_title_smaller_title_box_now_playing"
+            android:key="larger_title_box_now_playing"
+            android:layout="@layout/preference_custom"
+            android:summary="@string/pref_summary_larger_title_box_now_playing"
+            android:title="@string/pref_title_larger_title_box_now_playing"
             android:widgetLayout="@layout/preference_dynamic_checkbox" />
 
         <CheckBoxPreference
             android:defaultValue="false"
-            android:key="traditional_progress_slider_now_playing"
-            android:summary="@string/pref_summary_traditional_progress_slider_now_playing"
-            android:title="@string/pref_title_traditional_progress_slider_now_playing"
+            android:key="alternative_progress_slider_now_playing"
+            android:layout="@layout/preference_custom"
+            android:summary="@string/pref_summary_alternative_progress_slider_now_playing"
+            android:title="@string/pref_title_alternative_progress_slider_now_playing"
             android:widgetLayout="@layout/preference_dynamic_checkbox" />
 
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="playback_controller_card_now_playing"
+            android:layout="@layout/preference_custom"
             android:summary="@string/pref_summary_playback_controller_card_now_playing"
             android:title="@string/pref_title_playback_controller_card_now_playing"
             android:widgetLayout="@layout/preference_dynamic_checkbox" />