diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 99b28a019..b546f5217 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Info namespace | App labels -->
+    <string name="info_app_desc">Ein einfacher und flexibeler Musik-Player für Android</string>
+    <string name="info_channel_name">Musikwiedergabe</string>
+    <string name="info_service_desc">der Musikwiedergabe-Service von Auxio</string>
+
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Wieder Versuchen</string>
     <string name="label_grant">Gewähren</string>
+
     <string name="label_library">Bibliothek</string>
     <string name="label_genres">Genres</string>
     <string name="label_artists">Künstler</string>
     <string name="label_albums">Alben</string>
     <string name="label_songs">Lieder</string>
     <string name="label_all_songs">Alle Lieder</string>
+
     <string name="label_search">Suchen</string>
     <string name="label_filter">Filtern</string>
     <string name="label_filter_all">Alles</string>
+
     <string name="label_sort">Sortierung</string>
     <string name="label_sort_none">Standard</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_playback">Aktuelle Wiedergabe</string>
+
     <string name="label_play">Abspielen</string>
     <string name="label_shuffle">Zufällig</string>
+    <string name="label_play_all_songs">Von alle Lieder abspielen</string>
+    <string name="label_play_album">Vom Album abspielen</string>
     <string name="label_play_artist">Vom Künstler abspielen</string>
-    <string name="label_go_artist">Zum Künstler gehen</string>
-    <string name="label_go_album">Zum Album gehen</string>
+    <string name="label_play_genre">Vom Genre abspielen</string>
+    <string name="label_playback">Aktuelle Wiedergabe</string>
+
     <string name="label_queue">Warteschlange</string>
     <string name="label_queue_add">Zur Warteschlange hinzufügen</string>
     <string name="label_queue_added">Der Warteschlange hinzugefügt</string>
     <string name="label_next_user_queue">Nächsten im Warteschlange</string>
+
+    <string name="label_go_artist">Zum Künstler gehen</string>
+    <string name="label_go_album">Zum Album gehen</string>
+
     <string name="label_about">Über</string>
     <string name="label_version">Version</string>
     <string name="label_code">Auf GitHub ansehen</string>
-    <string name="label_licenses">Lizenzen</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Lizenzen</string>
+    <string name="label_author">Entwickelt von OxygenCobalt</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Einstellungen</string>
+
     <string name="setting_ui">Aussehen</string>
     <string name="setting_theme">Theme</string>
     <string name="setting_theme_auto">Automatisch</string>
@@ -38,30 +58,73 @@
     <string name="setting_theme_night">Dunkel</string>
     <string name="setting_accent">Akzentfarbe</string>
     <string name="setting_accent_unknown">Unbekannte Akzentfarbe</string>
+
     <string name="setting_display">Anzeige</string>
     <string name="setting_lib_display">Musikbibliothek-Items</string>
     <string name="setting_color_notif">Benachrichtigung farblich anpassen</string>
+    <string name="setting_color_desc">Albumcover am Benachrichtigung zeigen</string>
     <string name="setting_show_covers">Albumcover anzeigen</string>
-    <string name="setting_playback_audio_focus">Audiofokus</string>
-    <string name="setting_playback_plug_mgt">Kopfhöreranschluss</string>
-    <string name="setting_behavior_end_loop">Weiderholen</string>
-    <string name="setting_behavior_end_stop">Halten</string>
-    <string name="setting_behavior_end_loop_pause">Weiderholen und Pausieren</string>
+    <string name="setting_show_covers_desc">Ausschalten zu Speicherverbrauch sparen</string>
     <string name="setting_quality_covers">MediaStore Cover ignorieren</string>
-    <string name="setting_playback">Audio</string>
+    <string name="setting_quality_covers_desc">Verbesst die Albumcover Qualität, jedoch die Ladezeit und höher Speicherverbrauch beeinträchtigt</string>
+    <string name="setting_use_alt_action">Ändere Aktionstaste verwenden</string>
+    <string name="setting_use_alt_loop">Wiederholen-Aktionstaste Vorziehen</string>
+    <string name="setting_use_alt_shuffle">Zufällig-Aktionstaste Vorziehen</string>
+
+    <string name="setting_audio">Audio</string>
+    <string name="setting_audio_focus">Audiofokus</string>
+    <string name="setting_audio_focus_desc">Pausieren wenn anderes Audio abspielt [Bsp. Alarme]</string>
+    <string name="setting_audio_plug_mgt">Kopfhöreranschluss</string>
+    <string name="setting_audio_plug_mgt_desc">Abspielen/Pausieren wenn der Kopfhöreranschluss ändern</string>
+
     <string name="setting_behavior">Verhalten</string>
     <string name="setting_behavior_song_playback_mode">Wenn ein Lied ausgewählt hat</string>
     <string name="setting_behavior_at_end">Wenn eine Abspielliste zu Ende ist</string>
+    <string name="setting_behavior_end_loop">Weiderholen</string>
+    <string name="setting_behavior_end_stop">Halten</string>
+    <string name="setting_behavior_end_loop_pause">Weiderholen und Pausieren</string>
     <string name="setting_behavior_keep_shuffle">Shuffle-Einstellung merken</string>
+    <string name="setting_behavior_keep_shuffle_desc">Lassen Zufällig an, wenn ein neues Lied anspielen</string>
+    <string name="setting_behavior_rewind_prev">Zurückspulen, bevor zurück springen</string>
+    <string name="setting_behavior_rewind_prev_desc">Zurückspulen, bevor zum vorheriger Lied springen</string>
+
+    <!-- Error Namespace | Error Labels -->
+    <string name="error_no_music">Keine Musik gefunden</string>
     <string name="error_music_load_failed">Laden die Musik fehlgeschlagen</string>
+    <string name="error_no_perms">Auxio braucht Berechtigung, zu lesen deine Musikbibliothek</string>
     <string name="error_no_browser">Link könnte nicht geöffnet werden</string>
+
+    <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Durchsuche deine Musikbibliothek…</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_album_cover">Albumcover für %s</string>
     <string name="description_artist_image">Künstlerbild für %s</string>
     <string name="description_genre_image">Genrebild für %s</string>
     <string name="description_track_number">Titel %d</string>
     <string name="description_error">Fehler</string>
+    <string name="description_sort_button">Reihenfolge ändern</string>
+    <string name="description_sort_none">Standard Reihenfolge</string>
+    <string name="description_sort_alpha_down">von A bis Z sortieren</string>
+    <string name="description_sort_alpha_up">von Z bis A sortieren</string>
+    <string name="description_clear_user_queue">Warteschlange entleeren</string>
+    <string name="description_play">Abspielen</string>
+    <string name="description_pause">Pausieren</string>
+    <string name="description_skip_prev">Zu letzter Lied springen</string>
+    <string name="description_skip_next">Zu nächster Lied springen</string>
+    <string name="description_shuffle_on">Zufällig anschalten</string>
+    <string name="description_shuffle_off">Zufällig ausschalten</string>
+    <string name="description_change_loop">Art die Wiederholung ändern</string>
+    <string name="description_auxio_icon">Auxio-Icon</string>
+    <string name="description_search_clear">Suchanfrage Löschen</string>
+
+    <!-- Placeholder Namespace | Placeholder values -->
+    <string name="placeholder_genre">Unbekanntes Genre</string>
+    <string name="placeholder_artist">Unbekannter Künstler</string>
+    <string name="placeholder_album">Unbekanntes Album</string>
     <string name="placeholder_no_date">Kein Datum</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Rot</string>
     <string name="color_label_pink">Rosa</string>
     <string name="color_label_purple">Lila</string>
@@ -82,45 +145,11 @@
     <string name="color_label_grey">Grau</string>
     <string name="color_label_blue_grey">Blaugrau</string>
     <string name="color_label_neutral">Neutral</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_next_from">Nächsten von: %s</string>
-    <string name="info_channel_name">Musikwiedergabe</string>
-    <string name="info_service_desc">der Musikwiedergabe-Service von Auxio</string>
-    <string name="placeholder_genre">Unbekanntes Genre</string>
-    <string name="placeholder_artist">Unbekannter Künstler</string>
-    <string name="placeholder_album">Unbekanntes Album</string>
     <string name="format_songs_loaded">Lieder geladen: %d</string>
-    <string name="label_author">Entwickelt von OxygenCobalt</string>
-    <string name="description_play">Abspielen</string>
-    <string name="description_pause">Pausieren</string>
-    <string name="description_auxio_icon">Auxio-Icon</string>
-    <string name="description_search_clear">"Suchanfrage Löschen "</string>
-    <string name="description_change_loop">Art die Wiederholung ändern</string>
-    <string name="description_shuffle_off">Zufällig ausschalten</string>
-    <string name="description_shuffle_on">Zufällig anschalten</string>
-    <string name="description_skip_prev">Zu letzter Lied springen</string>
-    <string name="description_skip_next">Zu nächster Lied springen</string>
-    <string name="description_clear_user_queue">Warteschlange entleeren</string>
-    <string name="setting_playback_focus_desc">Pausieren wenn anderes Audio abspielt [Bsp. Alarme]</string>
-    <string name="setting_playback_plug_mgt_desc">Abspielen/Pausieren wenn der Kopfhöreranschluss ändern</string>
-    <string name="setting_use_alt_shuffle">Zufällig-Aktionstaste Vorziehen</string>
-    <string name="description_sort_button">Reihenfolge ändern</string>
-    <string name="setting_use_alt_loop">Wiederholen-Aktionstaste Vorziehen</string>
-    <string name="error_no_perms">Auxio braucht Berechtigung, zu lesen deine Musikbibliothek</string>
-    <string name="description_sort_none">Standard Reihenfolge</string>
-    <string name="description_sort_alpha_down">von A bis Z sortieren</string>
-    <string name="description_sort_alpha_up">von Z bis A sortieren</string>
-    <string name="error_no_music">Keine Musik gefunden</string>
-    <string name="label_play_all_songs">Von alle Lieder abspielen</string>
-    <string name="label_play_album">Vom Album abspielen</string>
-    <string name="label_play_genre">Vom Genre abspielen</string>
-    <string name="setting_behavior_rewind_prev_desc">Zurückspulen, bevor zum vorheriger Lied springen</string>
-    <string name="setting_use_alt_action">Ändere Aktionstaste verwenden</string>
-    <string name="setting_behavior_keep_shuffle_desc">Lassen Zufällig an, wenn ein neues Lied anspielen</string>
-    <string name="setting_show_covers_desc">Ausschalten zu Speicherverbrauch sparen</string>
-    <string name="setting_color_desc">Albumcover am Benachrichtigung zeigen</string>
-    <string name="setting_quality_covers_desc">Verbesst die Albumcover Qualität, jedoch die Ladezeit und höher Speicherverbrauch beeinträchtigt</string>
-    <string name="setting_behavior_rewind_prev">Zurückspulen, bevor zurück springen</string>
-    <string name="info_app_desc">Ein einfacher und flexibeler Musik-Player für Android</string>
+
     <plurals name="format_song_count">
         <item quantity="one">%d Lied</item>
         <item quantity="other">%d Lieder</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 71ba37be9..bfef22e08 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,46 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Προσπάθεια εκ νέου</string>
     <string name="label_grant">Χορήγησε</string>
+
     <string name="label_library">Βιβλιοθήκη</string>
     <string name="label_genres">Είδη</string>
     <string name="label_artists">Καλλιτέχνες</string>
-    <string name="label_songs">Τραγούδια</string>
-    <string name="label_all_songs">Τραγούδια</string>
     <string name="label_albums">Άλμπουμ</string>
+    <string name="label_songs">Τραγούδια</string>
+    <string name="label_all_songs">Όλοι Τραγούδια</string>
+
     <string name="label_search">Αναζήτηση</string>
-    <string name="hint_search_library">Αναζήτηση στη βιβλιοθήκη…</string>
     <string name="label_filter">Φίλτρο</string>
     <string name="label_filter_all">Όλα</string>
-    <string name="label_playback">Παίζει τώρα</string>
+
     <string name="label_sort">Σειρά Διάταξης</string>
+    <string name="label_sort_none">Προεπιλεγμένη</string>
+    <string name="label_sort_alpha_down">Α-Ω</string>
+    <string name="label_sort_alpha_up">Ω-Α</string>
+
     <string name="label_play">Αναπαραγωγή</string>
     <string name="label_shuffle">Τυχαία</string>
-    <string name="label_go_artist">Πήγαινε στον καλλιτέχνη</string>
-    <string name="label_go_album">Πήγαινε στο άλμπουμ</string>
+    <string name="label_playback">Παίζει τώρα</string>
+
     <string name="label_queue">Ουρά αναπαραγωγής</string>
     <string name="label_queue_add">Προσθήκη στην ουρά αναπ/γής</string>
-    <string name="description_clear_user_queue">Εκκαθάριση ουράς αναπαραγωγής</string>
-    <string name="description_play">Αναπαραγωγή</string>
-    <string name="description_pause">Παύση</string>
     <string name="label_queue_added">Προστέθηκε ένας τίτλος στην ουρά αναπαραγωγής</string>
     <string name="label_next_user_queue">Επόμενο</string>
+
+    <string name="label_go_artist">Πήγαινε στον καλλιτέχνη</string>
+    <string name="label_go_album">Πήγαινε στο άλμπουμ</string>
+
     <string name="label_about">Σχετικά με</string>
     <string name="label_version">Έκδοση</string>
     <string name="label_code">Δείτε το στο GitHub</string>
-    <string name="label_licenses">Άδειες</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Άδειες</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Ρυθμίσεις</string>
+
     <string name="setting_ui">Εμφάνιση</string>
     <string name="setting_theme">Θέμα</string>
+    <string name="setting_theme_auto">Αυτόματο</string>
     <string name="setting_theme_day">Φωτεινό</string>
     <string name="setting_theme_night">Σκοτεινό</string>
     <string name="setting_accent">Χρώμα χαρακτήρων</string>
+
     <string name="setting_color_notif">Χρωματισμός ειδοποιήσεων</string>
-    <string name="setting_playback">Ήχος</string>
+    <string name="setting_quality_covers">Παράληψη των Media Store εξωφύλλων</string>
+
+    <string name="setting_audio">Ήχος</string>
+
     <string name="setting_behavior">Συμπεριφορά</string>
+    <string name="setting_behavior_end_stop">Διακοπή</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_track_number">Κομμάτι %d</string>
     <string name="description_error">Εμφάνιση σφάλματος</string>
+    <string name="description_clear_user_queue">Εκκαθάριση ουράς αναπαραγωγής</string>
+    <string name="description_play">Αναπαραγωγή</string>
+    <string name="description_pause">Παύση</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Αναζήτηση στη βιβλιοθήκη…</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Κόκκινος</string>
     <string name="color_label_pink">Ροζ</string>
     <string name="color_label_purple">Ερυθροκυανός</string>
@@ -55,7 +81,10 @@
     <string name="color_label_brown">Καφέ</string>
     <string name="color_label_grey">Γκρί</string>
     <string name="color_label_blue_grey">Γαλάζιος Γκρί</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Τραγούδια φορτώθηκε: %d</string>
+
     <plurals name="format_song_count">
         <item quantity="one">%d Τραγούδι</item>
         <item quantity="other">%d Τραγούδια</item>
@@ -65,9 +94,4 @@
         <item quantity="one">%d Άλμπουμ</item>
         <item quantity="other">%d Άλμπουμ</item>
     </plurals>
-    <string name="setting_behavior_end_stop">Διακοπή</string>
-    <string name="label_sort_alpha_down">Α-Ω</string>
-    <string name="label_sort_alpha_up">Ω-Α</string>
-    <string name="label_sort_none">Προεπιλεγμένη</string>
-    <string name="setting_quality_covers">Παράληψη των Media Store εξωφύλλων</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9f20b3213..2e14b1e02 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,51 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Reintentar</string>
     <string name="label_grant">Otorgar</string>
+
     <string name="label_library">Biblioteca</string>
     <string name="label_genres">Géneros</string>
     <string name="label_artists">Artistas</string>
     <string name="label_albums">Álbumes</string>
     <string name="label_songs">Canciones</string>
-    <string name="setting_playback">Audio</string>
-    <string name="setting_playback_audio_focus">Enfoque de audio</string>
-    <string name="label_all_songs">Canciones</string>
+    <string name="label_all_songs">Canciones Todos</string>
+
     <string name="label_search">Buscar</string>
     <string name="label_filter">Filtro</string>
     <string name="label_filter_all">Todo</string>
+
     <string name="label_sort">Ordenamiento</string>
     <string name="label_sort_none">Predefinido</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_playback">Reproducción actual</string>
+
     <string name="label_play">Reproducir</string>
     <string name="label_shuffle">Aleatorio</string>
-    <string name="label_go_artist">Ir al artista</string>
-    <string name="label_go_album">Ir al álbum</string>
-    <string name="label_queue_add">Agregar a la cola</string>
+    <string name="label_playback">Reproducción actual</string>
+
     <string name="label_queue">Cola</string>
+    <string name="label_queue_add">Agregar a la cola</string>
     <string name="label_queue_added">Agregada a la cola</string>
     <string name="label_next_user_queue">A continuación</string>
+
+    <string name="label_go_artist">Ir al artista</string>
+    <string name="label_go_album">Ir al álbum</string>
+
     <string name="label_about">Acerca de</string>
     <string name="label_version">Versión</string>
     <string name="label_code">Ver en GitHub</string>
-    <string name="label_licenses">Licencias</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Licencias</string>
+    <string name="label_author">Desarrollado por OxygenCobalt</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Preferencias</string>
+
     <string name="setting_ui">Apariencia</string>
     <string name="setting_theme">Tema</string>
     <string name="setting_theme_auto">Automático</string>
     <string name="setting_theme_day">Claro</string>
     <string name="setting_theme_night">Oscuro</string>
     <string name="setting_accent">Acento</string>
+
     <string name="setting_color_notif">Ajustar color de notificación</string>
+    <string name="setting_quality_covers">Ignorar imágenes de la librería del sistema</string>
+
+    <string name="setting_audio">Audio</string>
+    <string name="setting_audio_focus">Enfoque de audio</string>
+    <string name="setting_audio_plug_mgt">Conexión de auriculares</string>
+
     <string name="setting_behavior">Funcionamiento</string>
     <string name="setting_behavior_end_stop">Detener</string>
     <string name="setting_behavior_end_loop">Continuar</string>
     <string name="setting_behavior_end_loop_pause">Continuar y Pausar</string>
+    <string name="setting_behavior_keep_shuffle">Recordar aleatorio</string>
+
+    <!-- Error Namespace | Error Labels -->
+    <string name="error_no_music">No se encontró música</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
+    <string name="description_track_number">Pista %d</string>
+    <string name="description_error">Error</string>
+    <string name="description_clear_user_queue">Vaciar cola de reproducción</string>
     <string name="description_pause">Pausar</string>
     <string name="description_play">Reproducir</string>
-    <string name="description_clear_user_queue">Vaciar cola de reproducción</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Busca en tu biblioteca…</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Rojo</string>
     <string name="color_label_pink">Rosa</string>
     <string name="color_label_purple">Morado</string>
@@ -63,12 +93,9 @@
     <string name="color_label_grey">Gris</string>
     <string name="color_label_blue_grey">Azul Gris</string>
     <string name="color_label_neutral">Neutro</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Canciones encontradas: %d</string>
-    <string name="description_error">Error</string>
-    <string name="description_track_number">Pista %d</string>
-    <string name="error_no_music">No se encontró música</string>
-    <string name="setting_behavior_keep_shuffle">Recordar aleatorio</string>
-    <string name="label_author">Desarrollado por OxygenCobalt</string>
 
     <plurals name="format_song_count">
         <item quantity="one">%d Canción</item>
@@ -79,7 +106,4 @@
         <item quantity="one">%d Álbum</item>
         <item quantity="other">%d Álbumes</item>
     </plurals>
-    <string name="hint_search_library">Busca en tu biblioteca…</string>
-    <string name="setting_playback_plug_mgt">Conexión de auriculares</string>
-    <string name="setting_quality_covers">Ignorar imágenes de la librería del sistema</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d14b62ce6..0d85eec89 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,55 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="label_grant">Accorder</string>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Réessayer</string>
+    <string name="label_grant">Accorder</string>
+
     <string name="label_library">Bibliothèque</string>
     <string name="label_genres">Genres</string>
     <string name="label_artists">Artistes</string>
     <string name="label_albums">Albums</string>
     <string name="label_songs">Titres</string>
+    <string name="label_all_songs">Titres Tous</string>
+
     <string name="label_search">Rechercher</string>
     <string name="label_filter">Filtre</string>
     <string name="label_filter_all">Tout</string>
+
     <string name="label_sort">Ordre de tri</string>
     <string name="label_sort_none">Défaut</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_playback">Lecture en cours</string>
+
     <string name="label_play">Lecture</string>
     <string name="label_shuffle">Aléatoire</string>
+    <string name="label_playback">Lecture en cours</string>
+
+    <string name="label_queue">File d\'attente</string>
+    <string name="label_queue_add">Ajouter à la file d\'attente</string>
+    <string name="label_queue_added">Ajouté à la file d\'attente</string>
+    <string name="label_next_user_queue">Suivant</string>
+
     <string name="label_go_album">Aller à l\'album</string>
     <string name="label_go_artist">Aller à l\'artiste</string>
-    <string name="label_next_user_queue">Suivant</string>
-    <string name="label_queue">File d\\\'attente</string>
+
     <string name="label_about">À propos</string>
     <string name="label_version">Version</string>
     <string name="label_code">Voir sur GitHub</string>
-    <string name="label_licenses">Licences</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Licences</string>
+    <string name="label_author">Développé par OxygenCobalt</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Paramètres</string>
+
     <string name="setting_ui">Apparence</string>
+    <string name="setting_theme">Thème</string>
+    <string name="setting_theme_auto">Automatique</string>
     <string name="setting_theme_day">Clair</string>
     <string name="setting_theme_night">Sombre</string>
-    <string name="setting_theme">Thème</string>
     <string name="setting_accent">Couleur d\'accentuation</string>
+
+    <string name="setting_lib_display">Objets Bibliothèque</string>
     <string name="setting_color_notif">Notification colorée</string>
-    <string name="setting_playback">Audio</string>
-    <string name="setting_playback_audio_focus">Audio Focus</string>
+    <string name="setting_quality_covers">Ignorer le stockage des pochettes</string>
+
+    <string name="setting_audio">Audio</string>
+    <string name="setting_audio_focus">Audio Focus</string>
+    <string name="setting_audio_plug_mgt">Branchement du casque</string>
+
     <string name="setting_behavior">Comportement</string>
-    <string name="error_no_music">Pas de musique trouvée</string>
-    <string name="setting_theme_auto">Automatique</string>
     <string name="setting_behavior_end_stop">Arrêter</string>
     <string name="setting_behavior_end_loop">Continuer</string>
     <string name="setting_behavior_end_loop_pause">Continuer et Pause</string>
+
+    <!-- Error Namespace | Error Labels -->
+    <string name="error_no_music">Pas de musique trouvée</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
+    <string name="description_track_number">Morceau %d</string>
     <string name="description_error">L’erreur</string>
     <string name="description_clear_user_queue">Effacer la file d\'attente</string>
     <string name="description_play">Lecture</string>
     <string name="description_pause">Pause</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Recherche dans votre bibliothèque…</string>
+
+    <!-- Color Label namespace | Accent names -->
+    <string name="color_label_red">Rouge</string>
     <string name="color_label_pink">Rose</string>
-    <string name="color_label_purple">"Violet "</string>
+    <string name="color_label_purple">Violet</string>
     <string name="color_label_indigo">Indigo</string>
     <string name="color_label_blue">Bleu</string>
     <string name="color_label_light_blue">Bleu Clair</string>
+    <string name="color_label_teal">Bleu Vert</string>
     <string name="color_label_green">Vert</string>
     <string name="color_label_light_green">Vert Clair</string>
     <string name="color_label_lime">Vert Citron</string>
@@ -60,12 +93,10 @@
     <string name="color_label_grey">Gris</string>
     <string name="color_label_blue_grey">Bleu Gris</string>
     <string name="color_label_neutral">Neutre</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Titres chargés: %d</string>
-    <string name="label_all_songs">Titres</string>
-    <string name="label_queue_add">Ajouter à la file d\'attente</string>
-    <string name="setting_lib_display">Objets Bibliothèque</string>
-    <string name="color_label_red">Rouge</string>
-    <string name="description_track_number">Morceau %d</string>
+
     <plurals name="format_song_count">
         <item quantity="one">%s Titre</item>
         <item quantity="other">%s Titres</item>
@@ -75,10 +106,4 @@
         <item quantity="one">%s Album</item>
         <item quantity="other">%s Albums</item>
     </plurals>
-    <string name="color_label_teal">Bleu Vert</string>
-    <string name="label_queue_added">Ajouté à la file d\'attente</string>
-    <string name="label_author">Développé par OxygenCobalt</string>
-    <string name="setting_playback_plug_mgt">Branchement du casque</string>
-    <string name="hint_search_library">Recherche dans votre bibliothèque…</string>
-    <string name="setting_quality_covers">Ignorer le stockage des pochettes</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index e3482722d..4e9c01291 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,44 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">फिर से कोशिश करे</string>
     <string name="label_grant">अनुदान</string>
+
     <string name="label_artists">कलाकार</string>
     <string name="label_library">पुस्तकालय</string>
     <string name="label_albums">एल्बम</string>
     <string name="label_songs">गीत</string>
     <string name="label_all_songs">गीत</string>
+
     <string name="label_filter">छलनी</string>
     <string name="label_search">खोजें</string>
     <string name="label_filter_all">सारे</string>
+
     <string name="label_sort">क्रमबद्ध</string>
     <string name="label_sort_none">डिफ़ॉल्ट</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
+
     <string name="label_play">चलाएं</string>
     <string name="label_shuffle">शफ़ल</string>
+
     <string name="label_go_artist">कलाकार पर जाएं</string>
     <string name="label_go_album">एल्बम पर जाएं</string>
+
     <string name="label_queue">पंक्ति</string>
     <string name="label_queue_add">क़तार में जोड़ें</string>
     <string name="label_queue_added">कतार में जोड़ा गया</string>
+
     <string name="label_about">इसके बारे में</string>
     <string name="label_code">GitHub में देखें</string>
-    <string name="label_licenses">लाइसेंस</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">लाइसेंस</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">सेटिंग्स</string>
+
     <string name="setting_theme">थीम</string>
     <string name="setting_theme_auto">सफ़ेद</string>
     <string name="setting_theme_day">गहरा</string>
     <string name="setting_theme_night">स्वचलित</string>
     <string name="setting_accent">एक्सेंट</string>
+
     <string name="setting_color_notif">अधिसूचना को रंग दें</string>
-    <string name="setting_playback">ऑडियो</string>
+
+    <string name="setting_audio">ऑडियो</string>
+    <string name="setting_audio_focus">ऑडियो फोकस</string>
+    <string name="setting_audio_plug_mgt">हेडसेट प्लग</string>
+
     <string name="setting_behavior">चाल चलन</string>
     <string name="setting_behavior_end_loop">जारी</string>
     <string name="setting_behavior_end_stop">बंद</string>
+
+    <!-- Error Namespace | Error Labels -->
+    <string name="error_no_music">कोई संगीत नहीं मिला</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_error">त्रुटी</string>
     <string name="description_play">चलाएं</string>
     <string name="description_pause">रोकें</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">संग्रह में खोजें</string>
+
+    <!-- Color Label namespace | Accent names -->
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <plurals name="format_song_count">
         <item quantity="one">%d गीत</item>
         <item quantity="other">%d गीत</item>
@@ -48,5 +76,4 @@
         <item quantity="one">%d एल्बम</item>
         <item quantity="other">%d एल्बम</item>
     </plurals>
-    <string name="hint_search_library">संग्रह में खोजें</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a29416a51..f225ecf14 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,55 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Riprova</string>
     <string name="label_grant">Permetti</string>
+
     <string name="label_library">Libreria</string>
-    <string name="setting_playback">Audio</string>
     <string name="label_genres">Generi</string>
     <string name="label_artists">Artisti</string>
     <string name="label_albums">Albums</string>
     <string name="label_songs">Canzoni</string>
-    <string name="label_filter_all">Tutto</string>
-    <string name="label_all_songs">Brani</string>
+    <string name="label_all_songs">Brani Tutti</string>
+
     <string name="label_search">Cerca</string>
     <string name="label_filter">Filtra</string>
+    <string name="label_filter_all">Tutto</string>
+
+    <string name="label_sort">Ordine</string>
     <string name="label_sort_none">Predefinito</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_sort">Ordine</string>
-    <string name="label_playback">Schermata di riproduzione</string>
+
     <string name="label_play">Play</string>
-    <string name="description_pause">Pausa</string>
-    <string name="description_play">Play</string>
     <string name="label_shuffle">Casuale</string>
-    <string name="label_go_artist">Vai all\'artista</string>
-    <string name="label_go_album">Vai all\'album</string>
-    <string name="label_queue_add">Aggiungi alla coda</string>
+    <string name="label_playback">Schermata di riproduzione</string>
+
     <string name="label_queue">Coda</string>
+    <string name="label_queue_add">Aggiungi alla coda</string>
     <string name="label_queue_added">Aggiunta alla coda</string>
     <string name="label_next_user_queue">A seguire</string>
+
+    <string name="label_go_artist">Vai all\'artista</string>
+    <string name="label_go_album">Vai all\'album</string>
+
     <string name="label_about">Informazioni</string>
     <string name="label_version">Versione</string>
     <string name="label_code">Mostra su GitHub</string>
-    <string name="label_licenses">Licenze</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Licenze</string>
     <string name="label_author">Sviluppato da OxygenCobalt</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Preferencias</string>
+
     <string name="setting_ui">Aspetto</string>
     <string name="setting_theme">Tema</string>
     <string name="setting_theme_auto">Automatico</string>
     <string name="setting_theme_day">Chiaro</string>
     <string name="setting_theme_night">Scuro</string>
+
     <string name="setting_accent">Accento</string>
     <string name="setting_color_notif">Colora notifica</string>
-    <string name="setting_playback_audio_focus">Focus audio</string>
+    <string name="setting_quality_covers">Ignora le copertine del Media Store</string>
+
+    <string name="setting_audio">Audio</string>
+    <string name="setting_audio_focus">Focus audio</string>
+    <string name="setting_audio_plug_mgt">Inserimento cuffie</string>
+
     <string name="setting_behavior">Comportamento</string>
     <string name="setting_behavior_end_loop">Continua</string>
     <string name="setting_behavior_end_stop">Ferma</string>
     <string name="setting_behavior_end_loop_pause">Continua e Pause</string>
+    <string name="setting_behavior_keep_shuffle">Ricorda casuale</string>
+
+    <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Nessuna canzone trovata</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_track_number">Traccia %d</string>
     <string name="description_error">Errore</string>
     <string name="description_clear_user_queue">Svuota coda</string>
+    <string name="description_play">Play</string>
+    <string name="description_pause">Pausa</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Cerca nella tua libreria…</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Rosso</string>
     <string name="color_label_pink">Rosa</string>
     <string name="color_label_purple">Viola</string>
@@ -67,8 +93,10 @@
     <string name="color_label_grey">Grigio</string>
     <string name="color_label_blue_grey">Azzurro Grigio</string>
     <string name="color_label_neutral">Neutrale</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Brani caricate: %d</string>
-    <string name="setting_behavior_keep_shuffle">Ricorda casuale</string>
+
     <plurals name="format_song_count">
         <item quantity="one">%d Canto</item>
         <item quantity="other">%d Canzoni</item>
@@ -78,7 +106,4 @@
         <item quantity="one">%d Album</item>
         <item quantity="other">%d Albums</item>
     </plurals>
-    <string name="hint_search_library">Cerca nella tua libreria…</string>
-    <string name="setting_playback_plug_mgt">Inserimento cuffie</string>
-    <string name="setting_quality_covers">Ignora le copertine del Media Store</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 761efafe4..5cd473dbc 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,59 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Opnieuw proberen</string>
     <string name="label_grant">Toestaan</string>
+
     <string name="label_library">Bibliotheek</string>
     <string name="label_genres">Genres</string>
     <string name="label_artists">Artiesten</string>
     <string name="label_albums">Albums</string>
     <string name="label_songs">Nummers</string>
     <string name="label_all_songs">Alle Nummers</string>
+
     <string name="label_search">Zoeken</string>
     <string name="label_filter">Filter</string>
     <string name="label_filter_all">Alles</string>
+
     <string name="label_sort">Sorteren</string>
     <string name="label_sort_none">Standaard</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_playback">Afspeelscherm</string>
+
     <string name="label_play">Afspelen</string>
     <string name="label_shuffle">Shuffle</string>
-    <string name="label_go_artist">Ga naar artiest</string>
-    <string name="label_go_album">Ga naar album</string>
+    <string name="label_playback">Afspeelscherm</string>
+
     <string name="label_queue">Wachtrij</string>
     <string name="label_queue_add">Toevoegen aan wachtrij</string>
     <string name="label_queue_added">Toegevoegd aan de wachtrij</string>
     <string name="label_next_user_queue">Als volgende</string>
+
+    <string name="label_go_artist">Ga naar artiest</string>
+    <string name="label_go_album">Ga naar album</string>
+
     <string name="label_about">Over</string>
     <string name="label_version">Versie</string>
     <string name="label_code">Bekijken op GitHub</string>
-    <string name="label_licenses">Licenties</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Licenties</string>
     <string name="label_author">Ontwikkeld door OxygenCobalt</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Instellingen</string>
+
     <string name="setting_ui">Uiterlijk</string>
     <string name="setting_theme">Thema</string>
+    <string name="setting_theme_auto">Automatisch</string>
     <string name="setting_theme_day">Licht</string>
     <string name="setting_theme_night">Donker</string>
-    <string name="setting_theme_auto">Automatisch</string>
     <string name="setting_accent">Accent</string>
+
     <string name="setting_lib_display">Bibliotheek Items</string>
     <string name="setting_color_notif">Notificatie kleur aanpassen</string>
     <string name="setting_quality_covers">Negeer Mediaopslag illustraties</string>
-    <string name="setting_playback">Audio</string>
-    <string name="setting_playback_audio_focus">Audiofocus</string>
-    <string name="setting_playback_plug_mgt">Headset-pluggen</string>
+
+    <string name="setting_audio">Audio</string>
+    <string name="setting_audio_focus">Audiofocus</string>
+    <string name="setting_audio_plug_mgt">Headset-pluggen</string>
+
     <string name="setting_behavior">Gedrag</string>
     <string name="setting_behavior_end_loop">Herhalen</string>
     <string name="setting_behavior_end_stop">Stoppen</string>
     <string name="setting_behavior_end_loop_pause">Herhalen en Pauzeren</string>
+
+    <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Geen muziek aangetroffen</string>
-    <string name="hint_search_library">Zoek in je bibliotheek…</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_track_number">Nummer %d</string>
     <string name="description_error">Fout</string>
     <string name="description_clear_user_queue">Leeg wachtrij</string>
     <string name="description_play">Afspelen</string>
     <string name="description_pause">Pauzeren</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Zoek in je bibliotheek…</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Rood</string>
     <string name="color_label_pink">Roze</string>
     <string name="color_label_purple">Paars</string>
@@ -72,5 +94,17 @@
     <string name="color_label_grey">Grijis</string>
     <string name="color_label_blue_grey">Blauwgrijis</string>
     <string name="color_label_neutral">Neutraal</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Nummers geladen: %d</string>
+
+    <plurals name="format_song_count">
+        <item quantity="one">%d Nummer</item>
+        <item quantity="other">%d Nummers</item>
+    </plurals>
+
+    <plurals name="format_album_count">
+        <item quantity="one">%d Album</item>
+        <item quantity="other">%d Albums</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 32fd0bbdd..adb51b9a2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,56 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Tentar novamente</string>
     <string name="label_grant">Confirmar</string>
+
     <string name="label_library">Biblioteca</string>
     <string name="label_genres">Gêneros</string>
     <string name="label_artists">Artistas</string>
     <string name="label_albums">Álbuns</string>
     <string name="label_songs">Músicas</string>
-    <string name="label_all_songs">Músicas</string>
+    <string name="label_all_songs">Músicas Todo</string>
+
     <string name="label_search">Pesquisar</string>
     <string name="label_filter">Filtro</string>
     <string name="label_filter_all">Tudo</string>
+
     <string name="label_sort">Classificação</string>
     <string name="label_sort_none">Padrão</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_playback">Tocando agora</string>
+
     <string name="label_play">Reproduzir</string>
     <string name="label_shuffle">Embaralhar</string>
-    <string name="label_go_artist">Ir para o artista</string>
-    <string name="label_go_album">Ir para o álbum</string>
+    <string name="label_playback">Tocando agora</string>
+
     <string name="label_queue">Fila</string>
     <string name="label_queue_add">Adicionar à fila</string>
     <string name="label_queue_added">Adicionada à fila</string>
     <string name="label_next_user_queue">Próximo</string>
+
+    <string name="label_go_artist">Ir para o artista</string>
+    <string name="label_go_album">Ir para o álbum</string>
+
     <string name="label_about">Sobre</string>
     <string name="label_version">Versão</string>
     <string name="label_code">Ver no GitHub</string>
+    <string name="label_faq">FAQ</string>
     <string name="label_licenses">Licenças</string>
     <string name="label_author">Desenvolvido por OxygenCobalt</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Configurações</string>
+
     <string name="setting_ui">Aparência</string>
     <string name="setting_theme">Tema</string>
     <string name="setting_theme_auto">Automático</string>
     <string name="setting_theme_day">Claro</string>
     <string name="setting_theme_night">Escuro</string>
     <string name="setting_accent">Cor de destaque</string>
+
     <string name="setting_color_notif">Colorir notificação</string>
-    <string name="setting_playback">Áudio</string>
-    <string name="setting_playback_audio_focus">Foco do áudio</string>
-    <string name="setting_playback_plug_mgt">Entrada do fone de ouvido</string>
+    <string name="setting_quality_covers">Ignorar capas Media Store</string>
+
+    <string name="setting_audio">Áudio</string>
+    <string name="setting_audio_focus">Foco do áudio</string>
+    <string name="setting_audio_plug_mgt">Entrada do fone de ouvido</string>
+
     <string name="setting_behavior">Comportamento</string>
     <string name="setting_behavior_end_loop">Continuar</string>
     <string name="setting_behavior_end_stop">Parar</string>
     <string name="setting_behavior_keep_shuffle">Memorizar aleatorização</string>
+
+    <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Nenhuma música encontrada</string>
-    <string name="hint_search_library">Procurar na biblioteca…</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_track_number">Música %d</string>
     <string name="description_error">Erro</string>
     <string name="description_clear_user_queue">Limpar fila</string>
     <string name="description_play">Reproduzir</string>
     <string name="description_pause">Pausar</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Procurar na biblioteca…</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Vermelho</string>
     <string name="color_label_pink">Rosa</string>
     <string name="color_label_purple">Roxo</string>
@@ -65,7 +89,10 @@
     <string name="color_label_brown">Moreno</string>
     <string name="color_label_grey">Grisalho</string>
     <string name="color_label_blue_grey">Azul-grisalho</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Músicas carregado: %d</string>
+
     <plurals name="format_song_count">
         <item quantity="one">%d Música</item>
         <item quantity="other">%d Músicas</item>
@@ -75,6 +102,4 @@
         <item quantity="one">%d Álbum</item>
         <item quantity="other">%d Álbuns</item>
     </plurals>
-    <string name="setting_quality_covers">Ignorar capas Media Store</string>
-    <string name="label_faq">FAQ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index b07e04d68..712f458f4 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,52 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Tentar novamente</string>
     <string name="label_grant">Permitir</string>
+
     <string name="label_library">Biblioteca</string>
-    <string name="label_queue_add">Adicionar à fila</string>
-    <string name="label_queue_added">Adicionada à fila</string>
-    <string name="label_queue">Fila</string>
     <string name="label_genres">Gêneros</string>
     <string name="label_artists">Artistas</string>
     <string name="label_albums">Álbuns</string>
     <string name="label_songs">Músicas</string>
-    <string name="label_all_songs">Músicas</string>
-    <string name="hint_search_library">Procurar na biblioteca…</string>
-    <string name="label_next_user_queue">A seguir</string>
+    <string name="label_all_songs">Músicas Todo</string>
+
     <string name="label_search">Pesquisar</string>
     <string name="label_filter">Filtrar</string>
     <string name="label_filter_all">Tudo</string>
+
     <string name="label_sort">Classificação</string>
     <string name="label_sort_none">Padrão</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_playback">A reproduzir</string>
+
     <string name="label_play">Reproduzir</string>
     <string name="label_shuffle">Embaralhar</string>
+    <string name="label_playback">A reproduzir</string>
+
+    <string name="label_queue">Fila</string>
+    <string name="label_queue_add">Adicionar à fila</string>
+    <string name="label_queue_added">Adicionada à fila</string>
+    <string name="label_next_user_queue">A seguir</string>
+
     <string name="label_go_artist">Ir para o artista</string>
     <string name="label_go_album">Ir para o álbum</string>
+
+    <string name="label_about">Sobre</string>
+    <string name="label_version">Versão</string>
+    <string name="label_code">Ver no GitHub</string>
+    <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Licenças</string>
     <string name="label_author">Desenvolvido por OxygenCobalt</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Definições</string>
+
     <string name="setting_ui">Aparência</string>
     <string name="setting_theme">Tema</string>
     <string name="setting_theme_day">Claro</string>
     <string name="setting_theme_night">Escuro</string>
     <string name="setting_theme_auto">Automático</string>
     <string name="setting_accent">Cor de realce</string>
+
     <string name="setting_color_notif">Colorir notificação</string>
-    <string name="setting_playback">Áudio</string>
-    <string name="setting_playback_audio_focus">Foco de áudio</string>
-    <string name="setting_playback_plug_mgt">Entrada do fone de ouvido</string>
+    <string name="setting_quality_covers">Ignorar capas Media Store</string>
+
+    <string name="setting_audio">Áudio</string>
+    <string name="setting_audio_focus">Foco de áudio</string>
+    <string name="setting_audio_plug_mgt">Entrada do fone de ouvido</string>
+
     <string name="setting_behavior">Comportamento</string>
     <string name="setting_behavior_end_loop">Continuar</string>
     <string name="setting_behavior_end_stop">Parar</string>
     <string name="setting_behavior_keep_shuffle">Memorizar aleatorização</string>
+
+    <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Nenhuma música encontrada</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_track_number">Música %d</string>
     <string name="description_error">Error</string>
     <string name="description_clear_user_queue">Limpar fila</string>
     <string name="description_play">Reproduzir</string>
     <string name="description_pause">Pausar</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Procurar na biblioteca…</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Vermelho</string>
     <string name="color_label_pink">Rosa</string>
     <string name="color_label_purple">Roxo</string>
@@ -61,11 +89,10 @@
     <string name="color_label_brown">Moreno</string>
     <string name="color_label_grey">Grisalho</string>
     <string name="color_label_blue_grey">Azul-grisalho</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Músicas carregado: %d</string>
-    <string name="label_about">Sobre</string>
-    <string name="label_version">Versão</string>
-    <string name="label_code">Ver no GitHub</string>
-    <string name="label_licenses">Licenças</string>
+
     <plurals name="format_song_count">
         <item quantity="one">%d Música</item>
         <item quantity="other">%d Músicas</item>
@@ -75,6 +102,4 @@
         <item quantity="one">%d Álbum</item>
         <item quantity="other">%d Álbuns</item>
     </plurals>
-    <string name="setting_quality_covers">Ignorar capas Media Store</string>
-    <string name="label_faq">FAQ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 24bef4843..39b97f787 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,55 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Label Namespace | Static Labels -->
     <string name="label_retry">Повторить попытку</string>
     <string name="label_grant">Разрешить</string>
+
     <string name="label_library">Библиотека</string>
     <string name="label_genres">Жанры</string>
     <string name="label_artists">Исполнители</string>
     <string name="label_albums">Альбомы</string>
     <string name="label_songs">Треки</string>
     <string name="label_all_songs">Треки</string>
-    <string name="hint_search_library">Поиск в библиотеке…</string>
+
     <string name="label_search">Поиск</string>
     <string name="label_filter">Фильтр</string>
     <string name="label_filter_all">Всё</string>
+
     <string name="label_sort">Сортировка</string>
     <string name="label_sort_none">По умолчанию</string>
     <string name="label_sort_alpha_down">А-Я</string>
     <string name="label_sort_alpha_up">Я-А</string>
-    <string name="label_playback">Сейчас воспроизводится</string>
+
     <string name="label_play">Воспроизвести</string>
     <string name="label_shuffle">Перемешать</string>
-    <string name="label_go_artist">Перейти к исполнителю</string>
-    <string name="label_go_album">Перейти к альбому</string>
+    <string name="label_playback">Сейчас воспроизводится</string>
+
     <string name="label_queue">Очередь</string>
     <string name="label_queue_add">Добавить в очередь</string>
     <string name="label_queue_added">Добавлена в очередь</string>
     <string name="label_next_user_queue">Далее</string>
+
+    <string name="label_go_artist">Перейти к исполнителю</string>
+    <string name="label_go_album">Перейти к альбому</string>
+
     <string name="label_about">О программе</string>
     <string name="label_version">Версия</string>
     <string name="label_code">Открыть на GitHub</string>
+    <string name="label_faq">FAQ</string>
     <string name="label_licenses">Лицензии</string>
+
+    <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Настройки</string>
+
     <string name="setting_ui">Внешний Вид</string>
     <string name="setting_theme">Тема</string>
-    <string name="setting_theme_night">Темная</string>
-    <string name="setting_theme_day">Светлая</string>
-    <string name="setting_accent">Акцент</string>
     <string name="setting_theme_auto">Автоматически</string>
+    <string name="setting_theme_day">Светлая</string>
+    <string name="setting_theme_night">Темная</string>
+    <string name="setting_accent">Акцент</string>
+
     <string name="setting_color_notif">Цветное уведомление</string>
-    <string name="setting_playback">Аудио</string>
-    <string name="setting_playback_audio_focus">Фокусировка аудио</string>
-    <string name="setting_playback_plug_mgt">Гарнитура</string>
+    <string name="setting_quality_covers">Игнорировать хранилище обложек альбомов</string>
+
+    <string name="setting_audio">Аудио</string>
+    <string name="setting_audio_focus">Фокусировка аудио</string>
+    <string name="setting_audio_plug_mgt">Гарнитура</string>
+
     <string name="setting_behavior">Поведение</string>
     <string name="setting_behavior_end_loop">Продолжить</string>
     <string name="setting_behavior_end_stop">Стоп</string>
     <string name="setting_behavior_keep_shuffle">Запомнить перемешивание</string>
+
+    <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Музыка не найдена</string>
+
+    <!-- Description Namespace | Accessibility Strings -->
     <string name="description_track_number">Трек %d</string>
     <string name="description_error">Ошибка</string>
     <string name="description_clear_user_queue">Очистить очередь</string>
     <string name="description_play">Воспроизвести</string>
     <string name="description_pause">Пауза</string>
+
+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Поиск в библиотеке…</string>
+
+    <!-- Color Label namespace | Accent names -->
     <string name="color_label_red">Расный</string>
     <string name="color_label_pink">Розовый</string>
     <string name="color_label_purple">Пурпурный</string>
@@ -61,7 +85,10 @@
     <string name="color_label_orange">Коричневый</string>
     <string name="color_label_brown">Седой</string>
     <string name="color_label_blue_grey">Нейтральный</string>
+
+    <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Треки загружено: %d</string>
+
     <plurals name="format_song_count">
         <item quantity="one">%d Песня</item>
         <item quantity="few">%d Песни</item>
@@ -75,6 +102,4 @@
         <item quantity="many">%d Альбомов</item>
         <item quantity="other">%d Альбомы</item>
     </plurals>
-    <string name="setting_quality_covers">Игнорировать хранилище обложек альбомов</string>
-    <string name="label_faq">FAQ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49163094c..51ecd834d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,7 +24,6 @@
     <string name="label_sort_none">Default</string>
     <string name="label_sort_alpha_down">A-Z</string>
     <string name="label_sort_alpha_up">Z-A</string>
-    <string name="label_playback">Now Playing</string>
 
     <string name="label_play">Play</string>
     <string name="label_shuffle">Shuffle</string>
@@ -32,69 +31,60 @@
     <string name="label_play_album">Play from album</string>
     <string name="label_play_artist">Play from artist</string>
     <string name="label_play_genre">Play from genre</string>
-
-    <string name="label_go_artist">Go to artist</string>
-    <string name="label_go_album">Go to album</string>
+    <string name="label_playback">Now Playing</string>
 
     <string name="label_queue">Queue</string>
     <string name="label_queue_add">Add to queue</string>
     <string name="label_queue_added">Added to queue</string>
     <string name="label_next_user_queue">Next in Queue</string>
 
+    <string name="label_go_artist">Go to artist</string>
+    <string name="label_go_album">Go to album</string>
+
     <string name="label_about">About</string>
     <string name="label_version">Version</string>
     <string name="label_code">View on Github</string>
-    <string name="label_licenses">Licenses</string>
     <string name="label_faq">FAQ</string>
+    <string name="label_licenses">Licenses</string>
     <string name="label_author">Developed by OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Settings</string>
-    <string name="setting_ui">Appearance</string>
 
+    <string name="setting_ui">Appearance</string>
     <string name="setting_theme">Theme</string>
     <string name="setting_theme_auto">Automatic</string>
     <string name="setting_theme_day">Light</string>
     <string name="setting_theme_night">Dark</string>
-
     <string name="setting_accent">Accent</string>
     <string name="setting_accent_unknown">Unknown Accent</string>
 
     <string name="setting_display">Display</string>
-
     <string name="setting_lib_display">Library Items</string>
-
-    <string name="setting_color_notif">Colorize notification</string>]
+    <string name="setting_color_notif">Colorize notification</string>
     <string name="setting_color_desc">Show album art on notification</string>
-
     <string name="setting_show_covers">Show album covers</string>
     <string name="setting_show_covers_desc">Turn off to save memory usage</string>
-
     <string name="setting_quality_covers">Ignore MediaStore covers</string>
     <string name="setting_quality_covers_desc">Increases the quality of the album covers, but results in longer loading times and higher memory usage</string>
-
     <string name="setting_use_alt_action">Use alternate notification action</string>
     <string name="setting_use_alt_loop">Prefer repeat mode action</string>
     <string name="setting_use_alt_shuffle">Prefer shuffle action</string>
 
-    <string name="setting_playback">Audio</string>
-    <string name="setting_playback_audio_focus">Audio Focus</string>
-    <string name="setting_playback_focus_desc">Pause when other audio plays [ex. Alarms]</string>
-
-    <string name="setting_playback_plug_mgt">Headset plug management</string>
-    <string name="setting_playback_plug_mgt_desc">Play/Pause when the headset connection changes</string>
+    <string name="setting_audio">Audio</string>
+    <string name="setting_audio_focus">Audio Focus</string>
+    <string name="setting_audio_focus_desc">Pause when other audio plays [ex. Alarms]</string>
+    <string name="setting_audio_plug_mgt">Headset plug management</string>
+    <string name="setting_audio_plug_mgt_desc">Play/Pause when the headset connection changes</string>
 
     <string name="setting_behavior">Behavior</string>
     <string name="setting_behavior_song_playback_mode">When a song is selected</string>
-
     <string name="setting_behavior_at_end">When a playlist ends</string>
     <string name="setting_behavior_end_loop">Loop</string>
     <string name="setting_behavior_end_stop">Stop</string>
     <string name="setting_behavior_end_loop_pause">Loop and Pause</string>
-
     <string name="setting_behavior_keep_shuffle">Remember shuffle</string>
     <string name="setting_behavior_keep_shuffle_desc">Keep shuffle on when playing a new song</string>
-
     <string name="setting_behavior_rewind_prev">Rewind before skipping back</string>
     <string name="setting_behavior_rewind_prev_desc">Rewind before skipping to the previous song</string>
 
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index cf52e00ad..bba55b50f 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -70,22 +70,22 @@
 
     <PreferenceCategory
         android:layout="@layout/item_header"
-        android:title="@string/setting_playback">
+        android:title="@string/setting_audio">
 
         <SwitchPreferenceCompat
-            android:title="@string/setting_playback_audio_focus"
+            android:title="@string/setting_audio_focus"
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_AUDIO_FOCUS"
-            app:summary="@string/setting_playback_focus_desc" />
+            app:summary="@string/setting_audio_focus_desc" />
 
         <SwitchPreferenceCompat
-            android:title="@string/setting_playback_plug_mgt"
+            android:title="@string/setting_audio_plug_mgt"
             app:allowDividerBelow="false"
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_PLUG_MGT"
-            app:summary="@string/setting_playback_plug_mgt_desc" />
+            app:summary="@string/setting_audio_plug_mgt_desc" />
 
     </PreferenceCategory>