From 569f2240ff6f15d6bb0ff7a7a2aeed8f1cc6c287 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Thu, 15 Oct 2020 23:09:09 +0900
Subject: [PATCH] update a bunch of strings

---
 .../preferences/CategoryPreferenceDialog.java |  2 +-
 .../DirectPlayPreferenceDialog.java           |  2 +-
 .../NowPlayingScreenPreferenceDialog.java     |  3 +-
 .../ui/activities/SettingsActivity.java       |  8 ++---
 app/src/main/res/values-ar/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-bg/strings.xml        | 26 +++++++-------
 app/src/main/res/values-cs/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-de/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-el/strings.xml        | 26 +++++++-------
 app/src/main/res/values-en-rCA/strings.xml    | 26 +++++++-------
 app/src/main/res/values-en-rGB/strings.xml    | 34 +++++++++---------
 app/src/main/res/values-es-rES/strings.xml    | 34 +++++++++---------
 app/src/main/res/values-es-rUS/strings.xml    | 34 +++++++++---------
 app/src/main/res/values-fi/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-fr/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-he/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-hr/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-hu/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-id/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-in/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-it/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-iw/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-ja/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-ko/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-nl/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-nn/strings.xml        | 10 +++---
 app/src/main/res/values-pl/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-pt-rBR/strings.xml    | 34 +++++++++---------
 app/src/main/res/values-pt-rPT/strings.xml    | 22 ++++++------
 app/src/main/res/values-ro/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-ru/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-sv/strings.xml        |  4 +--
 app/src/main/res/values-tr/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-uk/strings.xml        | 34 +++++++++---------
 app/src/main/res/values-vi/strings.xml        | 26 +++++++-------
 app/src/main/res/values-zh-rCN/strings.xml    | 34 +++++++++---------
 app/src/main/res/values-zh-rTW/strings.xml    | 34 +++++++++---------
 app/src/main/res/values/strings.xml           | 36 +++++++++----------
 app/src/main/res/xml/pref_interface.xml       | 14 ++++----
 app/src/main/res/xml/pref_library.xml         |  8 ++---
 app/src/main/res/xml/pref_lock_screen.xml     | 10 +++---
 app/src/main/res/xml/pref_now_playing.xml     |  2 +-
 app/src/main/res/xml/pref_playback.xml        |  2 +-
 43 files changed, 555 insertions(+), 556 deletions(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
index 297235e6..74e98652 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
@@ -46,7 +46,7 @@ public class CategoryPreferenceDialog extends DialogFragment {
         adapter.attachToRecyclerView(recyclerView);
 
         return new MaterialDialog.Builder(requireActivity())
-                .title(R.string.library_categories)
+                .title(R.string.pref_title_categories)
                 .customView(view, false)
                 .positiveText(android.R.string.ok)
                 .negativeText(android.R.string.cancel)
diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java
index ac7f27de..37788cf5 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java
@@ -33,7 +33,7 @@ public class DirectPlayPreferenceDialog extends DialogFragment {
         recyclerView.setAdapter(adapter);
 
         return new MaterialDialog.Builder(requireActivity())
-                .title(R.string.direct_play_codecs)
+                .title(R.string.pref_title_direct_play_codecs)
                 .customView(view, false)
                 .positiveText(android.R.string.ok)
                 .negativeText(android.R.string.cancel)
diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
index e9ba453e..8a908408 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
@@ -1,6 +1,5 @@
 package com.dkanada.gramophone.preferences;
 
-import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -48,7 +47,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements
         pageIndicator.onPageSelected(viewPager.getCurrentItem());
 
         return new MaterialDialog.Builder(requireActivity())
-                .title(R.string.pref_title_now_playing_screen_appearance)
+                .title(R.string.pref_title_now_playing_appearance)
                 .positiveText(android.R.string.ok)
                 .negativeText(android.R.string.cancel)
                 .onAny(this)
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
index 19ca0bf2..c5529d12 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
@@ -64,10 +64,10 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
     @Override
     public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) {
         switch (dialog.getTitle()) {
-            case R.string.primary_color:
+            case R.string.pref_title_primary_color:
                 ThemeStore.editTheme(this).primaryColor(selectedColor).commit();
                 break;
-            case R.string.accent_color:
+            case R.string.pref_title_accent_color:
                 ThemeStore.editTheme(this).accentColor(selectedColor).commit();
                 break;
         }
@@ -174,7 +174,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
             final int primaryColor = ThemeStore.primaryColor(requireActivity());
             primaryColorPref.setColor(primaryColor, ColorUtil.darkenColor(primaryColor));
             primaryColorPref.setOnPreferenceClickListener(preference -> {
-                new ColorChooserDialog.Builder(requireActivity(), R.string.primary_color)
+                new ColorChooserDialog.Builder(requireActivity(), R.string.pref_title_primary_color)
                         .accentMode(false)
                         .allowUserColorInput(true)
                         .allowUserColorInputAlpha(false)
@@ -187,7 +187,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
             final int accentColor = ThemeStore.accentColor(requireActivity());
             accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor));
             accentColorPref.setOnPreferenceClickListener(preference -> {
-                new ColorChooserDialog.Builder(requireActivity(), R.string.accent_color)
+                new ColorChooserDialog.Builder(requireActivity(), R.string.pref_title_accent_color)
                         .accentMode(true)
                         .allowUserColorInput(true)
                         .allowUserColorInputAlpha(false)
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 2b17181d..c4b5cede 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">غامق</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_title_theme">التنسيق العام</string>
     <string name="pref_header_audio">الصوت</string>
     <string name="pref_header_library">المكتبة</string>
-    <string name="pref_header_lockscreen">شاشة القفل</string>
+    <string name="pref_header_lock_screen">شاشة القفل</string>
     <string name="pref_header_notification">الإشعار</string>
-    <string name="pref_title_app_shortcuts">اختصارات تطبيق ملونة</string>
-    <string name="pref_title_album_art_on_lockscreen">عرض غلاف الألبوم</string>
-    <string name="pref_title_blurred_album_art">تغييم صورة الألبوم</string>
+    <string name="pref_title_colored_shortcuts">اختصارات تطبيق ملونة</string>
+    <string name="pref_title_show_album_art">عرض غلاف الألبوم</string>
+    <string name="pref_title_blur_album_art">تغييم صورة الألبوم</string>
     <string name="pref_title_colored_notification">إشعار ملون</string>
     <string name="pref_title_classic_notification">تصميم الإشعار الكلاسيكي</string>
     <string name="pref_title_audio_ducking">خفض الصوت عند فقدان التركيز</string>
-    <string name="pref_title_remember_last_tab">تذكر آخر لسان</string>
+    <string name="pref_title_remember_tab">تذكر آخر لسان</string>
     <string name="delete_action">حذف</string>
     <string name="remove_action">إزالة</string>
     <string name="rename_action">إعادة تسمية</string>
     <string name="create_action">إنشاء</string>
     <string name="reset_action">إعادة تعيين</string>
     <string name="x_selected">تم تحديد %1$d</string>
-    <string name="primary_color">اللون الأساسي</string>
-    <string name="accent_color">اللون الثانوي</string>
-    <string name="primary_color_desc">لون التنسيق الأساسي، الافتراضي هو الأزرق النيلي.</string>
-    <string name="accent_color_desc">لون التنسيق الثانوي، الافتراضي هو الزهري.</string>
+    <string name="pref_title_primary_color">اللون الأساسي</string>
+    <string name="pref_title_accent_color">اللون الثانوي</string>
+    <string name="pref_summary_primary_color">لون التنسيق الأساسي، الافتراضي هو الأزرق النيلي.</string>
+    <string name="pref_summary_accent_color">لون التنسيق الثانوي، الافتراضي هو الزهري.</string>
     <string name="no_playlists">لا توجد قوائم تشغيل</string>
     <string name="no_albums">لا توجد ألبومات</string>
     <string name="no_songs">لا توجد أغاني</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">لا توجد أنواع</string>
     <string name="empty">فارغ</string>
     <string name="song">الأغنية</string>
-    <string name="pref_summary_album_art_on_lockscreen">استعمال غلاف ألبوم الأغنية الحالية كخلفية لشاشة القفل.</string>
-    <string name="pref_summary_blurred_album_art">تغييم غلاف الألبوم في شاشة القفل. قد يسبب مشاكل مع التطبيقات والأدوات الذكية من طرف ثالث.</string>
+    <string name="pref_summary_show_album_art">استعمال غلاف ألبوم الأغنية الحالية كخلفية لشاشة القفل.</string>
+    <string name="pref_summary_blur_album_art">تغييم غلاف الألبوم في شاشة القفل. قد يسبب مشاكل مع التطبيقات والأدوات الذكية من طرف ثالث.</string>
     <string name="pref_summary_classic_notification">استعمال تصميم الإشعار الكلاسيكي.</string>
     <string name="pref_summary_colored_notification">"\u062a\u0644\u0648\u064a\u0646 \u0627\u0644\u0625\u0634\u0639\u0627\u0631 \u0628\u0644\u0648\u0646 \u063a\u0644\u0627\u0641 \u0627\u0644\u0623\u0644\u0628\u0648\u0645 \u0627\u0644\u0628\u0627\u0631\u0632."</string>
-    <string name="pref_summary_colored_app_shortcuts">تلوين اختصارات التطبيق باللون الأساسي.</string>
+    <string name="pref_summary_colored_shortcuts">تلوين اختصارات التطبيق باللون الأساسي.</string>
     <string name="pref_summary_audio_ducking">الإشعارات، التنقل، إلخ.</string>
-    <string name="pref_summary_remember_last_tab">الذهاب إلى آخر لسان مفتوح عند التشغيل</string>
+    <string name="pref_summary_remember_tab">الذهاب إلى آخر لسان مفتوح عند التشغيل</string>
     <string name="last_added">المضافة مؤخراً</string>
     <string name="my_top_tracks">أفضل الأغاني</string>
     <string name="action_sleep_timer">مؤقت النوم</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">من أجل مساعدته لي في التصميم.</string>
     <string name="website">الموقع</string>
     <string name="up_next">التالي</string>
-    <string name="pref_title_now_playing_screen_appearance">المظهر</string>
+    <string name="pref_title_now_playing_appearance">المظهر</string>
     <string name="login">تسجيل دخول</string>
     <string name="username">اسم المستخدم</string>
     <string name="password">كلمة المرور</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">إشعار التشغيل</string>
     <string name="eugene_cheung_summary">من أجل مساهماته في الكود المصدري.</string>
     <string name="adrian_summary">من أجل إنشاءه تصميم صفحة الألبومات.</string>
-    <string name="library_categories">أقسام المكتبة</string>
-    <string name="pref_summary_library_categories">تخصيص رؤية وترتيب أقسام المكتبة.</string>
+    <string name="pref_title_categories">أقسام المكتبة</string>
+    <string name="pref_summary_categories">تخصيص رؤية وترتيب أقسام المكتبة.</string>
     <string name="you_have_to_select_at_least_one_category">عليك أن تختار قسماً واحداً على الأقل.</string>
     <string name="action_sort_order">ترتيب الفرز</string>
     <string name="sort_order_ascending">تصاعدي</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 20cd6791..e8919c79 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -55,12 +55,12 @@
     <string name="dark_theme_name">Тъмен изглед</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_title_theme">Главна тема</string>
     <string name="pref_header_audio">Аудио</string>
-    <string name="pref_header_lockscreen">Заключен екран</string>
-    <string name="pref_title_app_shortcuts">Оцветяване на бутоните</string>
-    <string name="pref_title_album_art_on_lockscreen">Покажи обложката на албум</string>
-    <string name="pref_title_blurred_album_art">Размажи обложката</string>
+    <string name="pref_header_lock_screen">Заключен екран</string>
+    <string name="pref_title_colored_shortcuts">Оцветяване на бутоните</string>
+    <string name="pref_title_show_album_art">Покажи обложката на албум</string>
+    <string name="pref_title_blur_album_art">Размажи обложката</string>
     <string name="pref_title_colored_notification">Оцвети известията</string>
     <string name="pref_title_audio_ducking">Намалявай звукът при известия</string>
     <string name="delete_action">Изтрий</string>
@@ -68,20 +68,20 @@
     <string name="rename_action">Преименувай</string>
     <string name="create_action">Създай</string>
     <string name="x_selected">%1$d бе избрано</string>
-    <string name="primary_color">Главен цвят</string>
-    <string name="accent_color">Цвят на акцента</string>
-    <string name="primary_color_desc">Подразбиращият се цвят на темата е индиго.</string>
-    <string name="accent_color_desc">Цветът по подразбиране на акцентите е розов.</string>
+    <string name="pref_title_primary_color">Главен цвят</string>
+    <string name="pref_title_accent_color">Цвят на акцента</string>
+    <string name="pref_summary_primary_color">Подразбиращият се цвят на темата е индиго.</string>
+    <string name="pref_summary_accent_color">Цветът по подразбиране на акцентите е розов.</string>
     <string name="no_playlists">Няма плейлисти</string>
     <string name="no_albums">Няма албуми</string>
     <string name="no_songs">Няма песни</string>
     <string name="no_artists">Няма артисти</string>
     <string name="empty">Празен</string>
     <string name="song">Песен</string>
-    <string name="pref_summary_album_art_on_lockscreen">Използва обложката на албума при заключен екран.</string>
-    <string name="pref_summary_blurred_album_art">Замъглява обложката при заключен екран. Би могло да създаде проблеми с апликации и известия създадени от трети лица.</string>
+    <string name="pref_summary_show_album_art">Използва обложката на албума при заключен екран.</string>
+    <string name="pref_summary_blur_album_art">Замъглява обложката при заключен екран. Би могло да създаде проблеми с апликации и известия създадени от трети лица.</string>
     <string name="pref_summary_colored_notification">"\u041e\u0446\u0432\u0435\u0442\u044f\u0432\u0430 \u0438\u0437\u0432\u0435\u0441\u0442\u0438\u0435\u0442\u043e \u0432 \u0433\u043b\u0430\u0432\u043d\u0438\u044f \u0446\u0432\u044f\u0442 \u043e\u0442 \u043e\u0431\u043b\u043e\u0436\u043a\u0430\u0442\u0430."</string>
-    <string name="pref_summary_colored_app_shortcuts">Оцветява бутоните в главният цвят на апликацията.</string>
+    <string name="pref_summary_colored_shortcuts">Оцветява бутоните в главният цвят на апликацията.</string>
     <string name="pref_summary_audio_ducking">Известия, навигация etc.</string>
     <string name="last_added">Последно добавени</string>
     <string name="my_top_tracks">Моите топ песни</string>
@@ -110,7 +110,7 @@
     <string name="aleksandar_tesic_summary">За помощта относно дизайн</string>
     <string name="website">Уебсайт</string>
     <string name="up_next">Следващи песни</string>
-    <string name="pref_title_now_playing_screen_appearance">Изглед</string>
+    <string name="pref_title_now_playing_appearance">Изглед</string>
     <string name="login">Логин</string>
     <string name="username">Юзернейм</string>
     <string name="password">Парола</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7246f81b..27c95bd9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Tmavý</string>
     <string name="pref_header_colors">Barvy</string>
     <string name="pref_header_now_playing_screen">Právě hraje</string>
-    <string name="pref_title_general_theme">Motiv</string>
+    <string name="pref_title_theme">Motiv</string>
     <string name="pref_header_audio">Zvuk</string>
     <string name="pref_header_library">Knihovna</string>
-    <string name="pref_header_lockscreen">Odemykací obrazovka</string>
+    <string name="pref_header_lock_screen">Odemykací obrazovka</string>
     <string name="pref_header_notification">Oznámení</string>
-    <string name="pref_title_app_shortcuts">Barevné zkratky aplikace</string>
-    <string name="pref_title_album_art_on_lockscreen">Zobrazit obal alba</string>
-    <string name="pref_title_blurred_album_art">Rozostřit obal alba</string>
+    <string name="pref_title_colored_shortcuts">Barevné zkratky aplikace</string>
+    <string name="pref_title_show_album_art">Zobrazit obal alba</string>
+    <string name="pref_title_blur_album_art">Rozostřit obal alba</string>
     <string name="pref_title_colored_notification">Barevné notifikace</string>
     <string name="pref_title_classic_notification">Klasický vzhled oznámení</string>
     <string name="pref_title_audio_ducking">Snížit hlasitost při ztrátě priority zvuku</string>
-    <string name="pref_title_remember_last_tab">Pamatovat poslední kartu</string>
+    <string name="pref_title_remember_tab">Pamatovat poslední kartu</string>
     <string name="delete_action">Smazat</string>
     <string name="remove_action">Odstranit</string>
     <string name="rename_action">Přejmenovat</string>
     <string name="create_action">Vytvořit</string>
     <string name="reset_action">Resetovat</string>
     <string name="x_selected">%1$d vybrána</string>
-    <string name="primary_color">Hlavní barva</string>
-    <string name="accent_color">Vedlejší barva</string>
-    <string name="primary_color_desc">Hlavní barva motivu (výchozí: modrá).</string>
-    <string name="accent_color_desc">Vedlejší barva motivu (výchozí: růžová).</string>
+    <string name="pref_title_primary_color">Hlavní barva</string>
+    <string name="pref_title_accent_color">Vedlejší barva</string>
+    <string name="pref_summary_primary_color">Hlavní barva motivu (výchozí: modrá).</string>
+    <string name="pref_summary_accent_color">Vedlejší barva motivu (výchozí: růžová).</string>
     <string name="no_playlists">Žádný playlist</string>
     <string name="no_albums">Žádná alba</string>
     <string name="no_songs">Žádně skladby</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Žádné žánry</string>
     <string name="empty">Prázdné</string>
     <string name="song">Skladba</string>
-    <string name="pref_summary_album_art_on_lockscreen">Používá aktuální obal alba jako tapetu zamykací obrazovky.</string>
-    <string name="pref_summary_blurred_album_art">Rozostří obal alba na uzamčené obrazovce. Může být problematické s aplikacemi a widgety třetích stran.</string>
+    <string name="pref_summary_show_album_art">Používá aktuální obal alba jako tapetu zamykací obrazovky.</string>
+    <string name="pref_summary_blur_album_art">Rozostří obal alba na uzamčené obrazovce. Může být problematické s aplikacemi a widgety třetích stran.</string>
     <string name="pref_summary_classic_notification">Použije klasický vzhled oznámení.</string>
     <string name="pref_summary_colored_notification">"Zbarv\u00ed ozn\u00e1men\u00ed do barev podle obalu alba."</string>
-    <string name="pref_summary_colored_app_shortcuts">Zbarví zkratky aplikace primární barvou</string>
+    <string name="pref_summary_colored_shortcuts">Zbarví zkratky aplikace primární barvou</string>
     <string name="pref_summary_audio_ducking">Oznámení, navigace atd.</string>
-    <string name="pref_summary_remember_last_tab">Přejděte na poslední otevřenou kartu při spuštění</string>
+    <string name="pref_summary_remember_tab">Přejděte na poslední otevřenou kartu při spuštění</string>
     <string name="last_added">Naposledy přidáno</string>
     <string name="my_top_tracks">"Moje nejposlouchanější skladby "</string>
     <string name="action_sleep_timer">Určit ukončení přehrávání</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">"Za pomoc s designem. "</string>
     <string name="website">"Stránka "</string>
     <string name="up_next">"Další "</string>
-    <string name="pref_title_now_playing_screen_appearance">Vzhled</string>
+    <string name="pref_title_now_playing_appearance">Vzhled</string>
     <string name="login">Přihlášení</string>
     <string name="username">Uživatelské jméno</string>
     <string name="password">Heslo</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Oznámení o přehrávání</string>
     <string name="eugene_cheung_summary">Pro příspěvky ke zdrojovému kódu.</string>
     <string name="adrian_summary">Pro vytvoření návrhu stránky alba.</string>
-    <string name="library_categories">Kategorie knihovny</string>
-    <string name="pref_summary_library_categories">Nastavit viditelnost a pořadí kategorií knihoven.</string>
+    <string name="pref_title_categories">Kategorie knihovny</string>
+    <string name="pref_summary_categories">Nastavit viditelnost a pořadí kategorií knihoven.</string>
     <string name="you_have_to_select_at_least_one_category">Musíte zvolit alespoň jednu kategorii.</string>
     <string name="action_sort_order">Seřazení</string>
     <string name="sort_order_ascending">Vzestupně</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b55186ef..348ee7f9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -56,18 +56,18 @@
     <string name="dark_theme_name">Dunkel</string>
     <string name="pref_header_colors">Farben</string>
     <string name="pref_header_now_playing_screen">Aktuelle Wiedergabe</string>
-    <string name="pref_title_general_theme">Generelles Design</string>
+    <string name="pref_title_theme">Generelles Design</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Bibliothek</string>
-    <string name="pref_header_lockscreen">Sperrbildschirm</string>
+    <string name="pref_header_lock_screen">Sperrbildschirm</string>
     <string name="pref_header_notification">Benachrichtigung</string>
-    <string name="pref_title_app_shortcuts">Gefärbte App-Shortcuts</string>
-    <string name="pref_title_album_art_on_lockscreen">Album Cover anzeigen</string>
-    <string name="pref_title_blurred_album_art">Album Cover weichzeichnen</string>
+    <string name="pref_title_colored_shortcuts">Gefärbte App-Shortcuts</string>
+    <string name="pref_title_show_album_art">Album Cover anzeigen</string>
+    <string name="pref_title_blur_album_art">Album Cover weichzeichnen</string>
     <string name="pref_title_colored_notification">Gefärbte Benachrichtigung</string>
     <string name="pref_title_classic_notification">Klassisches Benachrichtigungsdesign</string>
     <string name="pref_title_audio_ducking">Lautstärke bei Fokusverlust verringern</string>
-    <string name="pref_title_remember_last_tab">Letzten Tab merken</string>
+    <string name="pref_title_remember_tab">Letzten Tab merken</string>
     <string name="pref_title_remember_shuffle">Shuffle-Einstellung merken</string>
     <string name="delete_action">Löschen</string>
     <string name="remove_action">Entfernen</string>
@@ -75,10 +75,10 @@
     <string name="create_action">Erstellen</string>
     <string name="reset_action">Zurücksetzen</string>
     <string name="x_selected">%1$d ausgewählt</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="pref_title_primary_color">Hauptfarbe</string>
+    <string name="pref_title_accent_color">Akzentfarbe</string>
+    <string name="pref_summary_primary_color">Die primäre Farbe, Standard ist indigo.</string>
+    <string name="pref_summary_accent_color">Die Akzentfarbe, Standard ist pink.</string>
     <string name="no_playlists">Keine Wiedergabelisten</string>
     <string name="no_albums">Keine Alben</string>
     <string name="no_songs">Keine Songs</string>
@@ -88,13 +88,13 @@
     <string name="error_unreachable_server">Kann Server nicht erreichen.</string>
     <string name="error_login_credentials">Ungültige Anmeldedaten.</string>
     <string name="song">Titel</string>
-    <string name="pref_summary_album_art_on_lockscreen">Das Album Cover des aktuellen Titels wird als Hintergrund im Sperrbildschirm verwendet.</string>
-    <string name="pref_summary_blurred_album_art">Lässt das Album Cover auf dem Sperrbildschirm verschwommen aussehen. Kann Probleme mit Apps und Widgets von Dritten verursachen.</string>
+    <string name="pref_summary_show_album_art">Das Album Cover des aktuellen Titels wird als Hintergrund im Sperrbildschirm verwendet.</string>
+    <string name="pref_summary_blur_album_art">Lässt das Album Cover auf dem Sperrbildschirm verschwommen aussehen. Kann Probleme mit Apps und Widgets von Dritten verursachen.</string>
     <string name="pref_summary_classic_notification">Das klassische Benachrichtigungsdesign verwenden.</string>
     <string name="pref_summary_colored_notification">"Die Benachrichtigung ist in der Farbe des Album Covers gef\u00e4rbt."</string>
-    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Shortcuts mit der Hauptfarbe.</string>
+    <string name="pref_summary_colored_shortcuts">Färbt die App-Shortcuts mit der Hauptfarbe.</string>
     <string name="pref_summary_audio_ducking">Benachrichtigungen, Navigation etc.</string>
-    <string name="pref_summary_remember_last_tab">Zuletzt geöffneten Tab beim Start anzeigen</string>
+    <string name="pref_summary_remember_tab">Zuletzt geöffneten Tab beim Start anzeigen</string>
     <string name="pref_summary_remember_shuffle">Shuffle bleibt aktiviert, wenn neue Songs ausgewählt werden</string>
     <string name="last_added">Zuletzt hinzugefügt</string>
     <string name="my_top_tracks">Meine Lieblingstitel</string>
@@ -124,7 +124,7 @@
     <string name="aleksandar_tesic_summary">Für die Hilfe beim Design.</string>
     <string name="website">Website</string>
     <string name="up_next">Als nächstes</string>
-    <string name="pref_title_now_playing_screen_appearance">Aussehen</string>
+    <string name="pref_title_now_playing_appearance">Aussehen</string>
     <string name="login">Einloggen</string>
     <string name="username">Benutzername</string>
     <string name="password">Passwort</string>
@@ -133,8 +133,8 @@
     <string name="playing_notification_name">Wiedergabe-Benachrichtigung</string>
     <string name="eugene_cheung_summary">Für seinen Beitrag zum Quellcode.</string>
     <string name="adrian_summary">Für die Erstellung des Designs der Album-Seite.</string>
-    <string name="library_categories">Bibliothekskategorien</string>
-    <string name="pref_summary_library_categories">Anzeige und Anordnung der einzelnen Kategorien festlegen.</string>
+    <string name="pref_title_categories">Bibliothekskategorien</string>
+    <string name="pref_summary_categories">Anzeige und Anordnung der einzelnen Kategorien festlegen.</string>
     <string name="you_have_to_select_at_least_one_category">Mindestens eine Kategorie muss ausgewählt sein.</string>
     <string name="action_sort_order">Sortierung</string>
     <string name="sort_order_ascending">Aufsteigend</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a12d6313..60c9a1a9 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -55,14 +55,14 @@
     <string name="dark_theme_name">Σκούρο</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_title_theme">Γενικό θέμα</string>
     <string name="pref_header_audio">Ήχος</string>
     <string name="pref_header_library">Βιβλιοθήκη</string>
-    <string name="pref_header_lockscreen">Οθόνη κλειδώματος</string>
+    <string name="pref_header_lock_screen">Οθόνη κλειδώματος</string>
     <string name="pref_header_notification">Ειδοποιήσεις</string>
-    <string name="pref_title_app_shortcuts">Χρωματιστές συντομεύσεις εφαρμογής</string>
-    <string name="pref_title_album_art_on_lockscreen">Εμφάνιση album art</string>
-    <string name="pref_title_blurred_album_art">Θάμπωμα πορτρέτων καλλιτεχνών</string>
+    <string name="pref_title_colored_shortcuts">Χρωματιστές συντομεύσεις εφαρμογής</string>
+    <string name="pref_title_show_album_art">Εμφάνιση album art</string>
+    <string name="pref_title_blur_album_art">Θάμπωμα πορτρέτων καλλιτεχνών</string>
     <string name="pref_title_colored_notification">Χρωματισμένη ειδοποίηση</string>
     <string name="pref_title_classic_notification">Κλασικός σχεδιασμός ειδοποιήσεων</string>
     <string name="pref_title_audio_ducking">Μειώστε την ένταση στην απώλεια εστίασης</string>
@@ -71,20 +71,20 @@
     <string name="rename_action">Μετονομασία</string>
     <string name="create_action">Δημιουργία</string>
     <string name="x_selected">Επιλέχθηκαν %1$d</string>
-    <string name="primary_color">Πρωτεύον χρώμα</string>
-    <string name="accent_color">Χρώμα χαρακτήρων</string>
-    <string name="primary_color_desc">Το πρωτεύον χρώμα θέματος είναι λουλακί.</string>
-    <string name="accent_color_desc">Το χρώμα των χαρακτήρων του θέματος είναι ροζ.</string>
+    <string name="pref_title_primary_color">Πρωτεύον χρώμα</string>
+    <string name="pref_title_accent_color">Χρώμα χαρακτήρων</string>
+    <string name="pref_summary_primary_color">Το πρωτεύον χρώμα θέματος είναι λουλακί.</string>
+    <string name="pref_summary_accent_color">Το χρώμα των χαρακτήρων του θέματος είναι ροζ.</string>
     <string name="no_playlists">Καμία λίστα</string>
     <string name="no_albums">Δεν υπάρχουν άλμπουμ</string>
     <string name="no_songs">Δεν υπάρχουν τραγούδια</string>
     <string name="no_artists">Δεν υπάρχουν καλλιτέχνες</string>
     <string name="empty">Κενό</string>
     <string name="song">Τραγούδι</string>
-    <string name="pref_summary_album_art_on_lockscreen">Εμφάνιση του album art στην οθόνη κλειδώματος.</string>
-    <string name="pref_summary_blurred_album_art">Το θωριασμένο album εξώφυλλο στην οθόνη κλειδώματος μπορεί να δημιουργήσει προβλήματα με τρίτες εφαρμογές και συντομιεύσεις.</string>
+    <string name="pref_summary_show_album_art">Εμφάνιση του album art στην οθόνη κλειδώματος.</string>
+    <string name="pref_summary_blur_album_art">Το θωριασμένο album εξώφυλλο στην οθόνη κλειδώματος μπορεί να δημιουργήσει προβλήματα με τρίτες εφαρμογές και συντομιεύσεις.</string>
     <string name="pref_summary_colored_notification">"\u03a7\u03c1\u03c9\u03bc\u03b1\u03c4\u03af\u03b6\u03b5\u03b9 \u03c4\u03b7\u03bd \u03bc\u03c0\u03ac\u03c1\u03b1 \u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c9\u03bd \u03c3\u03c4\u03bf \u03c7\u03c1\u03ce\u03bc\u03b1 \u03c4\u03bf\u03c5 album art \u03c4\u03bf\u03c5 \u03c4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd"</string>
-    <string name="pref_summary_colored_app_shortcuts">Χρωματίζει τις συντομεύσεις της εφαρμογής στο κυρίως χρώμα.</string>
+    <string name="pref_summary_colored_shortcuts">Χρωματίζει τις συντομεύσεις της εφαρμογής στο κυρίως χρώμα.</string>
     <string name="pref_summary_audio_ducking">Ειδοποιήσεις, πλοήγηση κ.λπ.</string>
     <string name="last_added">Προστέθηκαν τελευταία</string>
     <string name="my_top_tracks">Τα κορυφαία κομμάτια μου</string>
@@ -113,7 +113,7 @@
     <string name="aleksandar_tesic_summary">Για την βοήθειά του στον σχεδιασμό.</string>
     <string name="website">Ιστοσελίδα</string>
     <string name="up_next">Επόμενο</string>
-    <string name="pref_title_now_playing_screen_appearance">Εμφάνιση</string>
+    <string name="pref_title_now_playing_appearance">Εμφάνιση</string>
     <string name="login">Είσοδος</string>
     <string name="username">Όνομα Χρήστη</string>
     <string name="password">Κωδικός Πρόσβασης</string>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index c6676743..e6c25630 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -55,13 +55,13 @@
     <string name="dark_theme_name">Dark</string>
     <string name="pref_header_colors">Colors</string>
     <string name="pref_header_now_playing_screen">Now playing</string>
-    <string name="pref_title_general_theme">General theme</string>
+    <string name="pref_title_theme">General theme</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
+    <string name="pref_header_lock_screen">Lockscreen</string>
     <string name="pref_header_notification">Notification</string>
-    <string name="pref_title_app_shortcuts">Coloured app shortcuts</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
+    <string name="pref_title_colored_shortcuts">Coloured app shortcuts</string>
+    <string name="pref_title_show_album_art">Show album cover</string>
+    <string name="pref_title_blur_album_art">Blur album cover</string>
     <string name="pref_title_colored_notification">Colored notification</string>
     <string name="pref_title_classic_notification">Classic notification design</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
@@ -70,21 +70,21 @@
     <string name="rename_action">Rename</string>
     <string name="create_action">Create</string>
     <string name="x_selected">%1$d selected</string>
-    <string name="primary_color">Primary colour</string>
-    <string name="accent_color">Accent colour</string>
-    <string name="primary_color_desc">The primary theme color, defaults to indigo.</string>
-    <string name="accent_color_desc">The accent theme color, defaults to pink.</string>
+    <string name="pref_title_primary_color">Primary colour</string>
+    <string name="pref_title_accent_color">Accent colour</string>
+    <string name="pref_summary_primary_color">The primary theme color, defaults to indigo.</string>
+    <string name="pref_summary_accent_color">The accent theme color, defaults to pink.</string>
     <string name="no_playlists">No playlists</string>
     <string name="no_albums">No albums</string>
     <string name="no_songs">No songs</string>
     <string name="no_artists">No artists</string>
     <string name="empty">Empty</string>
     <string name="song">Song</string>
-    <string name="pref_summary_album_art_on_lockscreen">Uses the current songs album cover as lockscreen wallpaper.</string>
-    <string name="pref_summary_blurred_album_art">Blurs the album cover on the lockscreen. Can cause problems with third party apps and widgets.</string>
+    <string name="pref_summary_show_album_art">Uses the current songs album cover as lockscreen wallpaper.</string>
+    <string name="pref_summary_blur_album_art">Blurs the album cover on the lockscreen. Can cause problems with third party apps and widgets.</string>
     <string name="pref_summary_classic_notification">Use the classic notification design.</string>
     <string name="pref_summary_colored_notification">"Colors the notification in the album cover\u2019s vibrant color."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colors the app shortcuts in the primary color.</string>
+    <string name="pref_summary_colored_shortcuts">Colors the app shortcuts in the primary color.</string>
     <string name="pref_summary_audio_ducking">Notifications, navigation etc.</string>
     <string name="last_added">Last added</string>
     <string name="my_top_tracks">My top tracks</string>
@@ -114,7 +114,7 @@
     <string name="aleksandar_tesic_summary">For helping me with the design.</string>
     <string name="website">Website</string>
     <string name="up_next">Up next</string>
-    <string name="pref_title_now_playing_screen_appearance">Appearance</string>
+    <string name="pref_title_now_playing_appearance">Appearance</string>
     <string name="login">Login</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 66b3abc5..1e12c1f3 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Dark</string>
     <string name="pref_header_colors">Colours</string>
     <string name="pref_header_now_playing_screen">Now playing</string>
-    <string name="pref_title_general_theme">General theme</string>
+    <string name="pref_title_theme">General theme</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
+    <string name="pref_header_lock_screen">Lockscreen</string>
     <string name="pref_header_notification">Notification</string>
-    <string name="pref_title_app_shortcuts">Coloured app shortcuts</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
+    <string name="pref_title_colored_shortcuts">Coloured app shortcuts</string>
+    <string name="pref_title_show_album_art">Show album cover</string>
+    <string name="pref_title_blur_album_art">Blur album cover</string>
     <string name="pref_title_colored_notification">Coloured notification</string>
     <string name="pref_title_classic_notification">Classic notification design</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_remember_last_tab">Remember last tab</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
     <string name="delete_action">Delete</string>
     <string name="remove_action">Remove</string>
     <string name="rename_action">Rename</string>
     <string name="create_action">Create</string>
     <string name="reset_action">Reset</string>
     <string name="x_selected">%1$d selected</string>
-    <string name="primary_color">Primary colour</string>
-    <string name="accent_color">Accent colour</string>
-    <string name="primary_color_desc">The primary theme colour, defaults to indigo.</string>
-    <string name="accent_color_desc">The accent theme colour, defaults to pink.</string>
+    <string name="pref_title_primary_color">Primary colour</string>
+    <string name="pref_title_accent_color">Accent colour</string>
+    <string name="pref_summary_primary_color">The primary theme colour, defaults to indigo.</string>
+    <string name="pref_summary_accent_color">The accent theme colour, defaults to pink.</string>
     <string name="no_playlists">No playlists</string>
     <string name="no_albums">No albums</string>
     <string name="no_songs">No songs</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">No genres</string>
     <string name="empty">Empty</string>
     <string name="song">Song</string>
-    <string name="pref_summary_album_art_on_lockscreen">Uses the current songs album cover as lockscreen wallpaper.</string>
-    <string name="pref_summary_blurred_album_art">Blurs the album cover on the lockscreen. Can cause problems with third party apps and widgets.</string>
+    <string name="pref_summary_show_album_art">Uses the current songs album cover as lockscreen wallpaper.</string>
+    <string name="pref_summary_blur_album_art">Blurs the album cover on the lockscreen. Can cause problems with third party apps and widgets.</string>
     <string name="pref_summary_classic_notification">Use the classic notification design.</string>
     <string name="pref_summary_colored_notification">"Colours the notification in the album cover\u2019s vibrant colour."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colours the app shortcuts in the primary colour.</string>
+    <string name="pref_summary_colored_shortcuts">Colours the app shortcuts in the primary colour.</string>
     <string name="pref_summary_audio_ducking">Notifications, navigation etc.</string>
-    <string name="pref_summary_remember_last_tab">Go to the last opened tab on launch</string>
+    <string name="pref_summary_remember_tab">Go to the last opened tab on launch</string>
     <string name="last_added">Last added</string>
     <string name="my_top_tracks">My top tracks</string>
     <string name="action_sleep_timer">Sleep timer</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">For helping me with the design.</string>
     <string name="website">Website</string>
     <string name="up_next">Up next</string>
-    <string name="pref_title_now_playing_screen_appearance">Appearance</string>
+    <string name="pref_title_now_playing_appearance">Appearance</string>
     <string name="login">Login</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
@@ -128,7 +128,7 @@
     <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
     <string name="playing_notification_name">Playing notification</string>
     <string name="eugene_cheung_summary">For his contributions to the source code.</string>
-    <string name="library_categories">Library categories</string>
-    <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
+    <string name="pref_title_categories">Library categories</string>
+    <string name="pref_summary_categories">Configure visibility and order of library categories.</string>
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index bd4905d5..ff039bc6 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -57,18 +57,18 @@
     <string name="dark_theme_name">Oscuro</string>
     <string name="pref_header_colors">Colores</string>
     <string name="pref_header_now_playing_screen">Reproducción actual</string>
-    <string name="pref_title_general_theme">Tema general</string>
+    <string name="pref_title_theme">Tema general</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Biblioteca</string>
-    <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
+    <string name="pref_header_lock_screen">Pantalla de bloqueo</string>
     <string name="pref_header_notification">Notificación</string>
-    <string name="pref_title_app_shortcuts">Atajos coloreados de la aplicación</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
-    <string name="pref_title_blurred_album_art">Desenfocar carátula de álbum</string>
+    <string name="pref_title_colored_shortcuts">Atajos coloreados de la aplicación</string>
+    <string name="pref_title_show_album_art">Mostrar carátula del álbum</string>
+    <string name="pref_title_blur_album_art">Desenfocar carátula de álbum</string>
     <string name="pref_title_colored_notification">Notificación coloreada</string>
     <string name="pref_title_classic_notification">Diseño clásico de la notificación</string>
     <string name="pref_title_audio_ducking">Reducir volumen en la pérdida del enfoque</string>
-    <string name="pref_title_remember_last_tab">Recordar la última pestaña</string>
+    <string name="pref_title_remember_tab">Recordar la última pestaña</string>
     <string name="pref_title_remember_shuffle">Recordar aleatorio</string>
     <string name="delete_action">Borrar</string>
     <string name="remove_action">Eliminar</string>
@@ -76,10 +76,10 @@
     <string name="create_action">Crear</string>
     <string name="reset_action">Reiniciar</string>
     <string name="x_selected">%1$d seleccionado</string>
-    <string name="primary_color">Color primario</string>
-    <string name="accent_color">Color secundario</string>
-    <string name="primary_color_desc">El color principal, índigo por defecto</string>
-    <string name="accent_color_desc">El color de énfasis por defecto es rosa.</string>
+    <string name="pref_title_primary_color">Color primario</string>
+    <string name="pref_title_accent_color">Color secundario</string>
+    <string name="pref_summary_primary_color">El color principal, índigo por defecto</string>
+    <string name="pref_summary_accent_color">El color de énfasis por defecto es rosa.</string>
     <string name="no_playlists">No hay listas de reproducción</string>
     <string name="no_albums">No hay álbumes</string>
     <string name="no_songs">No hay canciones</string>
@@ -87,13 +87,13 @@
     <string name="no_genres">No hay géneros</string>
     <string name="empty">Vacío</string>
     <string name="song">Canción</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utiliza la carátula del álbum que se reproduce como fondo de pantalla de bloqueo</string>
-    <string name="pref_summary_blurred_album_art">Desenfoca la carátula del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones de terceros y widgets.</string>
+    <string name="pref_summary_show_album_art">Utiliza la carátula del álbum que se reproduce como fondo de pantalla de bloqueo</string>
+    <string name="pref_summary_blur_album_art">Desenfoca la carátula del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones de terceros y widgets.</string>
     <string name="pref_summary_classic_notification">Utilizar el diseño clásico de notificación.</string>
     <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n con el color vibrante de la car\u00e1tula del \u00e1lbum."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos con el color principal</string>
+    <string name="pref_summary_colored_shortcuts">Colorea los accesos directos con el color principal</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación etc.</string>
-    <string name="pref_summary_remember_last_tab">Ir a la última pestaña abierta en el lanzamiento</string>
+    <string name="pref_summary_remember_tab">Ir a la última pestaña abierta en el lanzamiento</string>
     <string name="pref_summary_remember_shuffle">Modo aleatorio estará activado cuando se seleccione una nueva lista de canciones</string>
     <string name="last_added">Último agregado</string>
     <string name="my_top_tracks">Canciones más reproducidas</string>
@@ -123,7 +123,7 @@
     <string name="aleksandar_tesic_summary">Por ayudarme con el diseño.</string>
     <string name="website">Sitio web</string>
     <string name="up_next">A continuación</string>
-    <string name="pref_title_now_playing_screen_appearance">Apariencia</string>
+    <string name="pref_title_now_playing_appearance">Apariencia</string>
     <string name="login">Registrarse</string>
     <string name="username">Nombre de usuario</string>
     <string name="password">Contraseña</string>
@@ -132,8 +132,8 @@
     <string name="playing_notification_name">Notificación de reproducción</string>
     <string name="eugene_cheung_summary">Por sus contribuciones al código fuente</string>
     <string name="adrian_summary">Para crear el diseño de la página del álbum.</string>
-    <string name="library_categories">Categorías de la biblioteca</string>
-    <string name="pref_summary_library_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
+    <string name="pref_title_categories">Categorías de la biblioteca</string>
+    <string name="pref_summary_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Debes seleccionar al menos una categoría.</string>
     <string name="action_sort_order">Orden de clasificación</string>
     <string name="sort_order_ascending">Ascendente</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 257e06a6..29cdbbab 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Oscuro</string>
     <string name="pref_header_colors">Colores</string>
     <string name="pref_header_now_playing_screen">Reproduciendo ahora</string>
-    <string name="pref_title_general_theme">Tema general</string>
+    <string name="pref_title_theme">Tema general</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Biblioteca</string>
-    <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
+    <string name="pref_header_lock_screen">Pantalla de bloqueo</string>
     <string name="pref_header_notification">Notificación</string>
-    <string name="pref_title_app_shortcuts">Accesos directos coloreados</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
-    <string name="pref_title_blurred_album_art">Desenfocar imagen de álbum</string>
+    <string name="pref_title_colored_shortcuts">Accesos directos coloreados</string>
+    <string name="pref_title_show_album_art">Mostrar carátula del álbum</string>
+    <string name="pref_title_blur_album_art">Desenfocar imagen de álbum</string>
     <string name="pref_title_colored_notification">Notificación coloreada</string>
     <string name="pref_title_classic_notification">Diseño de notificación clásico</string>
     <string name="pref_title_audio_ducking">Reducir volumen al recibir notificaciones</string>
-    <string name="pref_title_remember_last_tab">Recordar la última pestaña</string>
+    <string name="pref_title_remember_tab">Recordar la última pestaña</string>
     <string name="delete_action">Eliminar</string>
     <string name="remove_action">Eliminar</string>
     <string name="rename_action">Renombrar</string>
     <string name="create_action">Crear</string>
     <string name="reset_action">Reiniciar</string>
     <string name="x_selected">%1$d seleccionado(s)</string>
-    <string name="primary_color">Color principal</string>
-    <string name="accent_color">Color de énfasis</string>
-    <string name="primary_color_desc">El color principal, índigo por defecto.</string>
-    <string name="accent_color_desc">El color de énfasis, rosa por defecto.</string>
+    <string name="pref_title_primary_color">Color principal</string>
+    <string name="pref_title_accent_color">Color de énfasis</string>
+    <string name="pref_summary_primary_color">El color principal, índigo por defecto.</string>
+    <string name="pref_summary_accent_color">El color de énfasis, rosa por defecto.</string>
     <string name="no_playlists">No hay listas de reproducción</string>
     <string name="no_albums">No hay álbumes</string>
     <string name="no_songs">No hay canciones</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Sin géneros</string>
     <string name="empty">Vacío</string>
     <string name="song">Canción</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utiliza la carátula del álbum que se reproduce como fondo de pantalla de bloqueo.</string>
-    <string name="pref_summary_blurred_album_art">Desenfoca la carátula del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones de terceros y widgets.</string>
+    <string name="pref_summary_show_album_art">Utiliza la carátula del álbum que se reproduce como fondo de pantalla de bloqueo.</string>
+    <string name="pref_summary_blur_album_art">Desenfoca la carátula del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones de terceros y widgets.</string>
     <string name="pref_summary_classic_notification">Usar el diseño de notificación clásico.</string>
     <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n con el color vibrante de la car\u00e1tula del \u00e1lbum."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos con el color principal.</string>
+    <string name="pref_summary_colored_shortcuts">Colorea los accesos directos con el color principal.</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación, etc.</string>
-    <string name="pref_summary_remember_last_tab">Ir a la última pestaña abierta al iniciar</string>
+    <string name="pref_summary_remember_tab">Ir a la última pestaña abierta al iniciar</string>
     <string name="last_added">Agregadas recientemente</string>
     <string name="my_top_tracks">Más reproducidas</string>
     <string name="action_sleep_timer">Temporizador de apagado</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">Por ayudarme con el diseño.</string>
     <string name="website">Sitio web</string>
     <string name="up_next">En seguida</string>
-    <string name="pref_title_now_playing_screen_appearance">Apariencia</string>
+    <string name="pref_title_now_playing_appearance">Apariencia</string>
     <string name="login">Iniciar sesión</string>
     <string name="username">Nombre de usuario</string>
     <string name="password">Contraseña</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Notificación de reproducción</string>
     <string name="eugene_cheung_summary">Por sus contribuciones al código fuente.</string>
     <string name="adrian_summary">Por crear el diseño para la ventana del álbum.</string>
-    <string name="library_categories">Categorías de la biblioteca</string>
-    <string name="pref_summary_library_categories">Configurar la vista y orden de las categorías de la biblioteca.</string>
+    <string name="pref_title_categories">Categorías de la biblioteca</string>
+    <string name="pref_summary_categories">Configurar la vista y orden de las categorías de la biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Tienes que seleccionar al menos una categoría.</string>
     <string name="action_sort_order">Ordenar por</string>
     <string name="sort_order_ascending">Ascendente</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 9e66be58..1c8cc5a0 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -57,18 +57,18 @@
     <string name="dark_theme_name">Tumma</string>
     <string name="pref_header_colors">Värit</string>
     <string name="pref_header_now_playing_screen">Toistetaan parhaillaan</string>
-    <string name="pref_title_general_theme">Yleinen teema</string>
+    <string name="pref_title_theme">Yleinen teema</string>
     <string name="pref_header_audio">Ääni</string>
     <string name="pref_header_library">Kirjasto</string>
-    <string name="pref_header_lockscreen">Lukitusnäyttö</string>
+    <string name="pref_header_lock_screen">Lukitusnäyttö</string>
     <string name="pref_header_notification">Ilmoitukset</string>
-    <string name="pref_title_app_shortcuts">Värilliset sovelluksen pikavalinnat</string>
-    <string name="pref_title_album_art_on_lockscreen">Näytä albumin kansi</string>
-    <string name="pref_title_blurred_album_art">Sumenna albumin kansi</string>
+    <string name="pref_title_colored_shortcuts">Värilliset sovelluksen pikavalinnat</string>
+    <string name="pref_title_show_album_art">Näytä albumin kansi</string>
+    <string name="pref_title_blur_album_art">Sumenna albumin kansi</string>
     <string name="pref_title_colored_notification">Värillinen ilmoitus</string>
     <string name="pref_title_classic_notification">Klassinen ilmoituksen ulkonäkö</string>
     <string name="pref_title_audio_ducking">Hiljennä ääntä, kun kohdistus menetetään</string>
-    <string name="pref_title_remember_last_tab">Muista viimeisin välilehti</string>
+    <string name="pref_title_remember_tab">Muista viimeisin välilehti</string>
     <string name="pref_title_remember_shuffle">Muista sekoitus</string>
     <string name="delete_action">Poista</string>
     <string name="remove_action">Poista</string>
@@ -76,10 +76,10 @@
     <string name="create_action">Luo</string>
     <string name="reset_action">Nollaa</string>
     <string name="x_selected">%1$d valittu</string>
-    <string name="primary_color">Ensisijainen väri</string>
-    <string name="accent_color">Aksenttiväri</string>
-    <string name="primary_color_desc">Ensisijainen teemaväri, oletuksena indigo.</string>
-    <string name="accent_color_desc">Aksentti teemaväri, oletuksena pinkki.</string>
+    <string name="pref_title_primary_color">Ensisijainen väri</string>
+    <string name="pref_title_accent_color">Aksenttiväri</string>
+    <string name="pref_summary_primary_color">Ensisijainen teemaväri, oletuksena indigo.</string>
+    <string name="pref_summary_accent_color">Aksentti teemaväri, oletuksena pinkki.</string>
     <string name="no_playlists">Ei soittolistoja</string>
     <string name="no_albums">Ei albumeja</string>
     <string name="no_songs">Ei kappaleita</string>
@@ -87,13 +87,13 @@
     <string name="no_genres">Ei tyylilajeja</string>
     <string name="empty">Tyhjä</string>
     <string name="song">Kappale</string>
-    <string name="pref_summary_album_art_on_lockscreen">Käyttää tämänhetkisen kappaleen albumin kantta lukitusnäytön taustakuvana.</string>
-    <string name="pref_summary_blurred_album_art">Sumentaa albumin kannen lukitusnäytöllä. Saattaa aiheuttaa ongelmia kolmannen osapuolen sovellusten ja widgettien kanssa.</string>
+    <string name="pref_summary_show_album_art">Käyttää tämänhetkisen kappaleen albumin kantta lukitusnäytön taustakuvana.</string>
+    <string name="pref_summary_blur_album_art">Sumentaa albumin kannen lukitusnäytöllä. Saattaa aiheuttaa ongelmia kolmannen osapuolen sovellusten ja widgettien kanssa.</string>
     <string name="pref_summary_classic_notification">Käytä klassista ilmoituksen ulkonäköä.</string>
     <string name="pref_summary_colored_notification">"V\u00e4ritt\u00e4\u00e4 ilmoituksen albumin eloisalla v\u00e4rill\u00e4."</string>
-    <string name="pref_summary_colored_app_shortcuts">Värittää sovelluksen pikavalinnat päävärillä.</string>
+    <string name="pref_summary_colored_shortcuts">Värittää sovelluksen pikavalinnat päävärillä.</string>
     <string name="pref_summary_audio_ducking">Ilmoitukset, liikkuminen jne.</string>
-    <string name="pref_summary_remember_last_tab">Palauttaa käynnistyessään viimeksi avoinna olleen välilehden.</string>
+    <string name="pref_summary_remember_tab">Palauttaa käynnistyessään viimeksi avoinna olleen välilehden.</string>
     <string name="pref_summary_remember_shuffle">Sekoitus-tila pysyy päällä, kun valitset uuden listan kappaleita</string>
     <string name="last_added">Viimeksi lisätyt</string>
     <string name="my_top_tracks">Eniten kuunnellut</string>
@@ -123,7 +123,7 @@
     <string name="aleksandar_tesic_summary">Sovelluksen ulkonäön kanssa auttamisesta.</string>
     <string name="website">Verkkosivu</string>
     <string name="up_next">Seuraavaksi</string>
-    <string name="pref_title_now_playing_screen_appearance">Ulkonäkö</string>
+    <string name="pref_title_now_playing_appearance">Ulkonäkö</string>
     <string name="login">Kirjaudu sisään</string>
     <string name="username">Käyttäjänimi</string>
     <string name="password">Salasana</string>
@@ -132,8 +132,8 @@
     <string name="playing_notification_name">Toistoilmoitus</string>
     <string name="eugene_cheung_summary">Työpanoksesta sovelluksen lähdekoodin parissa.</string>
     <string name="adrian_summary">Albumisivun ulkonäöstä.</string>
-    <string name="library_categories">Kirjaston välilehdet</string>
-    <string name="pref_summary_library_categories">Määrittele kirjaston välilehtien näkyvyyttä ja järjestystä.</string>
+    <string name="pref_title_categories">Kirjaston välilehdet</string>
+    <string name="pref_summary_categories">Määrittele kirjaston välilehtien näkyvyyttä ja järjestystä.</string>
     <string name="you_have_to_select_at_least_one_category">Sinun täytyy valita vähintään yksi kategoria.</string>
     <string name="action_sort_order">Lajittelu järjestys</string>
     <string name="sort_order_ascending">Nouseva</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 89254988..d15fb443 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Sombre</string>
     <string name="pref_header_colors">Couleurs</string>
     <string name="pref_header_now_playing_screen">Lecture en cours</string>
-    <string name="pref_title_general_theme">Thème général</string>
+    <string name="pref_title_theme">Thème général</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Bibliothèque</string>
-    <string name="pref_header_lockscreen">Écran de verrouillage</string>
+    <string name="pref_header_lock_screen">Écran de verrouillage</string>
     <string name="pref_header_notification">Notification</string>
-    <string name="pref_title_app_shortcuts">Raccourcis de l\'application colorés</string>
-    <string name="pref_title_album_art_on_lockscreen">Afficher la pochette d\'album</string>
-    <string name="pref_title_blurred_album_art">Flouter la pochette d\'album</string>
+    <string name="pref_title_colored_shortcuts">Raccourcis de l\'application colorés</string>
+    <string name="pref_title_show_album_art">Afficher la pochette d\'album</string>
+    <string name="pref_title_blur_album_art">Flouter la pochette d\'album</string>
     <string name="pref_title_colored_notification">Notification colorée</string>
     <string name="pref_title_classic_notification">Style de notification classique</string>
     <string name="pref_title_audio_ducking">Réduction du volume</string>
-    <string name="pref_title_remember_last_tab">Se souvenir de la dernière fenêtre</string>
+    <string name="pref_title_remember_tab">Se souvenir de la dernière fenêtre</string>
     <string name="delete_action">Supprimer</string>
     <string name="remove_action">Retirer</string>
     <string name="rename_action">Renommer</string>
     <string name="create_action">Créer</string>
     <string name="reset_action">Réinitialiser</string>
     <string name="x_selected">%1$d séléctionné(s)</string>
-    <string name="primary_color">Couleur principale</string>
-    <string name="accent_color">Couleur secondaire</string>
-    <string name="primary_color_desc">La couleur principale du thème (indigo par défaut).</string>
-    <string name="accent_color_desc">La couleur secondaire du thème (rose par défaut)</string>
+    <string name="pref_title_primary_color">Couleur principale</string>
+    <string name="pref_title_accent_color">Couleur secondaire</string>
+    <string name="pref_summary_primary_color">La couleur principale du thème (indigo par défaut).</string>
+    <string name="pref_summary_accent_color">La couleur secondaire du thème (rose par défaut)</string>
     <string name="no_playlists">Aucune playlist</string>
     <string name="no_albums">Aucun album</string>
     <string name="no_songs">Aucun titre</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Aucun genre</string>
     <string name="empty">Vide</string>
     <string name="song">Titre</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utiliser la pochette d\'album du titre en cours en tant que fond d\'écran de verrouillage.</string>
-    <string name="pref_summary_blurred_album_art">Floute la pochette d\'album sur l\'écran de verrouillage. Peut causer des problèmes avec des applications et des widgets tiers.</string>
+    <string name="pref_summary_show_album_art">Utiliser la pochette d\'album du titre en cours en tant que fond d\'écran de verrouillage.</string>
+    <string name="pref_summary_blur_album_art">Floute la pochette d\'album sur l\'écran de verrouillage. Peut causer des problèmes avec des applications et des widgets tiers.</string>
     <string name="pref_summary_classic_notification">Utiliser le style de notification classique.</string>
     <string name="pref_summary_colored_notification">"Colore la notification en fonction de la pochette de l'album."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colore les raccourcis de l\'application selon la couleur primaire.</string>
+    <string name="pref_summary_colored_shortcuts">Colore les raccourcis de l\'application selon la couleur primaire.</string>
     <string name="pref_summary_audio_ducking">Réduire le volume pour les notifications et autre sons système.</string>
-    <string name="pref_summary_remember_last_tab">Aller à la dernière catégorie ouverte lors du lancement.</string>
+    <string name="pref_summary_remember_tab">Aller à la dernière catégorie ouverte lors du lancement.</string>
     <string name="last_added">Derniers ajouts</string>
     <string name="my_top_tracks">Mes meilleurs titres</string>
     <string name="action_sleep_timer">Minuteur sommeil</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">Pour m\'avoir aidé à la conception.</string>
     <string name="website">Site internet</string>
     <string name="up_next">Suivant</string>
-    <string name="pref_title_now_playing_screen_appearance">Apparence</string>
+    <string name="pref_title_now_playing_appearance">Apparence</string>
     <string name="login">Connexion</string>
     <string name="username">Nom d\'utilisateur</string>
     <string name="password">Mot de passe</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Notification de lecture</string>
     <string name="eugene_cheung_summary">Pour ses contributions au code source.</string>
     <string name="adrian_summary">Pour créer le design de la page d\'album.</string>
-    <string name="library_categories">Catégories</string>
-    <string name="pref_summary_library_categories">Configurer la visibilité et l\'ordre des catégories.</string>
+    <string name="pref_title_categories">Catégories</string>
+    <string name="pref_summary_categories">Configurer la visibilité et l\'ordre des catégories.</string>
     <string name="you_have_to_select_at_least_one_category">Vous devez sélectionner au moins une catégorie.</string>
     <string name="action_sort_order">Ordre de tri</string>
     <string name="sort_order_ascending">Ascendant</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index f2a4b86d..7f98f60a 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">כהה</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_title_theme">ערכת נושא כללית</string>
     <string name="pref_header_audio">שמע</string>
     <string name="pref_header_library">ספרייה</string>
-    <string name="pref_header_lockscreen">מסך נעילה</string>
+    <string name="pref_header_lock_screen">מסך נעילה</string>
     <string name="pref_header_notification">התראות</string>
-    <string name="pref_title_app_shortcuts">קיצורי אפליקציה צבעוניים</string>
-    <string name="pref_title_album_art_on_lockscreen">הצג עטיפת אלבום</string>
-    <string name="pref_title_blurred_album_art">טשטוש עטיפת האלבום</string>
+    <string name="pref_title_colored_shortcuts">קיצורי אפליקציה צבעוניים</string>
+    <string name="pref_title_show_album_art">הצג עטיפת אלבום</string>
+    <string name="pref_title_blur_album_art">טשטוש עטיפת האלבום</string>
     <string name="pref_title_colored_notification">התראה צבעונית</string>
     <string name="pref_title_classic_notification">עיצוב התראה קלאיסי</string>
     <string name="pref_title_audio_ducking">הפחת את עוצמת הקול באובדן מיקוד</string>
-    <string name="pref_title_remember_last_tab">זכור את הכרטיסיה האחרונה</string>
+    <string name="pref_title_remember_tab">זכור את הכרטיסיה האחרונה</string>
     <string name="delete_action">מחיקה</string>
     <string name="remove_action">הסרה</string>
     <string name="rename_action">שינוי שם</string>
     <string name="create_action">יצירה</string>
     <string name="reset_action">אפס</string>
     <string name="x_selected">%1$d נבחר</string>
-    <string name="primary_color">צבע ראשי</string>
-    <string name="accent_color">צבע הדגשה</string>
-    <string name="primary_color_desc">צבע הנושא העיקרי, ברירת המחדל הוא אינדיגו.</string>
-    <string name="accent_color_desc">צבע ההדגשה של ערכת הנושא, ברירת המחדל הוא ורוד.</string>
+    <string name="pref_title_primary_color">צבע ראשי</string>
+    <string name="pref_title_accent_color">צבע הדגשה</string>
+    <string name="pref_summary_primary_color">צבע הנושא העיקרי, ברירת המחדל הוא אינדיגו.</string>
+    <string name="pref_summary_accent_color">צבע ההדגשה של ערכת הנושא, ברירת המחדל הוא ורוד.</string>
     <string name="no_playlists">אין רשימות השמעה</string>
     <string name="no_albums">אין אלבומים</string>
     <string name="no_songs">אין שירים</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">אין סגנונות</string>
     <string name="empty">ריק</string>
     <string name="song">שיר</string>
-    <string name="pref_summary_album_art_on_lockscreen">השתמש בתמונת האלבום של השיר הנוכחי כרקע מסך הנעילה.</string>
-    <string name="pref_summary_blurred_album_art">מטשטש את תמונת האלבום במסך הנעילה. עלול לגרום לבעיות עם ווידג\'טים ואפליקציות צד שלישי.</string>
+    <string name="pref_summary_show_album_art">השתמש בתמונת האלבום של השיר הנוכחי כרקע מסך הנעילה.</string>
+    <string name="pref_summary_blur_album_art">מטשטש את תמונת האלבום במסך הנעילה. עלול לגרום לבעיות עם ווידג\'טים ואפליקציות צד שלישי.</string>
     <string name="pref_summary_classic_notification">השתמש בעיצוב התראות קלאסי.</string>
     <string name="pref_summary_colored_notification">"\u05e6\u05d5\u05d1\u05e2 \u05d0\u05ea \u05d4\u05ea\u05e8\u05d0\u05ea \u05d4\u05e0\u05d2\u05df \u05d1\u05e6\u05d1\u05e2 \u05d4\u05de\u05e8\u05db\u05d6\u05d9 \u05e9\u05dc \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05d0\u05dc\u05d1\u05d5\u05dd."</string>
-    <string name="pref_summary_colored_app_shortcuts">צובע את קיצורי האפליקציה בצבע הראשי.</string>
+    <string name="pref_summary_colored_shortcuts">צובע את קיצורי האפליקציה בצבע הראשי.</string>
     <string name="pref_summary_audio_ducking">התראות, ניווט וכו\'</string>
-    <string name="pref_summary_remember_last_tab">עבור לכרטיסייה האחרונה שהייתה פתוחה בהפעלה</string>
+    <string name="pref_summary_remember_tab">עבור לכרטיסייה האחרונה שהייתה פתוחה בהפעלה</string>
     <string name="last_added">נוספו לאחרונה</string>
     <string name="my_top_tracks">השירים המובילים שלי</string>
     <string name="action_sleep_timer">טיימר לשינה</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">על העזרה עם העיצוב.</string>
     <string name="website">אתר</string>
     <string name="up_next">הבא בתור</string>
-    <string name="pref_title_now_playing_screen_appearance">מראה</string>
+    <string name="pref_title_now_playing_appearance">מראה</string>
     <string name="login">התחבר</string>
     <string name="username">שם משתמש</string>
     <string name="password">סיסמא</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">התראת ניגון</string>
     <string name="eugene_cheung_summary">על התרומה שלו לקוד המקור.</string>
     <string name="adrian_summary">על יצירת העיצוב של מסך האלבום.</string>
-    <string name="library_categories">קטגוריות הספרייה</string>
-    <string name="pref_summary_library_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
+    <string name="pref_title_categories">קטגוריות הספרייה</string>
+    <string name="pref_summary_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
     <string name="you_have_to_select_at_least_one_category">עליך לבחור לפחות קטגוריה אחת.</string>
     <string name="action_sort_order">סדר המיון</string>
     <string name="sort_order_ascending">סדר עולה</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 55e2b787..62d85974 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Tamna</string>
     <string name="pref_header_colors">Boje</string>
     <string name="pref_header_now_playing_screen">Trenutna reprodukcija</string>
-    <string name="pref_title_general_theme">Općenita tema</string>
+    <string name="pref_title_theme">Općenita tema</string>
     <string name="pref_header_audio">Zvuk</string>
     <string name="pref_header_library">Biblioteka</string>
-    <string name="pref_header_lockscreen">Zaključani zaslon</string>
+    <string name="pref_header_lock_screen">Zaključani zaslon</string>
     <string name="pref_header_notification">Obavijest</string>
-    <string name="pref_title_app_shortcuts">Obojani prečaci</string>
-    <string name="pref_title_album_art_on_lockscreen">Prikaži omot albuma na zaklj. zaslonu</string>
-    <string name="pref_title_blurred_album_art">Zamagli omot albuma</string>
+    <string name="pref_title_colored_shortcuts">Obojani prečaci</string>
+    <string name="pref_title_show_album_art">Prikaži omot albuma na zaklj. zaslonu</string>
+    <string name="pref_title_blur_album_art">Zamagli omot albuma</string>
     <string name="pref_title_colored_notification">Obojene obavijesti</string>
     <string name="pref_title_classic_notification">Klasični dizajn obavijesti</string>
     <string name="pref_title_audio_ducking">Smanji glasn. prilikom drugih zvukova</string>
-    <string name="pref_title_remember_last_tab">Zapamti zadnju karticu</string>
+    <string name="pref_title_remember_tab">Zapamti zadnju karticu</string>
     <string name="delete_action">Izbriši</string>
     <string name="remove_action">Ukloni</string>
     <string name="rename_action">Preimenuj</string>
     <string name="create_action">Stvori</string>
     <string name="reset_action">Poništi</string>
     <string name="x_selected">%1$d odabrano</string>
-    <string name="primary_color">Primarna boja</string>
-    <string name="accent_color">Naglašena boja</string>
-    <string name="primary_color_desc">Primarna boja teme, zadana je indigo plava.</string>
-    <string name="accent_color_desc">Naglašena boja teme, zadana je roza.</string>
+    <string name="pref_title_primary_color">Primarna boja</string>
+    <string name="pref_title_accent_color">Naglašena boja</string>
+    <string name="pref_summary_primary_color">Primarna boja teme, zadana je indigo plava.</string>
+    <string name="pref_summary_accent_color">Naglašena boja teme, zadana je roza.</string>
     <string name="no_playlists">Nema popisa naslova</string>
     <string name="no_albums">Nema albuma</string>
     <string name="no_songs">Nema pjesama</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Nema žanrova</string>
     <string name="empty">Prazno</string>
     <string name="song">Pjesma</string>
-    <string name="pref_summary_album_art_on_lockscreen">Koristi omot albuma trenutne pjesme kao pozadinu zaključanog zaslona.</string>
-    <string name="pref_summary_blurred_album_art">Zamagljuje omot albuma na zaključanom zaslonu. Može izazvati probleme za ostale aplikacije i widgete.</string>
+    <string name="pref_summary_show_album_art">Koristi omot albuma trenutne pjesme kao pozadinu zaključanog zaslona.</string>
+    <string name="pref_summary_blur_album_art">Zamagljuje omot albuma na zaključanom zaslonu. Može izazvati probleme za ostale aplikacije i widgete.</string>
     <string name="pref_summary_classic_notification">Koristi klasični dizajn obavijesti.</string>
     <string name="pref_summary_colored_notification">"Obavijesti su obojene istaknutom bojom omota albuma."</string>
-    <string name="pref_summary_colored_app_shortcuts">Boja prečace aplikacije u primarnu boju.</string>
+    <string name="pref_summary_colored_shortcuts">Boja prečace aplikacije u primarnu boju.</string>
     <string name="pref_summary_audio_ducking">Obavijesti, navigacija itd.</string>
-    <string name="pref_summary_remember_last_tab">Pri pokretanju otvori zadnje otvorenu karticu</string>
+    <string name="pref_summary_remember_tab">Pri pokretanju otvori zadnje otvorenu karticu</string>
     <string name="last_added">Posljednje dodano</string>
     <string name="my_top_tracks">Najslušanije</string>
     <string name="action_sleep_timer">Tajmer za spavanje</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">Za pomoć u dizajnu.</string>
     <string name="website">Web-stranica</string>
     <string name="up_next">Sljedeće na redu</string>
-    <string name="pref_title_now_playing_screen_appearance">Izgled</string>
+    <string name="pref_title_now_playing_appearance">Izgled</string>
     <string name="login">Prijava</string>
     <string name="username">Korisničko ime</string>
     <string name="password">Lozinka</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Obavijest reprodukcije</string>
     <string name="eugene_cheung_summary">Za njegov doprinos izvornom kodu.</string>
     <string name="adrian_summary">Za stvaranje dizajna stranice albuma.</string>
-    <string name="library_categories">Kategorije biblioteke</string>
-    <string name="pref_summary_library_categories">Prilagodite vidljivost i poredak kategorija biblioteke</string>
+    <string name="pref_title_categories">Kategorije biblioteke</string>
+    <string name="pref_summary_categories">Prilagodite vidljivost i poredak kategorija biblioteke</string>
     <string name="you_have_to_select_at_least_one_category">Morate odabrati barem jednu kategoriju</string>
     <string name="action_sort_order">Način sortiranja</string>
     <string name="sort_order_ascending">Uzlazno</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 26ec2b36..d6a9edef 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Sötét</string>
     <string name="pref_header_colors">Színek</string>
     <string name="pref_header_now_playing_screen">Most játszott lista</string>
-    <string name="pref_title_general_theme">Téma</string>
+    <string name="pref_title_theme">Téma</string>
     <string name="pref_header_audio">Hang</string>
     <string name="pref_header_library">Könyvtár</string>
-    <string name="pref_header_lockscreen">Zárképernyő</string>
+    <string name="pref_header_lock_screen">Zárképernyő</string>
     <string name="pref_header_notification">Értesítés</string>
-    <string name="pref_title_app_shortcuts">Színezett alkalmazás hivatkozások</string>
-    <string name="pref_title_album_art_on_lockscreen">Albumborító megjelenítése</string>
-    <string name="pref_title_blurred_album_art">Albumborító elhomályosítása</string>
+    <string name="pref_title_colored_shortcuts">Színezett alkalmazás hivatkozások</string>
+    <string name="pref_title_show_album_art">Albumborító megjelenítése</string>
+    <string name="pref_title_blur_album_art">Albumborító elhomályosítása</string>
     <string name="pref_title_colored_notification">Színezett értesítés</string>
     <string name="pref_title_classic_notification">Klasszikus értesítési dízájn</string>
     <string name="pref_title_audio_ducking">Hangerő csökkentése</string>
-    <string name="pref_title_remember_last_tab">Emlékezz az utolsó fülre</string>
+    <string name="pref_title_remember_tab">Emlékezz az utolsó fülre</string>
     <string name="delete_action">Törlés</string>
     <string name="remove_action">Eltávolítás</string>
     <string name="rename_action">Átnevezés</string>
     <string name="create_action">Létrehozás</string>
     <string name="reset_action">Visszaállítás</string>
     <string name="x_selected">%1$d kiválasztva</string>
-    <string name="primary_color">Elsődleges szín</string>
-    <string name="accent_color">Másodlagos szín</string>
-    <string name="primary_color_desc">Az elsődleges szín, alapértelmezetten indigó.</string>
-    <string name="accent_color_desc">A másodlagos szín, alapértelmezetten rózsaszín.</string>
+    <string name="pref_title_primary_color">Elsődleges szín</string>
+    <string name="pref_title_accent_color">Másodlagos szín</string>
+    <string name="pref_summary_primary_color">Az elsődleges szín, alapértelmezetten indigó.</string>
+    <string name="pref_summary_accent_color">A másodlagos szín, alapértelmezetten rózsaszín.</string>
     <string name="no_playlists">Nincsenek lejátszási listák</string>
     <string name="no_albums">Nincsenek albumok</string>
     <string name="no_songs">Nincsenek dalok</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Nincsenek műfajok</string>
     <string name="empty">Üres</string>
     <string name="song">Dal</string>
-    <string name="pref_summary_album_art_on_lockscreen">Jelenlegi dal albumborítójának használata a zárképernyő háttérképeként.</string>
-    <string name="pref_summary_blurred_album_art">Albumborító elhomályosítása a zárképernyőn. Ez problémákat okozhat a harmadik féltől származó alkalmazásoknál és widgeteknél.</string>
+    <string name="pref_summary_show_album_art">Jelenlegi dal albumborítójának használata a zárképernyő háttérképeként.</string>
+    <string name="pref_summary_blur_album_art">Albumborító elhomályosítása a zárképernyőn. Ez problémákat okozhat a harmadik féltől származó alkalmazásoknál és widgeteknél.</string>
     <string name="pref_summary_classic_notification">Használja a klasszikus értesítési dizájn.</string>
     <string name="pref_summary_colored_notification">"\u00c9rtes\u00edt\u00e9sek sz\u00ednez\u00e9se az albumbor\u00edt\u00f3 sz\u00edn\u00e9vel."</string>
-    <string name="pref_summary_colored_app_shortcuts">Az alkalmazás hivatkozások színezése az elsődleges szín szerint.</string>
+    <string name="pref_summary_colored_shortcuts">Az alkalmazás hivatkozások színezése az elsődleges szín szerint.</string>
     <string name="pref_summary_audio_ducking">Beérkező értesítéskor a lejátszás hangereje lecsökken, majd az értesítés végén visszaáll az eredeti hangerőre.</string>
-    <string name="pref_summary_remember_last_tab">Menjen az utolsó megnyitott fülre az indításkor</string>
+    <string name="pref_summary_remember_tab">Menjen az utolsó megnyitott fülre az indításkor</string>
     <string name="last_added">Legfrissebb dalok</string>
     <string name="my_top_tracks">Toplista</string>
     <string name="action_sleep_timer">Elalvás időzítő</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">A dizájnban való segítségért.</string>
     <string name="website">Weboldal</string>
     <string name="up_next">Lejátszási sor</string>
-    <string name="pref_title_now_playing_screen_appearance">Megjelenés</string>
+    <string name="pref_title_now_playing_appearance">Megjelenés</string>
     <string name="login">Bejelentkezés</string>
     <string name="username">Felhasználónév</string>
     <string name="password">Jelszó</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Értesítés lejátszása</string>
     <string name="eugene_cheung_summary">A forráskódhoz való hozzájárulásáért.</string>
     <string name="adrian_summary">Az album oldalának kialakításához.</string>
-    <string name="library_categories">Könyvtár kategóriák</string>
-    <string name="pref_summary_library_categories">Könyvtár kategóriák láthatóságának és sorrendjének beállítása.</string>
+    <string name="pref_title_categories">Könyvtár kategóriák</string>
+    <string name="pref_summary_categories">Könyvtár kategóriák láthatóságának és sorrendjének beállítása.</string>
     <string name="you_have_to_select_at_least_one_category">Legalább egy kategóriát ki kell választania.</string>
     <string name="action_sort_order">Sorrend</string>
     <string name="sort_order_ascending">Növekvő</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 06aa4588..a91f704f 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -57,18 +57,18 @@
     <string name="dark_theme_name">Gelap</string>
     <string name="pref_header_colors">Warna</string>
     <string name="pref_header_now_playing_screen">Sedang diputar</string>
-    <string name="pref_title_general_theme">Tema umum</string>
+    <string name="pref_title_theme">Tema umum</string>
     <string name="pref_header_audio">Suara</string>
     <string name="pref_header_library">Pustaka</string>
-    <string name="pref_header_lockscreen">Layar kunci</string>
+    <string name="pref_header_lock_screen">Layar kunci</string>
     <string name="pref_header_notification">Notifikasi</string>
-    <string name="pref_title_app_shortcuts">Pintasan Berwarna</string>
-    <string name="pref_title_album_art_on_lockscreen">Tampilkan sampul album</string>
-    <string name="pref_title_blurred_album_art">Buramkan sampul album</string>
+    <string name="pref_title_colored_shortcuts">Pintasan Berwarna</string>
+    <string name="pref_title_show_album_art">Tampilkan sampul album</string>
+    <string name="pref_title_blur_album_art">Buramkan sampul album</string>
     <string name="pref_title_colored_notification">Notifikasi berwarna</string>
     <string name="pref_title_classic_notification">Desain notifikasi klasik</string>
     <string name="pref_title_audio_ducking">Kurangi suara saat ada pemberitahuan</string>
-    <string name="pref_title_remember_last_tab">Ingat tab terakhir</string>
+    <string name="pref_title_remember_tab">Ingat tab terakhir</string>
     <string name="pref_title_remember_shuffle">Ingat putar acak</string>
     <string name="delete_action">Hapus</string>
     <string name="remove_action">Hapus</string>
@@ -76,10 +76,10 @@
     <string name="create_action">Buat</string>
     <string name="reset_action">Muat ulang</string>
     <string name="x_selected">%1$d terpilih</string>
-    <string name="primary_color">Warna utama</string>
-    <string name="accent_color">Warna aksen</string>
-    <string name="primary_color_desc">Warna tema utama, distandarkan ke biru tua.</string>
-    <string name="accent_color_desc">Warna aksen tema, distandarkan ke merah muda.</string>
+    <string name="pref_title_primary_color">Warna utama</string>
+    <string name="pref_title_accent_color">Warna aksen</string>
+    <string name="pref_summary_primary_color">Warna tema utama, distandarkan ke biru tua.</string>
+    <string name="pref_summary_accent_color">Warna aksen tema, distandarkan ke merah muda.</string>
     <string name="no_playlists">Tidak ada daftar putar</string>
     <string name="no_albums">Tidak ada album</string>
     <string name="no_songs">Tidak ada lagu</string>
@@ -87,13 +87,13 @@
     <string name="no_genres">Tidak ada aliran</string>
     <string name="empty">Kosong</string>
     <string name="song">Lagu</string>
-    <string name="pref_summary_album_art_on_lockscreen">Gunakan sambul album lagu yang sedang diputar sebagai wallpaper layar kunci</string>
-    <string name="pref_summary_blurred_album_art">Buramkan sampul album di layar kunci. Dapat menyebabkan masalah dengan aplikasi pihak ke tiga dan widget</string>
+    <string name="pref_summary_show_album_art">Gunakan sambul album lagu yang sedang diputar sebagai wallpaper layar kunci</string>
+    <string name="pref_summary_blur_album_art">Buramkan sampul album di layar kunci. Dapat menyebabkan masalah dengan aplikasi pihak ke tiga dan widget</string>
     <string name="pref_summary_classic_notification">Gunakan desain notifikasi klasik.</string>
     <string name="pref_summary_colored_notification">"Mewarnai notifikasi putar dengan warna yang cerah dari album."</string>
-    <string name="pref_summary_colored_app_shortcuts">Mewarnai pintasan-pintasan dengan warna utama.</string>
+    <string name="pref_summary_colored_shortcuts">Mewarnai pintasan-pintasan dengan warna utama.</string>
     <string name="pref_summary_audio_ducking">Pemberitahuan, navigasi dll.</string>
-    <string name="pref_summary_remember_last_tab">Pergi ke tab yang terakhir saat aplikasi dibuka</string>
+    <string name="pref_summary_remember_tab">Pergi ke tab yang terakhir saat aplikasi dibuka</string>
     <string name="pref_summary_remember_shuffle">Mode putar acak akan tetap aktif saat memilih daftar lagu baru</string>
     <string name="last_added">Terakhir ditambahkan</string>
     <string name="my_top_tracks">Sering Diputar</string>
@@ -123,7 +123,7 @@
     <string name="aleksandar_tesic_summary">"Untuk yang membantu saya dengan desainnya. "</string>
     <string name="website">Situs</string>
     <string name="up_next">Berikutnya</string>
-    <string name="pref_title_now_playing_screen_appearance">Tampilan</string>
+    <string name="pref_title_now_playing_appearance">Tampilan</string>
     <string name="login">Masuk</string>
     <string name="username">Nama pengguna</string>
     <string name="password">Kata sandi</string>
@@ -132,8 +132,8 @@
     <string name="playing_notification_name">Notifikasi bermain</string>
     <string name="eugene_cheung_summary">Untuk kontribusinya terhadap kode sumber.</string>
     <string name="adrian_summary">Untuk membuat halaman desain album.</string>
-    <string name="library_categories">Kategori perpustakaan</string>
-    <string name="pref_summary_library_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
+    <string name="pref_title_categories">Kategori perpustakaan</string>
+    <string name="pref_summary_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
     <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori</string>
     <string name="action_sort_order">Tata urutan</string>
     <string name="sort_order_ascending">Naik</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 06aa4588..a91f704f 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -57,18 +57,18 @@
     <string name="dark_theme_name">Gelap</string>
     <string name="pref_header_colors">Warna</string>
     <string name="pref_header_now_playing_screen">Sedang diputar</string>
-    <string name="pref_title_general_theme">Tema umum</string>
+    <string name="pref_title_theme">Tema umum</string>
     <string name="pref_header_audio">Suara</string>
     <string name="pref_header_library">Pustaka</string>
-    <string name="pref_header_lockscreen">Layar kunci</string>
+    <string name="pref_header_lock_screen">Layar kunci</string>
     <string name="pref_header_notification">Notifikasi</string>
-    <string name="pref_title_app_shortcuts">Pintasan Berwarna</string>
-    <string name="pref_title_album_art_on_lockscreen">Tampilkan sampul album</string>
-    <string name="pref_title_blurred_album_art">Buramkan sampul album</string>
+    <string name="pref_title_colored_shortcuts">Pintasan Berwarna</string>
+    <string name="pref_title_show_album_art">Tampilkan sampul album</string>
+    <string name="pref_title_blur_album_art">Buramkan sampul album</string>
     <string name="pref_title_colored_notification">Notifikasi berwarna</string>
     <string name="pref_title_classic_notification">Desain notifikasi klasik</string>
     <string name="pref_title_audio_ducking">Kurangi suara saat ada pemberitahuan</string>
-    <string name="pref_title_remember_last_tab">Ingat tab terakhir</string>
+    <string name="pref_title_remember_tab">Ingat tab terakhir</string>
     <string name="pref_title_remember_shuffle">Ingat putar acak</string>
     <string name="delete_action">Hapus</string>
     <string name="remove_action">Hapus</string>
@@ -76,10 +76,10 @@
     <string name="create_action">Buat</string>
     <string name="reset_action">Muat ulang</string>
     <string name="x_selected">%1$d terpilih</string>
-    <string name="primary_color">Warna utama</string>
-    <string name="accent_color">Warna aksen</string>
-    <string name="primary_color_desc">Warna tema utama, distandarkan ke biru tua.</string>
-    <string name="accent_color_desc">Warna aksen tema, distandarkan ke merah muda.</string>
+    <string name="pref_title_primary_color">Warna utama</string>
+    <string name="pref_title_accent_color">Warna aksen</string>
+    <string name="pref_summary_primary_color">Warna tema utama, distandarkan ke biru tua.</string>
+    <string name="pref_summary_accent_color">Warna aksen tema, distandarkan ke merah muda.</string>
     <string name="no_playlists">Tidak ada daftar putar</string>
     <string name="no_albums">Tidak ada album</string>
     <string name="no_songs">Tidak ada lagu</string>
@@ -87,13 +87,13 @@
     <string name="no_genres">Tidak ada aliran</string>
     <string name="empty">Kosong</string>
     <string name="song">Lagu</string>
-    <string name="pref_summary_album_art_on_lockscreen">Gunakan sambul album lagu yang sedang diputar sebagai wallpaper layar kunci</string>
-    <string name="pref_summary_blurred_album_art">Buramkan sampul album di layar kunci. Dapat menyebabkan masalah dengan aplikasi pihak ke tiga dan widget</string>
+    <string name="pref_summary_show_album_art">Gunakan sambul album lagu yang sedang diputar sebagai wallpaper layar kunci</string>
+    <string name="pref_summary_blur_album_art">Buramkan sampul album di layar kunci. Dapat menyebabkan masalah dengan aplikasi pihak ke tiga dan widget</string>
     <string name="pref_summary_classic_notification">Gunakan desain notifikasi klasik.</string>
     <string name="pref_summary_colored_notification">"Mewarnai notifikasi putar dengan warna yang cerah dari album."</string>
-    <string name="pref_summary_colored_app_shortcuts">Mewarnai pintasan-pintasan dengan warna utama.</string>
+    <string name="pref_summary_colored_shortcuts">Mewarnai pintasan-pintasan dengan warna utama.</string>
     <string name="pref_summary_audio_ducking">Pemberitahuan, navigasi dll.</string>
-    <string name="pref_summary_remember_last_tab">Pergi ke tab yang terakhir saat aplikasi dibuka</string>
+    <string name="pref_summary_remember_tab">Pergi ke tab yang terakhir saat aplikasi dibuka</string>
     <string name="pref_summary_remember_shuffle">Mode putar acak akan tetap aktif saat memilih daftar lagu baru</string>
     <string name="last_added">Terakhir ditambahkan</string>
     <string name="my_top_tracks">Sering Diputar</string>
@@ -123,7 +123,7 @@
     <string name="aleksandar_tesic_summary">"Untuk yang membantu saya dengan desainnya. "</string>
     <string name="website">Situs</string>
     <string name="up_next">Berikutnya</string>
-    <string name="pref_title_now_playing_screen_appearance">Tampilan</string>
+    <string name="pref_title_now_playing_appearance">Tampilan</string>
     <string name="login">Masuk</string>
     <string name="username">Nama pengguna</string>
     <string name="password">Kata sandi</string>
@@ -132,8 +132,8 @@
     <string name="playing_notification_name">Notifikasi bermain</string>
     <string name="eugene_cheung_summary">Untuk kontribusinya terhadap kode sumber.</string>
     <string name="adrian_summary">Untuk membuat halaman desain album.</string>
-    <string name="library_categories">Kategori perpustakaan</string>
-    <string name="pref_summary_library_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
+    <string name="pref_title_categories">Kategori perpustakaan</string>
+    <string name="pref_summary_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
     <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori</string>
     <string name="action_sort_order">Tata urutan</string>
     <string name="sort_order_ascending">Naik</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a507f083..52b5c75c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -57,18 +57,18 @@
     <string name="dark_theme_name">Scuro</string>
     <string name="pref_header_colors">Colori</string>
     <string name="pref_header_now_playing_screen">Schermata di riproduzione</string>
-    <string name="pref_title_general_theme">Tema generale</string>
+    <string name="pref_title_theme">Tema generale</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Libreria</string>
-    <string name="pref_header_lockscreen">Schermata di blocco</string>
+    <string name="pref_header_lock_screen">Schermata di blocco</string>
     <string name="pref_header_notification">Notifica</string>
-    <string name="pref_title_app_shortcuts">Scorciatoie app colorate</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostra copertina album nella schermata di blocco</string>
-    <string name="pref_title_blurred_album_art">Sfoca la copertina</string>
+    <string name="pref_title_colored_shortcuts">Scorciatoie app colorate</string>
+    <string name="pref_title_show_album_art">Mostra copertina album nella schermata di blocco</string>
+    <string name="pref_title_blur_album_art">Sfoca la copertina</string>
     <string name="pref_title_colored_notification">Notifica colorata</string>
     <string name="pref_title_classic_notification">Design di notifica classico</string>
     <string name="pref_title_audio_ducking">Riduci volume in caso di perdita di focus audio</string>
-    <string name="pref_title_remember_last_tab">Ricorda ultima scheda</string>
+    <string name="pref_title_remember_tab">Ricorda ultima scheda</string>
     <string name="pref_title_remember_shuffle">Ricorda casuale</string>
     <string name="delete_action">Elimina</string>
     <string name="remove_action">Rimuovi</string>
@@ -76,10 +76,10 @@
     <string name="create_action">Crea</string>
     <string name="reset_action">Reimposta</string>
     <string name="x_selected">%1$d selezionati</string>
-    <string name="primary_color">Colore principale</string>
-    <string name="accent_color">Colore secondario</string>
-    <string name="primary_color_desc">Colore principale, predefinito impostato su indaco.</string>
-    <string name="accent_color_desc">Colore secondario, predefinito impostato su rosa</string>
+    <string name="pref_title_primary_color">Colore principale</string>
+    <string name="pref_title_accent_color">Colore secondario</string>
+    <string name="pref_summary_primary_color">Colore principale, predefinito impostato su indaco.</string>
+    <string name="pref_summary_accent_color">Colore secondario, predefinito impostato su rosa</string>
     <string name="no_playlists">Nessuna playlist</string>
     <string name="no_albums">Nessun album</string>
     <string name="no_songs">Nessun brano</string>
@@ -87,13 +87,13 @@
     <string name="no_genres">Nessun genere</string>
     <string name="empty">Vuoto</string>
     <string name="song">Brano</string>
-    <string name="pref_summary_album_art_on_lockscreen">Usa la copertina dell\'album in riproduzione come sfondo della schermata di blocco.</string>
-    <string name="pref_summary_blurred_album_art">Applica una sfocatura sulla copertina nella schermata di blocco. Può causare problemi con app e widget di terze parti.</string>
+    <string name="pref_summary_show_album_art">Usa la copertina dell\'album in riproduzione come sfondo della schermata di blocco.</string>
+    <string name="pref_summary_blur_album_art">Applica una sfocatura sulla copertina nella schermata di blocco. Può causare problemi con app e widget di terze parti.</string>
     <string name="pref_summary_classic_notification">Usa il design di notifica classico.</string>
     <string name="pref_summary_colored_notification">"La notifica \u00e8 colorata secondo la gamma di colori della copertina."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colora le scorciatoie dell\'app con il colore principale.</string>
+    <string name="pref_summary_colored_shortcuts">Colora le scorciatoie dell\'app con il colore principale.</string>
     <string name="pref_summary_audio_ducking">Notifiche, navigazione ecc.</string>
-    <string name="pref_summary_remember_last_tab">All\'avvio vai all\'ultima scheda aperta</string>
+    <string name="pref_summary_remember_tab">All\'avvio vai all\'ultima scheda aperta</string>
     <string name="pref_summary_remember_shuffle">La modalità casuale rimarrà attiva quando si seleziona un nuovo elenco di brani</string>
     <string name="last_added">Aggiunti di recente</string>
     <string name="my_top_tracks">Brani preferiti</string>
@@ -123,7 +123,7 @@
     <string name="aleksandar_tesic_summary">Per avermi aiutato col design.</string>
     <string name="website">Sito web</string>
     <string name="up_next">A seguire</string>
-    <string name="pref_title_now_playing_screen_appearance">Aspetto</string>
+    <string name="pref_title_now_playing_appearance">Aspetto</string>
     <string name="login">Accesso</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
@@ -132,8 +132,8 @@
     <string name="playing_notification_name">Notifica di riproduzione</string>
     <string name="eugene_cheung_summary">Per il suo contributo al codice sorgente.</string>
     <string name="adrian_summary">Per creare la pagina dell\'album.</string>
-    <string name="library_categories">Categorie libreria</string>
-    <string name="pref_summary_library_categories">Configura visibilità e ordine delle categorie della libreria.</string>
+    <string name="pref_title_categories">Categorie libreria</string>
+    <string name="pref_summary_categories">Configura visibilità e ordine delle categorie della libreria.</string>
     <string name="you_have_to_select_at_least_one_category">Devi scegliere almeno una categoria.</string>
     <string name="action_sort_order">Ordine</string>
     <string name="sort_order_ascending">Ascendente</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f2a4b86d..7f98f60a 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">כהה</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_title_theme">ערכת נושא כללית</string>
     <string name="pref_header_audio">שמע</string>
     <string name="pref_header_library">ספרייה</string>
-    <string name="pref_header_lockscreen">מסך נעילה</string>
+    <string name="pref_header_lock_screen">מסך נעילה</string>
     <string name="pref_header_notification">התראות</string>
-    <string name="pref_title_app_shortcuts">קיצורי אפליקציה צבעוניים</string>
-    <string name="pref_title_album_art_on_lockscreen">הצג עטיפת אלבום</string>
-    <string name="pref_title_blurred_album_art">טשטוש עטיפת האלבום</string>
+    <string name="pref_title_colored_shortcuts">קיצורי אפליקציה צבעוניים</string>
+    <string name="pref_title_show_album_art">הצג עטיפת אלבום</string>
+    <string name="pref_title_blur_album_art">טשטוש עטיפת האלבום</string>
     <string name="pref_title_colored_notification">התראה צבעונית</string>
     <string name="pref_title_classic_notification">עיצוב התראה קלאיסי</string>
     <string name="pref_title_audio_ducking">הפחת את עוצמת הקול באובדן מיקוד</string>
-    <string name="pref_title_remember_last_tab">זכור את הכרטיסיה האחרונה</string>
+    <string name="pref_title_remember_tab">זכור את הכרטיסיה האחרונה</string>
     <string name="delete_action">מחיקה</string>
     <string name="remove_action">הסרה</string>
     <string name="rename_action">שינוי שם</string>
     <string name="create_action">יצירה</string>
     <string name="reset_action">אפס</string>
     <string name="x_selected">%1$d נבחר</string>
-    <string name="primary_color">צבע ראשי</string>
-    <string name="accent_color">צבע הדגשה</string>
-    <string name="primary_color_desc">צבע הנושא העיקרי, ברירת המחדל הוא אינדיגו.</string>
-    <string name="accent_color_desc">צבע ההדגשה של ערכת הנושא, ברירת המחדל הוא ורוד.</string>
+    <string name="pref_title_primary_color">צבע ראשי</string>
+    <string name="pref_title_accent_color">צבע הדגשה</string>
+    <string name="pref_summary_primary_color">צבע הנושא העיקרי, ברירת המחדל הוא אינדיגו.</string>
+    <string name="pref_summary_accent_color">צבע ההדגשה של ערכת הנושא, ברירת המחדל הוא ורוד.</string>
     <string name="no_playlists">אין רשימות השמעה</string>
     <string name="no_albums">אין אלבומים</string>
     <string name="no_songs">אין שירים</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">אין סגנונות</string>
     <string name="empty">ריק</string>
     <string name="song">שיר</string>
-    <string name="pref_summary_album_art_on_lockscreen">השתמש בתמונת האלבום של השיר הנוכחי כרקע מסך הנעילה.</string>
-    <string name="pref_summary_blurred_album_art">מטשטש את תמונת האלבום במסך הנעילה. עלול לגרום לבעיות עם ווידג\'טים ואפליקציות צד שלישי.</string>
+    <string name="pref_summary_show_album_art">השתמש בתמונת האלבום של השיר הנוכחי כרקע מסך הנעילה.</string>
+    <string name="pref_summary_blur_album_art">מטשטש את תמונת האלבום במסך הנעילה. עלול לגרום לבעיות עם ווידג\'טים ואפליקציות צד שלישי.</string>
     <string name="pref_summary_classic_notification">השתמש בעיצוב התראות קלאסי.</string>
     <string name="pref_summary_colored_notification">"\u05e6\u05d5\u05d1\u05e2 \u05d0\u05ea \u05d4\u05ea\u05e8\u05d0\u05ea \u05d4\u05e0\u05d2\u05df \u05d1\u05e6\u05d1\u05e2 \u05d4\u05de\u05e8\u05db\u05d6\u05d9 \u05e9\u05dc \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05d0\u05dc\u05d1\u05d5\u05dd."</string>
-    <string name="pref_summary_colored_app_shortcuts">צובע את קיצורי האפליקציה בצבע הראשי.</string>
+    <string name="pref_summary_colored_shortcuts">צובע את קיצורי האפליקציה בצבע הראשי.</string>
     <string name="pref_summary_audio_ducking">התראות, ניווט וכו\'</string>
-    <string name="pref_summary_remember_last_tab">עבור לכרטיסייה האחרונה שהייתה פתוחה בהפעלה</string>
+    <string name="pref_summary_remember_tab">עבור לכרטיסייה האחרונה שהייתה פתוחה בהפעלה</string>
     <string name="last_added">נוספו לאחרונה</string>
     <string name="my_top_tracks">השירים המובילים שלי</string>
     <string name="action_sleep_timer">טיימר לשינה</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">על העזרה עם העיצוב.</string>
     <string name="website">אתר</string>
     <string name="up_next">הבא בתור</string>
-    <string name="pref_title_now_playing_screen_appearance">מראה</string>
+    <string name="pref_title_now_playing_appearance">מראה</string>
     <string name="login">התחבר</string>
     <string name="username">שם משתמש</string>
     <string name="password">סיסמא</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">התראת ניגון</string>
     <string name="eugene_cheung_summary">על התרומה שלו לקוד המקור.</string>
     <string name="adrian_summary">על יצירת העיצוב של מסך האלבום.</string>
-    <string name="library_categories">קטגוריות הספרייה</string>
-    <string name="pref_summary_library_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
+    <string name="pref_title_categories">קטגוריות הספרייה</string>
+    <string name="pref_summary_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
     <string name="you_have_to_select_at_least_one_category">עליך לבחור לפחות קטגוריה אחת.</string>
     <string name="action_sort_order">סדר המיון</string>
     <string name="sort_order_ascending">סדר עולה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b1161de3..d3e869c8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">ダーク</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_title_theme">テーマカラー</string>
     <string name="pref_header_audio">オーディオ</string>
     <string name="pref_header_library">ライブラリ</string>
-    <string name="pref_header_lockscreen">ロック画面</string>
+    <string name="pref_header_lock_screen">ロック画面</string>
     <string name="pref_header_notification">通知</string>
-    <string name="pref_title_app_shortcuts">アプリのショートカットに色を付ける</string>
-    <string name="pref_title_album_art_on_lockscreen">アルバムアートを表示する</string>
-    <string name="pref_title_blurred_album_art">アルバムアートにぼかし効果をかける</string>
+    <string name="pref_title_colored_shortcuts">アプリのショートカットに色を付ける</string>
+    <string name="pref_title_show_album_art">アルバムアートを表示する</string>
+    <string name="pref_title_blur_album_art">アルバムアートにぼかし効果をかける</string>
     <string name="pref_title_colored_notification">通知に色を付ける</string>
     <string name="pref_title_classic_notification">古い通知デザイン</string>
     <string name="pref_title_audio_ducking">音声フォーカス喪失時に音量を下げる</string>
-    <string name="pref_title_remember_last_tab">最後のタブの記憶</string>
+    <string name="pref_title_remember_tab">最後のタブの記憶</string>
     <string name="delete_action">削除</string>
     <string name="remove_action">除去</string>
     <string name="rename_action">名前を変更</string>
     <string name="create_action">作成</string>
     <string name="reset_action">リセット</string>
     <string name="x_selected">%1$dつ選択中</string>
-    <string name="primary_color">メインカラー</string>
-    <string name="accent_color">アクセントカラー</string>
-    <string name="primary_color_desc">ツールバーなどの色を設定します。(デフォルトではインディゴ)</string>
-    <string name="accent_color_desc">コントロールキーやシークバーなどの色を設定します。(デフォルトではピンク)</string>
+    <string name="pref_title_primary_color">メインカラー</string>
+    <string name="pref_title_accent_color">アクセントカラー</string>
+    <string name="pref_summary_primary_color">ツールバーなどの色を設定します。(デフォルトではインディゴ)</string>
+    <string name="pref_summary_accent_color">コントロールキーやシークバーなどの色を設定します。(デフォルトではピンク)</string>
     <string name="no_playlists">プレイリストなし</string>
     <string name="no_albums">アルバムなし</string>
     <string name="no_songs">楽曲なし</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">ジャンルなし</string>
     <string name="empty">空</string>
     <string name="song">タイトル</string>
-    <string name="pref_summary_album_art_on_lockscreen">再生中の曲のアルバムアートをロック画面に表示します。</string>
-    <string name="pref_summary_blurred_album_art">ロック画面に表示するアルバムアートをぼかします。サードパーティのアプリやウィジェットで問題が発生する可能性があります。</string>
+    <string name="pref_summary_show_album_art">再生中の曲のアルバムアートをロック画面に表示します。</string>
+    <string name="pref_summary_blur_album_art">ロック画面に表示するアルバムアートをぼかします。サードパーティのアプリやウィジェットで問題が発生する可能性があります。</string>
     <string name="pref_summary_classic_notification">旧式の通知デザインを使用します。</string>
     <string name="pref_summary_colored_notification">"\u901a\u77e5\u306e\u8272\u3092\u30a2\u30eb\u30d0\u30e0\u30a2\u30fc\u30c8\u304b\u3089\u62bd\u51fa\u3057\u305f\u8272\u306b\u5909\u66f4\u3057\u307e\u3059\u3002"</string>
-    <string name="pref_summary_colored_app_shortcuts">アプリのショートカットの色をメインカラーに変更します。</string>
+    <string name="pref_summary_colored_shortcuts">アプリのショートカットの色をメインカラーに変更します。</string>
     <string name="pref_summary_audio_ducking">通知やナビなどです。</string>
-    <string name="pref_summary_remember_last_tab">アプリ起動時に最後に開いていたタブを開く</string>
+    <string name="pref_summary_remember_tab">アプリ起動時に最後に開いていたタブを開く</string>
     <string name="last_added">最近追加された曲</string>
     <string name="my_top_tracks">よく聞く曲</string>
     <string name="action_sleep_timer">スリープタイマー</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">デザイン面の支援。</string>
     <string name="website">ウェブサイト</string>
     <string name="up_next">次の曲</string>
-    <string name="pref_title_now_playing_screen_appearance">外観</string>
+    <string name="pref_title_now_playing_appearance">外観</string>
     <string name="login">ログイン</string>
     <string name="username">ユーザー名</string>
     <string name="password">パスワード</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">再生中の通知</string>
     <string name="eugene_cheung_summary">ソースコードへの貢献。</string>
     <string name="adrian_summary">Por criar o design da página de álbuns.</string>
-    <string name="library_categories">ライブラリのカテゴリ</string>
-    <string name="pref_summary_library_categories">ライブラリに表示するカテゴリとその順番を設定します。</string>
+    <string name="pref_title_categories">ライブラリのカテゴリ</string>
+    <string name="pref_summary_categories">ライブラリに表示するカテゴリとその順番を設定します。</string>
     <string name="you_have_to_select_at_least_one_category">最低でも1つのカテゴリを選択を選択してください</string>
     <string name="action_sort_order">並べ替え</string>
     <string name="sort_order_ascending">昇順</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index cd9ba249..e51cb695 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">어두운 테마</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_title_theme">전체 테마</string>
     <string name="pref_header_audio">오디오</string>
     <string name="pref_header_library">보관함</string>
-    <string name="pref_header_lockscreen">잠금 화면</string>
+    <string name="pref_header_lock_screen">잠금 화면</string>
     <string name="pref_header_notification">알림</string>
-    <string name="pref_title_app_shortcuts">앱 바로가기 색칠</string>
-    <string name="pref_title_album_art_on_lockscreen">앨범 커버 보이기</string>
-    <string name="pref_title_blurred_album_art">앨범 커버 블러 효과</string>
+    <string name="pref_title_colored_shortcuts">앱 바로가기 색칠</string>
+    <string name="pref_title_show_album_art">앨범 커버 보이기</string>
+    <string name="pref_title_blur_album_art">앨범 커버 블러 효과</string>
     <string name="pref_title_colored_notification">알림 색상 틴트</string>
     <string name="pref_title_classic_notification">클래식 알림 디자인</string>
     <string name="pref_title_audio_ducking">포커스 상실 시 볼륨 감소하기</string>
-    <string name="pref_title_remember_last_tab">마지막 탭 기억</string>
+    <string name="pref_title_remember_tab">마지막 탭 기억</string>
     <string name="delete_action">삭제</string>
     <string name="remove_action">제거</string>
     <string name="rename_action">이름 변경</string>
     <string name="create_action">만들기</string>
     <string name="reset_action">초기화</string>
     <string name="x_selected">%1$d 선택됨</string>
-    <string name="primary_color">주 색상</string>
-    <string name="accent_color">강조 색상</string>
-    <string name="primary_color_desc">테마의 주 색상입니다. 기본값은 인디고색입니다.</string>
-    <string name="accent_color_desc">테마의 강조 색상입니다. 기본값은 분홍색입니다.</string>
+    <string name="pref_title_primary_color">주 색상</string>
+    <string name="pref_title_accent_color">강조 색상</string>
+    <string name="pref_summary_primary_color">테마의 주 색상입니다. 기본값은 인디고색입니다.</string>
+    <string name="pref_summary_accent_color">테마의 강조 색상입니다. 기본값은 분홍색입니다.</string>
     <string name="no_playlists">재생 목록 없음</string>
     <string name="no_albums">앨범 없음</string>
     <string name="no_songs">노래 없음</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">장르 없음</string>
     <string name="empty">트랙 없음</string>
     <string name="song">노래</string>
-    <string name="pref_summary_album_art_on_lockscreen">현재 재생 중인 노래의 앨범 커버를 잠금 화면의 배경 화면으로 사용합니다.</string>
-    <string name="pref_summary_blurred_album_art">잠금화면에서 앨범 커버를 흐릿하게 표시합니다. 써드파티 앱이나 위젯에서 문제가 발생할 수도 있습니다.</string>
+    <string name="pref_summary_show_album_art">현재 재생 중인 노래의 앨범 커버를 잠금 화면의 배경 화면으로 사용합니다.</string>
+    <string name="pref_summary_blur_album_art">잠금화면에서 앨범 커버를 흐릿하게 표시합니다. 써드파티 앱이나 위젯에서 문제가 발생할 수도 있습니다.</string>
     <string name="pref_summary_classic_notification">클래식 알림 디자인 사용</string>
     <string name="pref_summary_colored_notification">"\uc54c\ub9bc \ucee8\ud2b8\ub864\uc744 \uc568\ubc94 \uc544\ud2b8\uc758 \uc8fc \uc0c9\uc0c1\uc73c\ub85c \uce60\ud569\ub2c8\ub2e4."</string>
-    <string name="pref_summary_colored_app_shortcuts">주 색상으로 앱 바로가기 색칠</string>
+    <string name="pref_summary_colored_shortcuts">주 색상으로 앱 바로가기 색칠</string>
     <string name="pref_summary_audio_ducking">알림 소리, 버튼음 등</string>
-    <string name="pref_summary_remember_last_tab">마지막으로 연 탭으로 시작</string>
+    <string name="pref_summary_remember_tab">마지막으로 연 탭으로 시작</string>
     <string name="last_added">최근 추가됨</string>
     <string name="my_top_tracks">많이 재생한 트랙</string>
     <string name="action_sleep_timer">수면 타이머</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">디자인 관련 도움</string>
     <string name="website">웹사이트</string>
     <string name="up_next">다음 곡</string>
-    <string name="pref_title_now_playing_screen_appearance">스타일</string>
+    <string name="pref_title_now_playing_appearance">스타일</string>
     <string name="login">로그인</string>
     <string name="username">사용자 이름</string>
     <string name="password">비밀번호</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">재생 알림</string>
     <string name="eugene_cheung_summary">소스 코드에 대한 기여</string>
     <string name="adrian_summary">앨범 페이지 디자인 제작</string>
-    <string name="library_categories">라이브러리 카테고리</string>
-    <string name="pref_summary_library_categories">라이브러리 카테고리의 표시 여부 및 배열 순서를 조정합니다.</string>
+    <string name="pref_title_categories">라이브러리 카테고리</string>
+    <string name="pref_summary_categories">라이브러리 카테고리의 표시 여부 및 배열 순서를 조정합니다.</string>
     <string name="you_have_to_select_at_least_one_category">적어도 하나의 카테고리는 선택해야 합니다.</string>
     <string name="action_sort_order">순서 정렬하기</string>
     <string name="sort_order_ascending">오름차순</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 01566c40..acacd346 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Donker</string>
     <string name="pref_header_colors">Kleuren</string>
     <string name="pref_header_now_playing_screen">Afspeelscherm</string>
-    <string name="pref_title_general_theme">Algemeen thema</string>
+    <string name="pref_title_theme">Algemeen thema</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Bibliotheek</string>
-    <string name="pref_header_lockscreen">Vergrendelscherm</string>
+    <string name="pref_header_lock_screen">Vergrendelscherm</string>
     <string name="pref_header_notification">Melding</string>
-    <string name="pref_title_app_shortcuts">Gekleurde app-snelkoppelingen</string>
-    <string name="pref_title_album_art_on_lockscreen">Toon albumhoes</string>
-    <string name="pref_title_blurred_album_art">Vervaag albumhoes</string>
+    <string name="pref_title_colored_shortcuts">Gekleurde app-snelkoppelingen</string>
+    <string name="pref_title_show_album_art">Toon albumhoes</string>
+    <string name="pref_title_blur_album_art">Vervaag albumhoes</string>
     <string name="pref_title_colored_notification">Gekleurde melding</string>
     <string name="pref_title_classic_notification">Klassieke meldingsweergave</string>
     <string name="pref_title_audio_ducking">Verminder volume bij focusverlies</string>
-    <string name="pref_title_remember_last_tab">Laatste tabblad onthouden</string>
+    <string name="pref_title_remember_tab">Laatste tabblad onthouden</string>
     <string name="delete_action">Verwijderen</string>
     <string name="remove_action">Verwijderen</string>
     <string name="rename_action">Hernoemen</string>
     <string name="create_action">Aanmaken</string>
     <string name="reset_action">Reset</string>
     <string name="x_selected">%1$d geselecteerd</string>
-    <string name="primary_color">Primaire kleur</string>
-    <string name="accent_color">Accentkleur</string>
-    <string name="primary_color_desc">De primaire themakleur, standaard indigo.</string>
-    <string name="accent_color_desc">De thema accentkleur, standaard roze.</string>
+    <string name="pref_title_primary_color">Primaire kleur</string>
+    <string name="pref_title_accent_color">Accentkleur</string>
+    <string name="pref_summary_primary_color">De primaire themakleur, standaard indigo.</string>
+    <string name="pref_summary_accent_color">De thema accentkleur, standaard roze.</string>
     <string name="no_playlists">Geen afspeellijsten</string>
     <string name="no_albums">Geen albums</string>
     <string name="no_songs">Geen nummers</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Geen genres</string>
     <string name="empty">Leeg</string>
     <string name="song">Nummer</string>
-    <string name="pref_summary_album_art_on_lockscreen">Albumhoes weergeven op het vergrendelscherm.</string>
-    <string name="pref_summary_blurred_album_art">Vervaagt de albumhoes op het vergrendelscherm. Kan problemen met andere apps of widgets veroorzaken.</string>
+    <string name="pref_summary_show_album_art">Albumhoes weergeven op het vergrendelscherm.</string>
+    <string name="pref_summary_blur_album_art">Vervaagt de albumhoes op het vergrendelscherm. Kan problemen met andere apps of widgets veroorzaken.</string>
     <string name="pref_summary_classic_notification">Gebruik de klassieke meldingsweergave.</string>
     <string name="pref_summary_colored_notification">"Kleurt de melding met het palet van de albumhoes."</string>
-    <string name="pref_summary_colored_app_shortcuts">Kleurt de app-snelkoppelingen in de primaire kleur.</string>
+    <string name="pref_summary_colored_shortcuts">Kleurt de app-snelkoppelingen in de primaire kleur.</string>
     <string name="pref_summary_audio_ducking">Notificaties, navigatie, etc.</string>
-    <string name="pref_summary_remember_last_tab">Ga naar het laatst geopende tabblad bij opstarten</string>
+    <string name="pref_summary_remember_tab">Ga naar het laatst geopende tabblad bij opstarten</string>
     <string name="last_added">Laatst toegevoegd</string>
     <string name="my_top_tracks">Mijn top nummers</string>
     <string name="action_sleep_timer">Slaaptimer</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">Voor de hulp met het design.</string>
     <string name="website">Website</string>
     <string name="up_next">Als volgende</string>
-    <string name="pref_title_now_playing_screen_appearance">Uiterlijk</string>
+    <string name="pref_title_now_playing_appearance">Uiterlijk</string>
     <string name="login">Login</string>
     <string name="username">Gebruikersnaam</string>
     <string name="password">Wachtwoord</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Afspeelmelding</string>
     <string name="eugene_cheung_summary">Voor zijn bijdragen aan de broncode.</string>
     <string name="adrian_summary">Om het albumpagina-uiterlijk te maken.</string>
-    <string name="library_categories">Bibliotheek categorieën</string>
-    <string name="pref_summary_library_categories">Configureer de zichtbaarheid en volgorde van categorieën</string>
+    <string name="pref_title_categories">Bibliotheek categorieën</string>
+    <string name="pref_summary_categories">Configureer de zichtbaarheid en volgorde van categorieën</string>
     <string name="you_have_to_select_at_least_one_category">Je moet tenminste één categorie selecteren.</string>
     <string name="action_sort_order">Sorteervolgorde</string>
     <string name="sort_order_ascending">Oplopend</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index f899f8de..077e0702 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -34,14 +34,14 @@
     <string name="delete_playlists_title">Slett spelelister</string>
     <string name="light_theme_name">Lys</string>
     <string name="dark_theme_name">Mørk</string>
-    <string name="pref_title_general_theme">Generelt tema</string>
+    <string name="pref_title_theme">Generelt tema</string>
     <string name="pref_header_audio">Audio</string>
     <string name="delete_action">Slett</string>
     <string name="rename_action">Gje nytt namn</string>
-    <string name="primary_color">Primærfarge</string>
-    <string name="accent_color">Fokusfarge</string>
-    <string name="primary_color_desc">Primær temafarge, standard er indigo.</string>
-    <string name="accent_color_desc">Fokustemafarge, standard er rosa.</string>
+    <string name="pref_title_primary_color">Primærfarge</string>
+    <string name="pref_title_accent_color">Fokusfarge</string>
+    <string name="pref_summary_primary_color">Primær temafarge, standard er indigo.</string>
+    <string name="pref_summary_accent_color">Fokustemafarge, standard er rosa.</string>
     <string name="no_playlists">Ingen spelelister</string>
     <string name="song">Song</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 16c7cff7..02814d13 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Ciemny</string>
     <string name="pref_header_colors">Kolory</string>
     <string name="pref_header_now_playing_screen">Obecnie Grane</string>
-    <string name="pref_title_general_theme">Styl tła motywu</string>
+    <string name="pref_title_theme">Styl tła motywu</string>
     <string name="pref_header_audio">Dźwięk</string>
     <string name="pref_header_library">Biblioteka</string>
-    <string name="pref_header_lockscreen">Ekran blokady</string>
+    <string name="pref_header_lock_screen">Ekran blokady</string>
     <string name="pref_header_notification">Powiadomienie</string>
-    <string name="pref_title_app_shortcuts">Kolorowe skróty aplikacji</string>
-    <string name="pref_title_album_art_on_lockscreen">Pokazuj okładki albumów</string>
-    <string name="pref_title_blurred_album_art">Rozmywanie okładki albumu</string>
+    <string name="pref_title_colored_shortcuts">Kolorowe skróty aplikacji</string>
+    <string name="pref_title_show_album_art">Pokazuj okładki albumów</string>
+    <string name="pref_title_blur_album_art">Rozmywanie okładki albumu</string>
     <string name="pref_title_colored_notification">Kolorowy odtwarzacz w pasku powiadomień</string>
     <string name="pref_title_classic_notification">Klasyczny wygląd powiadomienia</string>
     <string name="pref_title_audio_ducking">Zmniejszaj głośność przy powiadomieniach</string>
-    <string name="pref_title_remember_last_tab">"Zapamiętaj ostatnią zakładkę "</string>
+    <string name="pref_title_remember_tab">"Zapamiętaj ostatnią zakładkę "</string>
     <string name="delete_action">Usuń</string>
     <string name="remove_action">Usuń</string>
     <string name="rename_action">Zmień</string>
     <string name="create_action">Utwórz</string>
     <string name="reset_action">Resetuj</string>
     <string name="x_selected">%1$d zaznaczono</string>
-    <string name="primary_color">Kolor podstawowy</string>
-    <string name="accent_color">Kolor dodatków</string>
-    <string name="primary_color_desc">Główny kolor motywu, domyślnie indygo</string>
-    <string name="accent_color_desc">Kolor akcentów motywu, domyślnie różowy</string>
+    <string name="pref_title_primary_color">Kolor podstawowy</string>
+    <string name="pref_title_accent_color">Kolor dodatków</string>
+    <string name="pref_summary_primary_color">Główny kolor motywu, domyślnie indygo</string>
+    <string name="pref_summary_accent_color">Kolor akcentów motywu, domyślnie różowy</string>
     <string name="no_playlists">Brak list odtwarzania</string>
     <string name="no_albums">Brak albumów</string>
     <string name="no_songs">Brak utworów</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Brak gatunków</string>
     <string name="empty">Pusto</string>
     <string name="song">Utwór</string>
-    <string name="pref_summary_album_art_on_lockscreen">Okładki albumów obecnie granych utworów będą zastępowały tapetę na ekranie blokady</string>
-    <string name="pref_summary_blurred_album_art">Rozmywa okładki albumów na ekranie blokady. Mogą wystąpić problemy z aplikacjami firm trzecich oraz widżetami</string>
+    <string name="pref_summary_show_album_art">Okładki albumów obecnie granych utworów będą zastępowały tapetę na ekranie blokady</string>
+    <string name="pref_summary_blur_album_art">Rozmywa okładki albumów na ekranie blokady. Mogą wystąpić problemy z aplikacjami firm trzecich oraz widżetami</string>
     <string name="pref_summary_classic_notification">Używaj klasycznego stylu powiadomienia.</string>
     <string name="pref_summary_colored_notification">"Odtwarzacz w pasku powiadomie\u0144 ma tonacj\u0119 ok\u0142adki albumu"</string>
-    <string name="pref_summary_colored_app_shortcuts">Kolory skrótów aplikacji w kolorze podstawowym</string>
+    <string name="pref_summary_colored_shortcuts">Kolory skrótów aplikacji w kolorze podstawowym</string>
     <string name="pref_summary_audio_ducking">Notyfikacje, nawigacja, itp.</string>
-    <string name="pref_summary_remember_last_tab">Idź do ostatniej otwartej zakładki przy starcie</string>
+    <string name="pref_summary_remember_tab">Idź do ostatniej otwartej zakładki przy starcie</string>
     <string name="last_added">Ostatnio dodane</string>
     <string name="my_top_tracks">Moja Top Lista</string>
     <string name="action_sleep_timer">Wyłącznik czasowy</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">Za pomoc w pracach nad wyglądem wizualnym</string>
     <string name="website">Strona internetowa</string>
     <string name="up_next">Za chwilę zagra</string>
-    <string name="pref_title_now_playing_screen_appearance">Wygląd</string>
+    <string name="pref_title_now_playing_appearance">Wygląd</string>
     <string name="login">Zaloguj się</string>
     <string name="username">Nazwa użytkownika</string>
     <string name="password">Hasło</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Powiadomienie o odtwarzaniu</string>
     <string name="eugene_cheung_summary">Za jego wkład w kod źródłowy.</string>
     <string name="adrian_summary">Za stworzenie design\'u strony albumu</string>
-    <string name="library_categories">Kategorie biblioteki</string>
-    <string name="pref_summary_library_categories">Ustawia widoczność i kolejność kategorii biblioteki</string>
+    <string name="pref_title_categories">Kategorie biblioteki</string>
+    <string name="pref_summary_categories">Ustawia widoczność i kolejność kategorii biblioteki</string>
     <string name="you_have_to_select_at_least_one_category">Musisz wybrać co najmniej jedną kategorię</string>
     <string name="action_sort_order">Kolejność sortowania</string>
     <string name="sort_order_ascending">Rosnąco</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index cd72ec82..41609588 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -57,18 +57,18 @@
     <string name="dark_theme_name">Escuro</string>
     <string name="pref_header_colors">Cores</string>
     <string name="pref_header_now_playing_screen">Tocando agora</string>
-    <string name="pref_title_general_theme">Tema geral</string>
+    <string name="pref_title_theme">Tema geral</string>
     <string name="pref_header_audio">Áudio</string>
     <string name="pref_header_library">Biblioteca</string>
-    <string name="pref_header_lockscreen">Bloqueio de tela</string>
+    <string name="pref_header_lock_screen">Bloqueio de tela</string>
     <string name="pref_header_notification">Notificação</string>
-    <string name="pref_title_app_shortcuts">Atalhos de app coloridos</string>
-    <string name="pref_title_album_art_on_lockscreen">Visualizar capa do álbum</string>
-    <string name="pref_title_blurred_album_art">Capa de álbum esmaecida</string>
+    <string name="pref_title_colored_shortcuts">Atalhos de app coloridos</string>
+    <string name="pref_title_show_album_art">Visualizar capa do álbum</string>
+    <string name="pref_title_blur_album_art">Capa de álbum esmaecida</string>
     <string name="pref_title_colored_notification">Notificação colorida</string>
     <string name="pref_title_classic_notification">Design de classificação clássico</string>
     <string name="pref_title_audio_ducking">Reduzir o volume de perda de foco</string>
-    <string name="pref_title_remember_last_tab">Lembrar última aba</string>
+    <string name="pref_title_remember_tab">Lembrar última aba</string>
     <string name="pref_title_remember_shuffle">Memorizar aleatorização</string>
     <string name="delete_action">Excluir</string>
     <string name="remove_action">Remover</string>
@@ -76,10 +76,10 @@
     <string name="create_action">Criar</string>
     <string name="reset_action">Redefinir</string>
     <string name="x_selected">%1$d selecionado</string>
-    <string name="primary_color">Cor primária</string>
-    <string name="accent_color">Cor dos detalhes</string>
-    <string name="primary_color_desc">A cor do tema principal, o padrão é índigo.</string>
-    <string name="accent_color_desc">A cor dos detalhes do tema, o padrão é rosa.</string>
+    <string name="pref_title_primary_color">Cor primária</string>
+    <string name="pref_title_accent_color">Cor dos detalhes</string>
+    <string name="pref_summary_primary_color">A cor do tema principal, o padrão é índigo.</string>
+    <string name="pref_summary_accent_color">A cor dos detalhes do tema, o padrão é rosa.</string>
     <string name="no_playlists">Nenhuma playlist</string>
     <string name="no_albums">Nenhum Álbum</string>
     <string name="no_songs">Nenhuma Musica</string>
@@ -87,13 +87,13 @@
     <string name="no_genres">Nenhum gênero</string>
     <string name="empty">Vazio</string>
     <string name="song">Música</string>
-    <string name="pref_summary_album_art_on_lockscreen">A imagem do álbum está sendo mostrada no bloqueio de tela. Você deve reiniciar o Phonograph para as mudanças fazerem efeito.</string>
-    <string name="pref_summary_blurred_album_art">Esmaece a capa de álbum no bloqueio de tela. Pode causar problemas com aplicativos de terceiros e widgets.</string>
+    <string name="pref_summary_show_album_art">A imagem do álbum está sendo mostrada no bloqueio de tela. Você deve reiniciar o Phonograph para as mudanças fazerem efeito.</string>
+    <string name="pref_summary_blur_album_art">Esmaece a capa de álbum no bloqueio de tela. Pode causar problemas com aplicativos de terceiros e widgets.</string>
     <string name="pref_summary_classic_notification">Usar o design de notificação clássico.</string>
     <string name="pref_summary_colored_notification">"A notifica\u00e7\u00e3o \u00e9 colorida com a cor mais vibrante do \u00e1lbum."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colore os atalhos do app com a cor primária.</string>
+    <string name="pref_summary_colored_shortcuts">Colore os atalhos do app com a cor primária.</string>
     <string name="pref_summary_audio_ducking">Notificações, navegação, etc.</string>
-    <string name="pref_summary_remember_last_tab">Ir para a última aba aberta ao iniciar</string>
+    <string name="pref_summary_remember_tab">Ir para a última aba aberta ao iniciar</string>
     <string name="pref_summary_remember_shuffle">Modo aleatório continuará ativo quando uma nova lista de músicas for selecionada</string>
     <string name="last_added">Última Adição</string>
     <string name="my_top_tracks">Minhas melhores faixas</string>
@@ -123,7 +123,7 @@
     <string name="aleksandar_tesic_summary">Por me ajudar com o design.</string>
     <string name="website">Site</string>
     <string name="up_next">Próximo</string>
-    <string name="pref_title_now_playing_screen_appearance">Aparência</string>
+    <string name="pref_title_now_playing_appearance">Aparência</string>
     <string name="login">Login</string>
     <string name="username">Nome de usuário</string>
     <string name="password">Senha</string>
@@ -132,8 +132,8 @@
     <string name="playing_notification_name">Notificação de reprodução</string>
     <string name="eugene_cheung_summary">Pela sua contribuição com o código-fonte.</string>
     <string name="adrian_summary">Por criar o design da página de álbuns.</string>
-    <string name="library_categories">Categorias da biblioteca</string>
-    <string name="pref_summary_library_categories">Configurar a visibilidade e a ordem das categorias da biblioteca.</string>
+    <string name="pref_title_categories">Categorias da biblioteca</string>
+    <string name="pref_summary_categories">Configurar a visibilidade e a ordem das categorias da biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Você deve selecionar ao menos uma categoria.</string>
     <string name="action_sort_order">Embaralhar ordem</string>
     <string name="sort_order_ascending">Ascendente</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index d905c0fc..3e992f9b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -52,29 +52,29 @@
     <string name="dark_theme_name">Escuro</string>
     <string name="pref_header_colors">Cores</string>
     <string name="pref_header_now_playing_screen">A reproduzir</string>
-    <string name="pref_title_general_theme">Tema geral</string>
+    <string name="pref_title_theme">Tema geral</string>
     <string name="pref_header_audio">Áudio</string>
-    <string name="pref_header_lockscreen">Ecrã de Bloqueio</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostrar capa do álbum</string>
-    <string name="pref_title_blurred_album_art">Desfocar capa do álbum</string>
+    <string name="pref_header_lock_screen">Ecrã de Bloqueio</string>
+    <string name="pref_title_show_album_art">Mostrar capa do álbum</string>
+    <string name="pref_title_blur_album_art">Desfocar capa do álbum</string>
     <string name="pref_title_colored_notification">Notificação colorida</string>
     <string name="delete_action">Eliminar</string>
     <string name="remove_action">Remover</string>
     <string name="rename_action">Mudar nome</string>
     <string name="create_action">Criar</string>
     <string name="x_selected">%1$d selecionados</string>
-    <string name="primary_color">Cor principal</string>
-    <string name="accent_color">Cor de realce</string>
-    <string name="primary_color_desc">Cor de tema primária, predefine para anil.</string>
-    <string name="accent_color_desc">Cor de tema de realce, predefine para cor-de-rosa.</string>
+    <string name="pref_title_primary_color">Cor principal</string>
+    <string name="pref_title_accent_color">Cor de realce</string>
+    <string name="pref_summary_primary_color">Cor de tema primária, predefine para anil.</string>
+    <string name="pref_summary_accent_color">Cor de tema de realce, predefine para cor-de-rosa.</string>
     <string name="no_playlists">Sem listas de reprodução</string>
     <string name="no_albums">Sem álbuns</string>
     <string name="no_songs">Sem faixas</string>
     <string name="no_artists">Sem artistas</string>
     <string name="empty">Vazio</string>
     <string name="song">Música</string>
-    <string name="pref_summary_album_art_on_lockscreen">Usa a capa de álbum da faixa atual como papel de parede da tela de bloqueio.</string>
-    <string name="pref_summary_blurred_album_art">Desfoca a capa do álbum no ecrã de bloqueio. Pode causar problemas com aplicações de terceiros e widgets.</string>
+    <string name="pref_summary_show_album_art">Usa a capa de álbum da faixa atual como papel de parede da tela de bloqueio.</string>
+    <string name="pref_summary_blur_album_art">Desfoca a capa do álbum no ecrã de bloqueio. Pode causar problemas com aplicações de terceiros e widgets.</string>
     <string name="pref_summary_colored_notification">"Colorir a notifica\u00e7\u00e3o na cor viva da capa de \u00e1lbum."</string>
     <string name="pref_summary_audio_ducking">Notificações, navegação etc.</string>
     <string name="last_added">Últimas adições</string>
@@ -104,7 +104,7 @@
     <string name="aleksandar_tesic_summary">Por me ajudar com o design.</string>
     <string name="website">Sítio da Internet</string>
     <string name="up_next">A seguir</string>
-    <string name="pref_title_now_playing_screen_appearance">Aparência</string>
+    <string name="pref_title_now_playing_appearance">Aparência</string>
     <string name="login">Entrar</string>
     <string name="username">Nome de utilizador</string>
     <string name="password">Senha</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 216c1f22..f8504d7a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Dark (Negru)</string>
     <string name="pref_header_colors">Culori</string>
     <string name="pref_header_now_playing_screen">Redare acum</string>
-    <string name="pref_title_general_theme">Temă generală</string>
+    <string name="pref_title_theme">Temă generală</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_library">Bibliotecă</string>
-    <string name="pref_header_lockscreen">Ecran blocat</string>
+    <string name="pref_header_lock_screen">Ecran blocat</string>
     <string name="pref_header_notification">Notificare</string>
-    <string name="pref_title_app_shortcuts">Comenzi rapide colorate</string>
-    <string name="pref_title_album_art_on_lockscreen">Arată coperta de album</string>
-    <string name="pref_title_blurred_album_art">Blurează coperta de album</string>
+    <string name="pref_title_colored_shortcuts">Comenzi rapide colorate</string>
+    <string name="pref_title_show_album_art">Arată coperta de album</string>
+    <string name="pref_title_blur_album_art">Blurează coperta de album</string>
     <string name="pref_title_colored_notification">Notificare colorată</string>
     <string name="pref_title_classic_notification">Design clasic de notificare</string>
     <string name="pref_title_audio_ducking">Se reduce volumul la pierderea focalizării</string>
-    <string name="pref_title_remember_last_tab">Rețineți ultima filă</string>
+    <string name="pref_title_remember_tab">Rețineți ultima filă</string>
     <string name="delete_action">Șterge</string>
     <string name="remove_action">Ștergeți</string>
     <string name="rename_action">Redenumește</string>
     <string name="create_action">Creați</string>
     <string name="reset_action">Resetaţi</string>
     <string name="x_selected">%1$d selectat/ă</string>
-    <string name="primary_color">Culoare primară</string>
-    <string name="accent_color">Culoare de accent</string>
-    <string name="primary_color_desc">Culoarea primară temei, originalul este indigo.</string>
-    <string name="accent_color_desc">Culoarea de accent a temei, originalul este roz.</string>
+    <string name="pref_title_primary_color">Culoare primară</string>
+    <string name="pref_title_accent_color">Culoare de accent</string>
+    <string name="pref_summary_primary_color">Culoarea primară temei, originalul este indigo.</string>
+    <string name="pref_summary_accent_color">Culoarea de accent a temei, originalul este roz.</string>
     <string name="no_playlists">Nu sunt liste de redare</string>
     <string name="no_albums">Nu sunt albume</string>
     <string name="no_songs">Nu sunt melodii</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Niciun gen</string>
     <string name="empty">Gol</string>
     <string name="song">Melodie</string>
-    <string name="pref_summary_album_art_on_lockscreen">Folosește coperta de album a melodiei curente ca fundal pentru ecranul de blocare.</string>
-    <string name="pref_summary_blurred_album_art">Blurează coperta de album pentru ecranul de blocare. Poate cauza probleme cu widgeturi și aplicații terțe.</string>
+    <string name="pref_summary_show_album_art">Folosește coperta de album a melodiei curente ca fundal pentru ecranul de blocare.</string>
+    <string name="pref_summary_blur_album_art">Blurează coperta de album pentru ecranul de blocare. Poate cauza probleme cu widgeturi și aplicații terțe.</string>
     <string name="pref_summary_classic_notification">Utilizați designul clasic de notificare.</string>
     <string name="pref_summary_colored_notification">"Coloreaz\u0103 bara de notificare cu cea mai vibrant\u0103 culoare a copertei de album."</string>
-    <string name="pref_summary_colored_app_shortcuts">Colorarea comenzilor rapide ale aplicației în culoarea primară.</string>
+    <string name="pref_summary_colored_shortcuts">Colorarea comenzilor rapide ale aplicației în culoarea primară.</string>
     <string name="pref_summary_audio_ducking">Notificări, navigație etc.</string>
-    <string name="pref_summary_remember_last_tab">Accesați ultima filă deschisă la lansare</string>
+    <string name="pref_summary_remember_tab">Accesați ultima filă deschisă la lansare</string>
     <string name="last_added">Ultimele adăugate</string>
     <string name="my_top_tracks">Melodiile mele favorite</string>
     <string name="action_sleep_timer">Cronometru pentru somn</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">Pentru ajutorul cu designul.</string>
     <string name="website">Site web</string>
     <string name="up_next">Urmează</string>
-    <string name="pref_title_now_playing_screen_appearance">Aspect</string>
+    <string name="pref_title_now_playing_appearance">Aspect</string>
     <string name="login">Logare</string>
     <string name="username">Nume utilizator</string>
     <string name="password">Parolă</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Notificare de redare</string>
     <string name="eugene_cheung_summary">Pentru contribuțiile sale la codul sursă.</string>
     <string name="adrian_summary">Pentru crearea designului paginii albume</string>
-    <string name="library_categories">Categorii</string>
-    <string name="pref_summary_library_categories">Configurați vizibilitatea și ordinea categoriilor din bibliotecă.</string>
+    <string name="pref_title_categories">Categorii</string>
+    <string name="pref_summary_categories">Configurați vizibilitatea și ordinea categoriilor din bibliotecă.</string>
     <string name="you_have_to_select_at_least_one_category">Trebuie să selectați cel puțin o categorie.</string>
     <string name="action_sort_order">Ordine de sortare</string>
     <string name="sort_order_ascending">crescător</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 826b0a9a..d1bdb094 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -57,18 +57,18 @@
     <string name="dark_theme_name">Тёмная</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_title_theme">Главная тема</string>
     <string name="pref_header_audio">Аудио</string>
     <string name="pref_header_library">Библиотека</string>
-    <string name="pref_header_lockscreen">Экран блокировки</string>
+    <string name="pref_header_lock_screen">Экран блокировки</string>
     <string name="pref_header_notification">Уведомления</string>
-    <string name="pref_title_app_shortcuts">Цветные шорткаты</string>
-    <string name="pref_title_album_art_on_lockscreen">Показывать обложку альбома</string>
-    <string name="pref_title_blurred_album_art">Размытая обложка альбома</string>
+    <string name="pref_title_colored_shortcuts">Цветные шорткаты</string>
+    <string name="pref_title_show_album_art">Показывать обложку альбома</string>
+    <string name="pref_title_blur_album_art">Размытая обложка альбома</string>
     <string name="pref_title_colored_notification">Окрашенное уведомление</string>
     <string name="pref_title_classic_notification">Стандартный дизайн уведомления</string>
     <string name="pref_title_audio_ducking">Уменьшить громкость при уведомлениях</string>
-    <string name="pref_title_remember_last_tab">Запомнить последнюю вкладку</string>
+    <string name="pref_title_remember_tab">Запомнить последнюю вкладку</string>
     <string name="pref_title_remember_shuffle">Запомнить перемешивание</string>
     <string name="delete_action">Удалить</string>
     <string name="remove_action">Убрать</string>
@@ -76,10 +76,10 @@
     <string name="create_action">Создать</string>
     <string name="reset_action">Сброс</string>
     <string name="x_selected">%1$d выбрано</string>
-    <string name="primary_color">Основной цвет</string>
-    <string name="accent_color">Цвет акцента</string>
-    <string name="primary_color_desc">Основной цвет темы, по умолчанию — индиго.</string>
-    <string name="accent_color_desc">Цвет акцента, по умолчанию — розовый</string>
+    <string name="pref_title_primary_color">Основной цвет</string>
+    <string name="pref_title_accent_color">Цвет акцента</string>
+    <string name="pref_summary_primary_color">Основной цвет темы, по умолчанию — индиго.</string>
+    <string name="pref_summary_accent_color">Цвет акцента, по умолчанию — розовый</string>
     <string name="no_playlists">Нет плейлистов для отображения</string>
     <string name="no_albums">Нет альбомов для отображения</string>
     <string name="no_songs">Нет песен для отображения</string>
@@ -87,13 +87,13 @@
     <string name="no_genres">Нет жанров для отображения</string>
     <string name="empty">Пусто</string>
     <string name="song">Песня</string>
-    <string name="pref_summary_album_art_on_lockscreen">Обложка альбома текущей песни используется как изображение экрана блокировки.</string>
-    <string name="pref_summary_blurred_album_art">Делает размытую обложку фоном экрана блокировки. Может создавать проблемы с другими приложениями и виджетами.</string>
+    <string name="pref_summary_show_album_art">Обложка альбома текущей песни используется как изображение экрана блокировки.</string>
+    <string name="pref_summary_blur_album_art">Делает размытую обложку фоном экрана блокировки. Может создавать проблемы с другими приложениями и виджетами.</string>
     <string name="pref_summary_classic_notification">Использовать классический дизайн уведомления.</string>
     <string name="pref_summary_colored_notification">"\u041e\u043a\u0440\u0430\u0448\u0438\u0432\u0430\u0435\u0442 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u0432 \u0442\u043e\u043d \u043e\u0431\u043b\u043e\u0436\u043a\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430."</string>
-    <string name="pref_summary_colored_app_shortcuts">Окрашивает шорткаты в основной цвет.</string>
+    <string name="pref_summary_colored_shortcuts">Окрашивает шорткаты в основной цвет.</string>
     <string name="pref_summary_audio_ducking">Уведомления, навигация, т.д.</string>
-    <string name="pref_summary_remember_last_tab">Перейти на последнюю открытую вкладку при запуске</string>
+    <string name="pref_summary_remember_tab">Перейти на последнюю открытую вкладку при запуске</string>
     <string name="pref_summary_remember_shuffle">Режим перемешивания останется включенным при выборе нового списка песен</string>
     <string name="last_added">Последние добавленные</string>
     <string name="my_top_tracks">Мои популярные треки</string>
@@ -123,7 +123,7 @@
     <string name="aleksandar_tesic_summary">За помощь с дизайном.</string>
     <string name="website">Вебсайт</string>
     <string name="up_next">Далее</string>
-    <string name="pref_title_now_playing_screen_appearance">Вид экрана воспроизведения</string>
+    <string name="pref_title_now_playing_appearance">Вид экрана воспроизведения</string>
     <string name="login">Войти</string>
     <string name="username">Имя пользователя</string>
     <string name="password">Пароль</string>
@@ -132,8 +132,8 @@
     <string name="playing_notification_name">Уведомление о воспроизведении</string>
     <string name="eugene_cheung_summary">За его вклад в исходный код.</string>
     <string name="adrian_summary">За создание дизайна показа альбомов.</string>
-    <string name="library_categories">Категории библиотеки</string>
-    <string name="pref_summary_library_categories">Настройте видимость и порядок категорий библиотеки.</string>
+    <string name="pref_title_categories">Категории библиотеки</string>
+    <string name="pref_summary_categories">Настройте видимость и порядок категорий библиотеки.</string>
     <string name="you_have_to_select_at_least_one_category">Вы должны выбрать хотя бы одну категорию.</string>
     <string name="action_sort_order">Сортировка</string>
     <string name="sort_order_ascending">По возрастанию</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d5364a3b..a0d7d9a8 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -40,11 +40,11 @@ Vill du radera spellistan <b>%1$s</b>?
     <string name="delete_playlist_title">Radera spellista</string>
     <string name="light_theme_name">Ljus</string>
     <string name="dark_theme_name">Mörk</string>
-    <string name="pref_title_general_theme">Allmänt tema</string>
+    <string name="pref_title_theme">Allmänt tema</string>
     <string name="pref_header_audio">Ljud</string>
     <string name="delete_action">Radera</string>
     <string name="rename_action">Döp om</string>
-    <string name="primary_color">Grundfärg</string>
+    <string name="pref_title_primary_color">Grundfärg</string>
     <string name="no_playlists">Inga spellistor</string>
     <string name="song">Låt</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8a2ceca6..1c55627f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Koyu</string>
     <string name="pref_header_colors">Renkler</string>
     <string name="pref_header_now_playing_screen">Şuan çalınan</string>
-    <string name="pref_title_general_theme">Genel tema</string>
+    <string name="pref_title_theme">Genel tema</string>
     <string name="pref_header_audio">Ses</string>
     <string name="pref_header_library">Kitaplık</string>
-    <string name="pref_header_lockscreen">Kilit ekranı</string>
+    <string name="pref_header_lock_screen">Kilit ekranı</string>
     <string name="pref_header_notification">Bildirim</string>
-    <string name="pref_title_app_shortcuts">Renkli uygulama kısayolları</string>
-    <string name="pref_title_album_art_on_lockscreen">Albüm kapağını göster</string>
-    <string name="pref_title_blurred_album_art">Bulanık albüm kapağı</string>
+    <string name="pref_title_colored_shortcuts">Renkli uygulama kısayolları</string>
+    <string name="pref_title_show_album_art">Albüm kapağını göster</string>
+    <string name="pref_title_blur_album_art">Bulanık albüm kapağı</string>
     <string name="pref_title_colored_notification">Renkli bildirim</string>
     <string name="pref_title_classic_notification">Klasik bildirim tasarımı</string>
     <string name="pref_title_audio_ducking">Odak kaybına neden olacak sesi azalt</string>
-    <string name="pref_title_remember_last_tab">Son sekmeyi hatırla</string>
+    <string name="pref_title_remember_tab">Son sekmeyi hatırla</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="reset_action">Sıfırla</string>
     <string name="x_selected">%1$d seçildi</string>
-    <string name="primary_color">Ana renk</string>
-    <string name="accent_color">Vurgu rengi</string>
-    <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="pref_title_primary_color">Ana renk</string>
+    <string name="pref_title_accent_color">Vurgu rengi</string>
+    <string name="pref_summary_primary_color">Varsayılan tema ana rengi mavi.</string>
+    <string name="pref_summary_accent_color">Varsayılan tema vurgu rengi pembe.</string>
     <string name="no_playlists">Çalma listesi yok</string>
     <string name="no_albums">Albüm yok</string>
     <string name="no_songs">Şarkı yok</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Tür yok</string>
     <string name="empty">Boş</string>
     <string name="song">Şarkı</string>
-    <string name="pref_summary_album_art_on_lockscreen">Kilit ekranı duvar kağıdı olarak çalan şarkının albüm kapağını kullanır.</string>
-    <string name="pref_summary_blurred_album_art">Kilit ekranındaki albüm kapağını bulanıklaştırır. Üçüncü taraf uygulamalar ve widget\'ler ile ilgili sorunlara neden olabilir.</string>
+    <string name="pref_summary_show_album_art">Kilit ekranı duvar kağıdı olarak çalan şarkının albüm kapağını kullanır.</string>
+    <string name="pref_summary_blur_album_art">Kilit ekranındaki albüm kapağını bulanıklaştırır. Üçüncü taraf uygulamalar ve widget\'ler ile ilgili sorunlara neden olabilir.</string>
     <string name="pref_summary_classic_notification">Klasik bildirim tasarımını kullan.</string>
     <string name="pref_summary_colored_notification">"Bildirimler alb\u00fcm kapa\u011f\u0131n\u0131n canl\u0131 renkleriyle renklendirilir."</string>
-    <string name="pref_summary_colored_app_shortcuts">Uygulama kısayollarını ana renk ile renklendir.</string>
+    <string name="pref_summary_colored_shortcuts">Uygulama kısayollarını ana renk ile renklendir.</string>
     <string name="pref_summary_audio_ducking">Bildirimler, gezinme vb.</string>
-    <string name="pref_summary_remember_last_tab">Başlatıldığında son açılan sekmeye git</string>
+    <string name="pref_summary_remember_tab">Başlatıldığında son açılan sekmeye git</string>
     <string name="last_added">Son eklenen</string>
     <string name="my_top_tracks">En iyi parçalarım</string>
     <string name="action_sleep_timer">Uyku zamanlayıcı</string>
@@ -120,7 +120,7 @@
     <string name="aleksandar_tesic_summary">Tasarımda bana yardımcı olduğu için.</string>
     <string name="website">Web sitesi</string>
     <string name="up_next">Sırada olanlar</string>
-    <string name="pref_title_now_playing_screen_appearance">Görünüm</string>
+    <string name="pref_title_now_playing_appearance">Görünüm</string>
     <string name="login">Oturum aç</string>
     <string name="username">Kullanıcı adı</string>
     <string name="password">Şifre</string>
@@ -129,8 +129,8 @@
     <string name="playing_notification_name">Çalma bildirimi</string>
     <string name="eugene_cheung_summary">Kaynak koda yaptığı katkılardan dolayı.</string>
     <string name="adrian_summary">Albüm sayfası tasarımı oluşturmak için.</string>
-    <string name="library_categories">Kitaplık kategorileri</string>
-    <string name="pref_summary_library_categories">Kitaplık kategorilerinin görünürlüğünü ve sırasını yapılandırma.</string>
+    <string name="pref_title_categories">Kitaplık kategorileri</string>
+    <string name="pref_summary_categories">Kitaplık kategorilerinin görünürlüğünü ve sırasını yapılandırma.</string>
     <string name="you_have_to_select_at_least_one_category">En az bir kategori seçmeniz gerekiyor.</string>
     <string name="action_sort_order">Sıralama düzeni</string>
     <string name="sort_order_ascending">Artan</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7020e5fd..115305da 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -56,28 +56,28 @@
     <string name="dark_theme_name">Темна</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_title_theme">Загальна тема</string>
     <string name="pref_header_audio">Аудіо</string>
     <string name="pref_header_library">Бібліотека</string>
-    <string name="pref_header_lockscreen">Екран блокування</string>
+    <string name="pref_header_lock_screen">Екран блокування</string>
     <string name="pref_header_notification">Сповіщення</string>
-    <string name="pref_title_app_shortcuts">Кольорові ярлики додатків</string>
-    <string name="pref_title_album_art_on_lockscreen">Показати обкладинку альбому</string>
-    <string name="pref_title_blurred_album_art">Розмити обкладинку альбому</string>
+    <string name="pref_title_colored_shortcuts">Кольорові ярлики додатків</string>
+    <string name="pref_title_show_album_art">Показати обкладинку альбому</string>
+    <string name="pref_title_blur_album_art">Розмити обкладинку альбому</string>
     <string name="pref_title_colored_notification">Кольорове сповіщення</string>
     <string name="pref_title_classic_notification">Класичне оформлення сповіщення</string>
     <string name="pref_title_audio_ducking">Зменшити гучнiсть при отриманнi повiдомлення</string>
-    <string name="pref_title_remember_last_tab">Запам‘ятати останню вкладку</string>
+    <string name="pref_title_remember_tab">Запам‘ятати останню вкладку</string>
     <string name="delete_action">Видалити</string>
     <string name="remove_action">Видалити</string>
     <string name="rename_action">Перейменувати</string>
     <string name="create_action">Створити</string>
     <string name="reset_action">Скинути</string>
     <string name="x_selected">Вибрано {%1$d}</string>
-    <string name="primary_color">Основний колір</string>
-    <string name="accent_color">Колір підкреслення</string>
-    <string name="primary_color_desc">Основний колір теми, стандартно синій.</string>
-    <string name="accent_color_desc">Акцентований колір теми, стандартно рожевий.</string>
+    <string name="pref_title_primary_color">Основний колір</string>
+    <string name="pref_title_accent_color">Колір підкреслення</string>
+    <string name="pref_summary_primary_color">Основний колір теми, стандартно синій.</string>
+    <string name="pref_summary_accent_color">Акцентований колір теми, стандартно рожевий.</string>
     <string name="no_playlists">Немає списків відтворення</string>
     <string name="no_albums">Немає альбомів</string>
     <string name="no_songs">Немає пісень</string>
@@ -85,13 +85,13 @@
     <string name="no_genres">Немає жанрів</string>
     <string name="empty">Порожньо</string>
     <string name="song">Пісня</string>
-    <string name="pref_summary_album_art_on_lockscreen">Використовувати обкладинку альбому поточної пісні як шпалери екрана блокування.</string>
-    <string name="pref_summary_blurred_album_art">Розмиває обладинку альбому на екрані блокування. Може конфліктувати зі сторонніми додатками та віджетами.</string>
+    <string name="pref_summary_show_album_art">Використовувати обкладинку альбому поточної пісні як шпалери екрана блокування.</string>
+    <string name="pref_summary_blur_album_art">Розмиває обладинку альбому на екрані блокування. Може конфліктувати зі сторонніми додатками та віджетами.</string>
     <string name="pref_summary_classic_notification">Використовувати класичне оформлення сповіщення.</string>
     <string name="pref_summary_colored_notification">"\u0424\u0430\u0440\u0431\u0443\u0454 \u043f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f \u0432 \u043f\u0435\u0440\u0435\u0432\u0430\u0436\u043d\u0438\u0439 \u043a\u043e\u043b\u0456\u0440 \u043e\u0431\u043a\u043b\u0430\u0434\u0438\u043d\u043a\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0443."</string>
-    <string name="pref_summary_colored_app_shortcuts">Фарбує ярлики додатків у переважний колір.</string>
+    <string name="pref_summary_colored_shortcuts">Фарбує ярлики додатків у переважний колір.</string>
     <string name="pref_summary_audio_ducking">Повiдомлення, навiгацiя, т.д.</string>
-    <string name="pref_summary_remember_last_tab">Перейдіть до останньої відкритої вкладки, щоб запустити</string>
+    <string name="pref_summary_remember_tab">Перейдіть до останньої відкритої вкладки, щоб запустити</string>
     <string name="last_added">Останні додані</string>
     <string name="my_top_tracks">Мої популярні треки</string>
     <string name="action_sleep_timer">Таймер сну</string>
@@ -120,11 +120,11 @@
     <string name="aleksandar_tesic_summary">За допомогу в дизайні.</string>
     <string name="website">Веб-сайт</string>
     <string name="up_next">До наступного</string>
-    <string name="pref_title_now_playing_screen_appearance">Вигляд</string>
+    <string name="pref_title_now_playing_appearance">Вигляд</string>
     <string name="login">Ім’я користувача</string>
     <string name="username">Ім‘я користувача</string>
     <string name="password">Пароль</string>
-    <string name="library_categories">Категорії бібліотеки</string>
-    <string name="pref_summary_library_categories">Налаштувати видимість та порядок категорій бібліотеки.</string>
+    <string name="pref_title_categories">Категорії бібліотеки</string>
+    <string name="pref_summary_categories">Налаштувати видимість та порядок категорій бібліотеки.</string>
     <string name="you_have_to_select_at_least_one_category">Виберіть принаймні одну категорію.</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 9872a3cd..e7f81114 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -55,13 +55,13 @@
     <string name="dark_theme_name">Tối</string>
     <string name="pref_header_colors">Màu sắc</string>
     <string name="pref_header_now_playing_screen">Đang phát</string>
-    <string name="pref_title_general_theme">Chủ đề chung</string>
+    <string name="pref_title_theme">Chủ đề chung</string>
     <string name="pref_header_audio">Âm thanh</string>
-    <string name="pref_header_lockscreen">Màn hình khóa</string>
+    <string name="pref_header_lock_screen">Màn hình khóa</string>
     <string name="pref_header_notification">Thông báo</string>
-    <string name="pref_title_app_shortcuts">Màu sắc biểu tượng ứng dụng</string>
-    <string name="pref_title_album_art_on_lockscreen">Hiện bìa album</string>
-    <string name="pref_title_blurred_album_art">Làm mờ bìa album</string>
+    <string name="pref_title_colored_shortcuts">Màu sắc biểu tượng ứng dụng</string>
+    <string name="pref_title_show_album_art">Hiện bìa album</string>
+    <string name="pref_title_blur_album_art">Làm mờ bìa album</string>
     <string name="pref_title_colored_notification">Màu thông báo</string>
     <string name="pref_title_classic_notification">Thiết kế thông báo cổ điển</string>
     <string name="pref_title_audio_ducking">Giảm âm lượng khi mất tập trung</string>
@@ -70,21 +70,21 @@
     <string name="rename_action">Đổi tên</string>
     <string name="create_action">Tạo</string>
     <string name="x_selected">Đã chọn %1$d</string>
-    <string name="primary_color">Màu chính</string>
-    <string name="accent_color">Màu phụ</string>
-    <string name="primary_color_desc">Màu sắc chính, mặc định là màu chàm.</string>
-    <string name="accent_color_desc">Màu sắc chủ đề, mặc định là màu hồng.</string>
+    <string name="pref_title_primary_color">Màu chính</string>
+    <string name="pref_title_accent_color">Màu phụ</string>
+    <string name="pref_summary_primary_color">Màu sắc chính, mặc định là màu chàm.</string>
+    <string name="pref_summary_accent_color">Màu sắc chủ đề, mặc định là màu hồng.</string>
     <string name="no_playlists">Không có danh sách nhạc</string>
     <string name="no_albums">Không có album</string>
     <string name="no_songs">Không có bài hát</string>
     <string name="no_artists">Không có nghệ sĩ</string>
     <string name="empty">Trống</string>
     <string name="song">Bài hát</string>
-    <string name="pref_summary_album_art_on_lockscreen">Sử dụng bìa album các bài hát hiện tại làm hình nền màn hình khóa.</string>
-    <string name="pref_summary_blurred_album_art">Làm mờ bìa album trên màn hình khóa. Có thể gây ra vấn đề với các ứng dụng của bên thứ ba và các tiện ích (widget).</string>
+    <string name="pref_summary_show_album_art">Sử dụng bìa album các bài hát hiện tại làm hình nền màn hình khóa.</string>
+    <string name="pref_summary_blur_album_art">Làm mờ bìa album trên màn hình khóa. Có thể gây ra vấn đề với các ứng dụng của bên thứ ba và các tiện ích (widget).</string>
     <string name="pref_summary_classic_notification">Sử dụng thiết kế thông báo cổ điển.</string>
     <string name="pref_summary_colored_notification">"M\u00e0u s\u1eafc r\u1ef1c r\u1ee1 cho c\u00e1c th\u00f4ng b\u00e1o trong b\u00eca album."</string>
-    <string name="pref_summary_colored_app_shortcuts">Màu sắc chủ đạo của biểu tượng ứng dụng.</string>
+    <string name="pref_summary_colored_shortcuts">Màu sắc chủ đạo của biểu tượng ứng dụng.</string>
     <string name="pref_summary_audio_ducking">Thông báo, điều hướng, vv.</string>
     <string name="last_added">Được thêm sau cùng</string>
     <string name="my_top_tracks">Bài hát hàng đầu</string>
@@ -114,7 +114,7 @@
     <string name="aleksandar_tesic_summary">Vì đã giúp tôi thiết kế.</string>
     <string name="website">Trang web</string>
     <string name="up_next">Tiếp theo</string>
-    <string name="pref_title_now_playing_screen_appearance">Giao diện</string>
+    <string name="pref_title_now_playing_appearance">Giao diện</string>
     <string name="login">Tài khoản GitHub</string>
     <string name="username">Tên người dùng</string>
     <string name="password">Mật khẩu</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 65cf7ab8..5e2f5d74 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -57,28 +57,28 @@
     <string name="dark_theme_name">暗色</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_title_theme">全局主题</string>
     <string name="pref_header_audio">声音</string>
     <string name="pref_header_library">媒体库</string>
-    <string name="pref_header_lockscreen">锁屏</string>
+    <string name="pref_header_lock_screen">锁屏</string>
     <string name="pref_header_notification">通知</string>
-    <string name="pref_title_app_shortcuts">着色应用快捷方式</string>
-    <string name="pref_title_album_art_on_lockscreen">显示专辑封面</string>
-    <string name="pref_title_blurred_album_art">专辑封面模糊化</string>
+    <string name="pref_title_colored_shortcuts">着色应用快捷方式</string>
+    <string name="pref_title_show_album_art">显示专辑封面</string>
+    <string name="pref_title_blur_album_art">专辑封面模糊化</string>
     <string name="pref_title_colored_notification">启用通知背景着色</string>
     <string name="pref_title_classic_notification">经典通知样式</string>
     <string name="pref_title_audio_ducking">音频焦点丢失时降低音量</string>
-    <string name="pref_title_remember_last_tab">记住最后打开页面</string>
+    <string name="pref_title_remember_tab">记住最后打开页面</string>
     <string name="delete_action">删除</string>
     <string name="remove_action">移除</string>
     <string name="rename_action">重命名</string>
     <string name="create_action">创建</string>
     <string name="reset_action">重置</string>
     <string name="x_selected">已选择 %1$d</string>
-    <string name="primary_color">主色调</string>
-    <string name="accent_color">强调色</string>
-    <string name="primary_color_desc">主题主色调，默认为靛蓝色。</string>
-    <string name="accent_color_desc">主题强调色，默认为粉色。</string>
+    <string name="pref_title_primary_color">主色调</string>
+    <string name="pref_title_accent_color">强调色</string>
+    <string name="pref_summary_primary_color">主题主色调，默认为靛蓝色。</string>
+    <string name="pref_summary_accent_color">主题强调色，默认为粉色。</string>
     <string name="no_playlists">没有播放列表</string>
     <string name="no_albums">没有专辑</string>
     <string name="no_songs">没有歌曲</string>
@@ -86,13 +86,13 @@
     <string name="no_genres">没有流派</string>
     <string name="empty">空</string>
     <string name="song">歌曲</string>
-    <string name="pref_summary_album_art_on_lockscreen">使用当前播放曲目的专辑封面作为锁屏壁纸。</string>
-    <string name="pref_summary_blurred_album_art">模糊化显示锁屏界面内的专辑封面。此功能或与第三方应用及桌面插件产生冲突。</string>
+    <string name="pref_summary_show_album_art">使用当前播放曲目的专辑封面作为锁屏壁纸。</string>
+    <string name="pref_summary_blur_album_art">模糊化显示锁屏界面内的专辑封面。此功能或与第三方应用及桌面插件产生冲突。</string>
     <string name="pref_summary_classic_notification">使用经典通知样式。</string>
     <string name="pref_summary_colored_notification">"\u4f7f\u7528\u4e0e\u4e13\u8f91\u5c01\u9762\u76f8\u5339\u914d\u7684\u989c\u8272\u7740\u8272\u901a\u77e5\u80cc\u666f\u8272\u3002"</string>
-    <string name="pref_summary_colored_app_shortcuts">用主色调着色应用快捷方式。</string>
+    <string name="pref_summary_colored_shortcuts">用主色调着色应用快捷方式。</string>
     <string name="pref_summary_audio_ducking">通知、导航等</string>
-    <string name="pref_summary_remember_last_tab">启动时跳转到最后打开页面</string>
+    <string name="pref_summary_remember_tab">启动时跳转到最后打开页面</string>
     <string name="last_added">最近添加</string>
     <string name="my_top_tracks">最喜爱的歌曲</string>
     <string name="action_sleep_timer">睡眠定时器</string>
@@ -121,7 +121,7 @@
     <string name="aleksandar_tesic_summary">在设计风格上的帮助。</string>
     <string name="website">网站</string>
     <string name="up_next">即将播放</string>
-    <string name="pref_title_now_playing_screen_appearance">外观</string>
+    <string name="pref_title_now_playing_appearance">外观</string>
     <string name="login">登录</string>
     <string name="username">用户名</string>
     <string name="password">密码</string>
@@ -130,8 +130,8 @@
     <string name="playing_notification_name">正在播放通知</string>
     <string name="eugene_cheung_summary">因他对源代码的贡献。</string>
     <string name="adrian_summary">以新增专辑封面设计。</string>
-    <string name="library_categories">媒体库类别</string>
-    <string name="pref_summary_library_categories">配置媒体库类别可见性和顺序。</string>
+    <string name="pref_title_categories">媒体库类别</string>
+    <string name="pref_summary_categories">配置媒体库类别可见性和顺序。</string>
     <string name="you_have_to_select_at_least_one_category">您必需选择至少一个类别。</string>
     <string name="action_sort_order">排序方式</string>
     <string name="sort_order_ascending">按首字符（正序）</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b2fe2cc7..5e8bd63a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -58,18 +58,18 @@
     <string name="dark_theme_name">暗沉</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_title_theme">主題</string>
     <string name="pref_header_audio">音訊</string>
     <string name="pref_header_library">音樂庫</string>
-    <string name="pref_header_lockscreen">鎖定螢幕</string>
+    <string name="pref_header_lock_screen">鎖定螢幕</string>
     <string name="pref_header_notification">通知</string>
-    <string name="pref_title_app_shortcuts">彩色的應用快捷方式</string>
-    <string name="pref_title_album_art_on_lockscreen">顯示專輯封面</string>
-    <string name="pref_title_blurred_album_art">將專輯圖片模糊化</string>
+    <string name="pref_title_colored_shortcuts">彩色的應用快捷方式</string>
+    <string name="pref_title_show_album_art">顯示專輯封面</string>
+    <string name="pref_title_blur_album_art">將專輯圖片模糊化</string>
     <string name="pref_title_colored_notification">彩色的狀態列</string>
     <string name="pref_title_classic_notification">經典通知樣式</string>
     <string name="pref_title_audio_ducking">在焦點音訊響起時降低音量</string>
-    <string name="pref_title_remember_last_tab">記住最後開啟的頁面</string>
+    <string name="pref_title_remember_tab">記住最後開啟的頁面</string>
     <string name="pref_title_remember_shuffle">記住隨機播放</string>
     <string name="delete_action">刪除</string>
     <string name="remove_action">移除</string>
@@ -77,10 +77,10 @@
     <string name="create_action">建立</string>
     <string name="reset_action">重設</string>
     <string name="x_selected">已選取 %1$d 個</string>
-    <string name="primary_color">主色調</string>
-    <string name="accent_color">重點色調</string>
-    <string name="primary_color_desc">主色調，預設為靛青色。</string>
-    <string name="accent_color_desc">重點色調，預設為粉紅色。</string>
+    <string name="pref_title_primary_color">主色調</string>
+    <string name="pref_title_accent_color">重點色調</string>
+    <string name="pref_summary_primary_color">主色調，預設為靛青色。</string>
+    <string name="pref_summary_accent_color">重點色調，預設為粉紅色。</string>
     <string name="no_playlists">沒有播放清單</string>
     <string name="no_albums">沒有專輯</string>
     <string name="no_songs">沒有歌曲</string>
@@ -88,13 +88,13 @@
     <string name="no_genres">沒有類型</string>
     <string name="empty">空的</string>
     <string name="song">歌曲</string>
-    <string name="pref_summary_album_art_on_lockscreen">將播放中歌曲的專輯封面設為鎖定螢幕背景。</string>
-    <string name="pref_summary_blurred_album_art">在鎖定畫面上模糊化專輯圖片。第三方程式和小工具可能不正常運作。</string>
+    <string name="pref_summary_show_album_art">將播放中歌曲的專輯封面設為鎖定螢幕背景。</string>
+    <string name="pref_summary_blur_album_art">在鎖定畫面上模糊化專輯圖片。第三方程式和小工具可能不正常運作。</string>
     <string name="pref_summary_classic_notification">使用經典通知樣式</string>
     <string name="pref_summary_colored_notification">"\u72c0\u614b\u5217\u984f\u8272\u8207\u5c08\u8f2f\u5716\u7247\u984f\u8272\u4e00\u81f4"</string>
-    <string name="pref_summary_colored_app_shortcuts">將主色調設為應用快捷方式的顏色</string>
+    <string name="pref_summary_colored_shortcuts">將主色調設為應用快捷方式的顏色</string>
     <string name="pref_summary_audio_ducking">通知鈴聲、導航語音等。</string>
-    <string name="pref_summary_remember_last_tab">開啟時顯示最後使用的頁面</string>
+    <string name="pref_summary_remember_tab">開啟時顯示最後使用的頁面</string>
     <string name="pref_summary_remember_shuffle">當選擇新歌曲列表時維持隨機播放模式</string>
     <string name="last_added">最後新增</string>
     <string name="my_top_tracks">我的最佳單曲</string>
@@ -124,7 +124,7 @@
     <string name="aleksandar_tesic_summary">幫助我做 UI 設計</string>
     <string name="website">網站</string>
     <string name="up_next">播放佇列：即將播放</string>
-    <string name="pref_title_now_playing_screen_appearance">外觀</string>
+    <string name="pref_title_now_playing_appearance">外觀</string>
     <string name="login">登入</string>
     <string name="username">帳號</string>
     <string name="password">密碼</string>
@@ -133,8 +133,8 @@
     <string name="playing_notification_name">播放中通知</string>
     <string name="eugene_cheung_summary">原始碼貢獻者</string>
     <string name="adrian_summary">創建專輯頁面</string>
-    <string name="library_categories">音樂庫類別</string>
-    <string name="pref_summary_library_categories">調整音樂庫類別的顯示與排序</string>
+    <string name="pref_title_categories">音樂庫類別</string>
+    <string name="pref_summary_categories">調整音樂庫類別的顯示與排序</string>
     <string name="you_have_to_select_at_least_one_category">你至少要選擇 1 個類別</string>
     <string name="action_sort_order">排列方式</string>
     <string name="sort_order_ascending">升序排列</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77347daa..f9a1c4c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,41 +102,41 @@
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_images">Images</string>
     <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
+    <string name="pref_header_lock_screen">Lock Screen</string>
     <string name="pref_header_notification">Notification</string>
 
-    <string name="direct_play_codecs">Direct Play Codecs</string>
-    <string name="library_categories">Categories</string>
-    <string name="primary_color">Primary Color</string>
-    <string name="accent_color">Accent Color</string>
-    <string name="pref_title_general_theme">Theme</string>
-    <string name="pref_title_now_playing_screen_appearance">Appearance</string>
-    <string name="pref_title_app_shortcuts">Colored Shortcuts</string>
-    <string name="pref_title_album_art_on_lockscreen">Show Album Cover</string>
-    <string name="pref_title_blurred_album_art">Blur Album Cover</string>
+    <string name="pref_title_direct_play_codecs">Direct Play Codecs</string>
+    <string name="pref_title_categories">Categories</string>
+    <string name="pref_title_primary_color">Primary Color</string>
+    <string name="pref_title_accent_color">Accent Color</string>
+    <string name="pref_title_theme">Theme</string>
+    <string name="pref_title_now_playing_appearance">Appearance</string>
+    <string name="pref_title_colored_shortcuts">Colored Shortcuts</string>
+    <string name="pref_title_show_album_art">Show Album Cover</string>
+    <string name="pref_title_blur_album_art">Blur Album Cover</string>
     <string name="pref_title_transcode_codec">Transcode Codec</string>
     <string name="pref_title_maximum_bitrate">Maximum Bitrate</string>
     <string name="pref_title_classic_notification">Classic Design</string>
     <string name="pref_title_colored_notification">Colored Notification</string>
     <string name="pref_title_audio_ducking">Audio Ducking</string>
-    <string name="pref_title_remember_last_tab">Remember Tab</string>
+    <string name="pref_title_remember_tab">Remember Tab</string>
     <string name="pref_title_remember_shuffle">Remember Shuffle</string>
     <string name="pref_title_remember_queue">Remember Queue</string>
     <string name="pref_title_page_size">Page Size</string>
     <string name="pref_title_image_cache_size">Cache Size</string>
 
-    <string name="primary_color_desc">The primary theme color for control elements.</string>
-    <string name="accent_color_desc">An alternate color used to accent elements.</string>
-    <string name="pref_summary_album_art_on_lockscreen">Uses the current song\'s album cover as the lock screen wallpaper.</string>
-    <string name="pref_summary_blurred_album_art">Blurs the album cover on the lock screen. This can cause problems with third party apps and widgets.</string>
+    <string name="pref_summary_primary_color">The primary theme color for control elements.</string>
+    <string name="pref_summary_accent_color">An alternate color used to accent elements.</string>
+    <string name="pref_summary_show_album_art">Uses the current song\'s album cover as the lock screen wallpaper.</string>
+    <string name="pref_summary_blur_album_art">Blurs the album cover on the lock screen. This can cause problems with third party apps and widgets.</string>
     <string name="pref_summary_classic_notification">Use the classic notification design.</string>
     <string name="pref_summary_colored_notification">"Colors the notification with a vibrant color taken from the album cover."</string>
     <string name="pref_summary_audio_ducking">Decrease the volume for notifications and other system sounds.</string>
     <string name="pref_summary_remember_shuffle">Shuffle mode will stay on when selecting a new list of songs for the queue.</string>
     <string name="pref_summary_remember_queue">Save the queue when closing the app so it can persist across sessions.</string>
-    <string name="pref_summary_colored_app_shortcuts">Colors the app shortcuts in the primary color.</string>
-    <string name="pref_summary_remember_last_tab">Go to the last opened tab on launch.</string>
-    <string name="pref_summary_library_categories">Configure visibility and order of display categories.</string>
+    <string name="pref_summary_colored_shortcuts">Colors the app shortcuts in the primary color.</string>
+    <string name="pref_summary_remember_tab">Go to the last opened tab on launch.</string>
+    <string name="pref_summary_categories">Configure visibility and order of display categories.</string>
     <string name="pref_summary_direct_play_codecs">Disable direct play codecs to force transcoding.</string>
 
     <string name="delete_action">Delete</string>
diff --git a/app/src/main/res/xml/pref_interface.xml b/app/src/main/res/xml/pref_interface.xml
index c588cbb1..5c0858ab 100644
--- a/app/src/main/res/xml/pref_interface.xml
+++ b/app/src/main/res/xml/pref_interface.xml
@@ -11,28 +11,28 @@
             android:key="general_theme"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
-            android:title="@string/pref_title_general_theme" />
+            android:title="@string/pref_title_theme" />
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEColorPreference
             app:iconSpaceReserved="false"
             android:key="primary_color"
             android:persistent="false"
-            android:summary="@string/primary_color_desc"
-            android:title="@string/primary_color" />
+            android:summary="@string/pref_summary_primary_color"
+            android:title="@string/pref_title_primary_color" />
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEColorPreference
             app:iconSpaceReserved="false"
             android:key="accent_color"
             android:persistent="false"
-            android:summary="@string/accent_color_desc"
-            android:title="@string/accent_color" />
+            android:summary="@string/pref_summary_accent_color"
+            android:title="@string/pref_title_accent_color" />
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             app:iconSpaceReserved="false"
             android:defaultValue="true"
             android:key="colored_shortcuts"
-            android:summary="@string/pref_summary_colored_app_shortcuts"
-            android:title="@string/pref_title_app_shortcuts" />
+            android:summary="@string/pref_summary_colored_shortcuts"
+            android:title="@string/pref_title_colored_shortcuts" />
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_library.xml b/app/src/main/res/xml/pref_library.xml
index c5d62097..0d54090d 100644
--- a/app/src/main/res/xml/pref_library.xml
+++ b/app/src/main/res/xml/pref_library.xml
@@ -6,8 +6,8 @@
         <com.dkanada.gramophone.preferences.CategoryPreference
             app:iconSpaceReserved="false"
             android:key="library_categories"
-            android:summary="@string/pref_summary_library_categories"
-            android:title="@string/library_categories" />
+            android:summary="@string/pref_summary_categories"
+            android:title="@string/pref_title_categories" />
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
             app:iconSpaceReserved="false"
@@ -23,8 +23,8 @@
             app:iconSpaceReserved="false"
             android:defaultValue="true"
             android:key="remember_last_tab"
-            android:summary="@string/pref_summary_remember_last_tab"
-            android:title="@string/pref_title_remember_last_tab" />
+            android:summary="@string/pref_summary_remember_tab"
+            android:title="@string/pref_title_remember_tab" />
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_lock_screen.xml b/app/src/main/res/xml/pref_lock_screen.xml
index 46644d96..92ea22e4 100644
--- a/app/src/main/res/xml/pref_lock_screen.xml
+++ b/app/src/main/res/xml/pref_lock_screen.xml
@@ -1,22 +1,22 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/pref_header_lockscreen">
+    <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/pref_header_lock_screen">
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             app:iconSpaceReserved="false"
             android:defaultValue="true"
             android:key="album_art_on_lockscreen"
-            android:summary="@string/pref_summary_album_art_on_lockscreen"
-            android:title="@string/pref_title_album_art_on_lockscreen" />
+            android:summary="@string/pref_summary_show_album_art"
+            android:title="@string/pref_title_show_album_art" />
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             app:iconSpaceReserved="false"
             android:defaultValue="false"
             android:dependency="album_art_on_lockscreen"
             android:key="blurred_album_art"
-            android:summary="@string/pref_summary_blurred_album_art"
-            android:title="@string/pref_title_blurred_album_art" />
+            android:summary="@string/pref_summary_blur_album_art"
+            android:title="@string/pref_title_blur_album_art" />
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_now_playing.xml b/app/src/main/res/xml/pref_now_playing.xml
index 81c270e2..a1a5bc67 100644
--- a/app/src/main/res/xml/pref_now_playing.xml
+++ b/app/src/main/res/xml/pref_now_playing.xml
@@ -7,7 +7,7 @@
         <com.dkanada.gramophone.preferences.NowPlayingScreenPreference
             app:iconSpaceReserved="false"
             android:key="now_playing_screen"
-            android:title="@string/pref_title_now_playing_screen_appearance" />
+            android:title="@string/pref_title_now_playing_appearance" />
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_playback.xml b/app/src/main/res/xml/pref_playback.xml
index eeb7926d..bc060b66 100644
--- a/app/src/main/res/xml/pref_playback.xml
+++ b/app/src/main/res/xml/pref_playback.xml
@@ -18,7 +18,7 @@
             app:iconSpaceReserved="false"
             android:key="direct_play_codecs"
             android:summary="@string/pref_summary_direct_play_codecs"
-            android:title="@string/direct_play_codecs" />
+            android:title="@string/pref_title_direct_play_codecs" />
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
             app:iconSpaceReserved="false"