diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9bca37d0..5a7f18394 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 #### What's New
 - Added basic equalizer support in external apps like Wavelet [#211]
+- Added option to control the type of action shown on the playback bar
 - Detail UI now displays the type of item shown (ex. the release type)
 
 #### What's Improved
diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
index 2485e5654..eb68194b0 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
@@ -344,7 +344,7 @@ class HomeFragment : ViewBindingFragment<FragmentHomeBinding>(), Toolbar.OnMenuI
 
         when (indexing) {
             is Indexer.Indexing.Indeterminate -> {
-                binding.homeIndexingStatus.text = context.getString(R.string.lng_indexing_desc)
+                binding.homeIndexingStatus.text = context.getString(R.string.lng_indexing)
                 binding.homeIndexingProgress.isIndeterminate = true
             }
             is Indexer.Indexing.Songs -> {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicUtil.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicUtil.kt
index ce4cee322..1a56c957e 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicUtil.kt
@@ -36,13 +36,13 @@ fun ContentResolver.queryCursor(
 ) = query(uri, projection, selector, args, null)
 
 /** Shortcut for making a [ContentResolver] query and using the particular cursor with [use]. */
-fun <R> ContentResolver.useQuery(
+inline fun <reified R> ContentResolver.useQuery(
     uri: Uri,
     projection: Array<out String>,
     selector: String? = null,
     args: Array<String>? = null,
     block: (Cursor) -> R
-): R? = queryCursor(uri, projection, selector, args)?.use(block)
+) = queryCursor(uri, projection, selector, args)?.use(block)
 
 /**
  * For some reason the album cover URI namespace does not have a member in [MediaStore], but it
diff --git a/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt b/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt
index 7134d38b6..f2acf3c43 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt
@@ -19,7 +19,6 @@ package org.oxycblt.auxio.music.system
 
 import android.content.Context
 import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
@@ -37,8 +36,8 @@ class IndexingNotification(private val context: Context) :
         setSilent(true)
         setContentIntent(context.newMainPendingIntent())
         setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        setContentTitle(context.getString(R.string.lng_indexing))
-        setContentText(context.getString(R.string.lng_indexing_desc))
+        setContentTitle(context.getString(R.string.lbl_indexing))
+        setContentText(context.getString(R.string.lng_indexing))
         setProgress(0, 0, true)
     }
 
@@ -49,7 +48,7 @@ class IndexingNotification(private val context: Context) :
         when (indexing) {
             is Indexer.Indexing.Indeterminate -> {
                 logD("Updating state to $indexing")
-                setContentText(context.getString(R.string.lng_indexing_desc))
+                setContentText(context.getString(R.string.lng_indexing))
                 setProgress(0, 0, true)
                 return true
             }
@@ -78,8 +77,8 @@ class ObservingNotification(context: Context) : ServiceNotification(context, IND
         setSilent(true)
         setContentIntent(context.newMainPendingIntent())
         setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        setContentTitle(context.getString(R.string.lng_observing))
-        setContentText(context.getString(R.string.lng_observing_desc))
+        setContentTitle(context.getString(R.string.lbl_observing))
+        setContentText(context.getString(R.string.lng_observing))
     }
 
     override val code: Int
@@ -88,6 +87,4 @@ class ObservingNotification(context: Context) : ServiceNotification(context, IND
 
 private val INDEXER_CHANNEL =
     ServiceNotification.ChannelInfo(
-        id = BuildConfig.APPLICATION_ID + ".channel.INDEXER",
-        R.string.info_indexer_channel_name,
-        NotificationManagerCompat.IMPORTANCE_LOW)
+        id = BuildConfig.APPLICATION_ID + ".channel.INDEXER", nameRes = R.string.lbl_indexer)
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainMode.kt b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGain.kt
similarity index 87%
rename from app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainMode.kt
rename to app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGain.kt
index 04c1b05d1..fd73db7f2 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainMode.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGain.kt
@@ -43,3 +43,11 @@ enum class ReplayGainMode {
         }
     }
 }
+
+/** Represents the ReplayGain pre-amp values. */
+data class ReplayGainPreAmp(
+    /** The value to use when ReplayGain tags are present. */
+    val with: Float,
+    /** The value to use when ReplayGain tags are not present. */
+    val without: Float,
+)
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainPreAmp.kt b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainPreAmp.kt
deleted file mode 100644
index 33fb3d412..000000000
--- a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainPreAmp.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2022 Auxio Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package org.oxycblt.auxio.playback.replaygain
-
-/** Represents the ReplayGain pre-amp values. */
-data class ReplayGainPreAmp(
-    /** The value to use when ReplayGain tags are present. */
-    val with: Float,
-    /** The value to use when ReplayGain tags are not present. */
-    val without: Float,
-)
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt
index d25ac9c0a..50984fc64 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt
@@ -24,7 +24,6 @@ import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaSessionCompat
 import androidx.annotation.DrawableRes
 import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
 import androidx.media.app.NotificationCompat.MediaStyle
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.IntegerTable
@@ -146,7 +145,6 @@ class NotificationComponent(private val context: Context, sessionToken: MediaSes
         val CHANNEL_INFO =
             ChannelInfo(
                 id = BuildConfig.APPLICATION_ID + ".channel.PLAYBACK",
-                nameRes = R.string.info_playback_channel_name,
-                importance = NotificationManagerCompat.IMPORTANCE_LOW)
+                nameRes = R.string.lbl_playback)
     }
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt b/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
index 79f3c23e0..aebff02a3 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
@@ -120,7 +120,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
     /** Which action to display on the playback bar. */
     val barAction: BarAction
         get() =
-            BarAction.fromIntCode(inner.getInt(context.getString(R.string.set_key_bar_action), -1))
+            BarAction.fromIntCode(
+                inner.getInt(context.getString(R.string.set_key_bar_action), Int.MIN_VALUE))
                 ?: BarAction.NEXT
 
     /**
@@ -138,7 +139,7 @@ class Settings(private val context: Context, private val callback: Callback? = n
     val replayGainMode: ReplayGainMode
         get() =
             ReplayGainMode.fromIntCode(
-                inner.getInt(context.getString(R.string.set_key_replay_gain), -1))
+                inner.getInt(context.getString(R.string.set_key_replay_gain), Int.MIN_VALUE))
                 ?: ReplayGainMode.OFF
 
     /** The current ReplayGain pre-amp configuration */
@@ -159,7 +160,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
     val libPlaybackMode: PlaybackMode
         get() =
             PlaybackMode.fromInt(
-                inner.getInt(context.getString(R.string.set_key_library_song_playback_mode), -1))
+                inner.getInt(
+                    context.getString(R.string.set_key_library_song_playback_mode), Int.MIN_VALUE))
                 ?: PlaybackMode.ALL_SONGS
 
     /**
@@ -169,7 +171,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
     val detailPlaybackMode: PlaybackMode?
         get() =
             PlaybackMode.fromInt(
-                inner.getInt(context.getString(R.string.set_key_detail_song_playback_mode), -1))
+                inner.getInt(
+                    context.getString(R.string.set_key_detail_song_playback_mode), Int.MIN_VALUE))
 
     /** Whether shuffle should stay on when a new song is selected. */
     val keepShuffle: Boolean
@@ -219,11 +222,14 @@ class Settings(private val context: Context, private val callback: Callback? = n
     /** The current filter mode of the search tab */
     var searchFilterMode: DisplayMode?
         get() =
-            DisplayMode.fromInt(inner.getInt(context.getString(R.string.set_key_search_filter), -1))
+            DisplayMode.fromInt(
+                inner.getInt(context.getString(R.string.set_key_search_filter), Int.MIN_VALUE))
         set(value) {
             logD(value)
             inner.edit {
-                putInt(context.getString(R.string.set_key_search_filter), value?.intCode ?: -1)
+                putInt(
+                    context.getString(R.string.set_key_search_filter),
+                    value?.intCode ?: Int.MIN_VALUE)
                 apply()
             }
         }
@@ -231,7 +237,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
     /** The song sort mode on HomeFragment */
     var libSongSort: Sort
         get() =
-            Sort.fromIntCode(inner.getInt(context.getString(R.string.set_key_lib_songs_sort), -1))
+            Sort.fromIntCode(
+                inner.getInt(context.getString(R.string.set_key_lib_songs_sort), Int.MIN_VALUE))
                 ?: Sort(Sort.Mode.ByName, true)
         set(value) {
             inner.edit {
@@ -243,7 +250,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
     /** The album sort mode on HomeFragment */
     var libAlbumSort: Sort
         get() =
-            Sort.fromIntCode(inner.getInt(context.getString(R.string.set_key_lib_albums_sort), -1))
+            Sort.fromIntCode(
+                inner.getInt(context.getString(R.string.set_key_lib_albums_sort), Int.MIN_VALUE))
                 ?: Sort(Sort.Mode.ByName, true)
         set(value) {
             inner.edit {
@@ -255,7 +263,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
     /** The artist sort mode on HomeFragment */
     var libArtistSort: Sort
         get() =
-            Sort.fromIntCode(inner.getInt(context.getString(R.string.set_key_lib_artists_sort), -1))
+            Sort.fromIntCode(
+                inner.getInt(context.getString(R.string.set_key_lib_artists_sort), Int.MIN_VALUE))
                 ?: Sort(Sort.Mode.ByName, true)
         set(value) {
             inner.edit {
@@ -267,7 +276,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
     /** The genre sort mode on HomeFragment */
     var libGenreSort: Sort
         get() =
-            Sort.fromIntCode(inner.getInt(context.getString(R.string.set_key_lib_genres_sort), -1))
+            Sort.fromIntCode(
+                inner.getInt(context.getString(R.string.set_key_lib_genres_sort), Int.MIN_VALUE))
                 ?: Sort(Sort.Mode.ByName, true)
         set(value) {
             inner.edit {
@@ -281,7 +291,8 @@ class Settings(private val context: Context, private val callback: Callback? = n
         get() {
             var sort =
                 Sort.fromIntCode(
-                    inner.getInt(context.getString(R.string.set_key_detail_album_sort), -1))
+                    inner.getInt(
+                        context.getString(R.string.set_key_detail_album_sort), Int.MIN_VALUE))
                     ?: Sort(Sort.Mode.ByDisc, true)
 
             // Correct legacy album sort modes to Disc
@@ -302,7 +313,7 @@ class Settings(private val context: Context, private val callback: Callback? = n
     var detailArtistSort: Sort
         get() =
             Sort.fromIntCode(
-                inner.getInt(context.getString(R.string.set_key_detail_artist_sort), -1))
+                inner.getInt(context.getString(R.string.set_key_detail_artist_sort), Int.MIN_VALUE))
                 ?: Sort(Sort.Mode.ByYear, false)
         set(value) {
             inner.edit {
@@ -315,7 +326,7 @@ class Settings(private val context: Context, private val callback: Callback? = n
     var detailGenreSort: Sort
         get() =
             Sort.fromIntCode(
-                inner.getInt(context.getString(R.string.set_key_detail_genre_sort), -1))
+                inner.getInt(context.getString(R.string.set_key_detail_genre_sort), Int.MIN_VALUE))
                 ?: Sort(Sort.Mode.ByName, true)
         set(value) {
             inner.edit {
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
index b7f09920f..242ac6b8d 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@@ -121,18 +121,18 @@ class SettingsListFragment : PreferenceFragmentCompat() {
         when (preference.key) {
             context.getString(R.string.set_key_save_state) -> {
                 playbackModel.savePlaybackState {
-                    this.context?.showToast(R.string.lng_state_saved)
+                    this.context?.showToast(R.string.lbl_state_saved)
                 }
             }
             context.getString(R.string.set_key_wipe_state) -> {
                 playbackModel.wipePlaybackState {
-                    this.context?.showToast(R.string.lng_state_wiped)
+                    this.context?.showToast(R.string.lbl_state_wiped)
                 }
             }
             context.getString(R.string.set_key_restore_state) ->
                 playbackModel.tryRestorePlaybackState { restored ->
                     if (restored) {
-                        this.context?.showToast(R.string.lng_state_restored)
+                        this.context?.showToast(R.string.lbl_state_restored)
                     } else {
                         this.context?.showToast(R.string.err_did_not_restore)
                     }
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/system/ServiceNotification.kt b/app/src/main/java/org/oxycblt/auxio/ui/system/ServiceNotification.kt
index 87572c8aa..80eabe5e3 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/system/ServiceNotification.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/system/ServiceNotification.kt
@@ -17,13 +17,11 @@
  
 package org.oxycblt.auxio.ui.system
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.content.Context
-import android.os.Build
 import androidx.annotation.StringRes
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
-import org.oxycblt.auxio.util.getSystemServiceCompat
+import androidx.core.app.NotificationManagerCompat
 
 /**
  * Wrapper around [NotificationCompat.Builder] that automates parts of the notification setup, under
@@ -32,15 +30,18 @@ import org.oxycblt.auxio.util.getSystemServiceCompat
  */
 abstract class ServiceNotification(context: Context, info: ChannelInfo) :
     NotificationCompat.Builder(context, info.id) {
-    private val notificationManager = context.getSystemServiceCompat(NotificationManager::class)
+    private val notificationManager = NotificationManagerCompat.from(context)
 
     init {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel =
-                NotificationChannel(info.id, context.getString(info.nameRes), info.importance)
+        val channel =
+            NotificationChannelCompat.Builder(info.id, NotificationManagerCompat.IMPORTANCE_LOW)
+                .setName(context.getString(info.nameRes))
+                .setLightsEnabled(false)
+                .setVibrationEnabled(false)
+                .setShowBadge(false)
+                .build()
 
-            notificationManager.createNotificationChannel(channel)
-        }
+        notificationManager.createNotificationChannel(channel)
     }
 
     abstract val code: Int
@@ -49,5 +50,5 @@ abstract class ServiceNotification(context: Context, info: ChannelInfo) :
         notificationManager.notify(code, build())
     }
 
-    data class ChannelInfo(val id: String, @StringRes val nameRes: Int, val importance: Int)
+    data class ChannelInfo(val id: String, @StringRes val nameRes: Int)
 }
diff --git a/app/src/main/res/values-ar-rIQ/strings.xml b/app/src/main/res/values-ar-rIQ/strings.xml
index 10f332a42..82acc6de3 100644
--- a/app/src/main/res/values-ar-rIQ/strings.xml
+++ b/app/src/main/res/values-ar-rIQ/strings.xml
@@ -4,7 +4,7 @@
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">مشغل موسيقى بسيط ومعقول لنظام الاندرويد.</string>
     <string name="info_playback_channel_name">تشغيل الموسيقى</string>
-    <string name="info_widget_desc">عرض وتحكم بشتغيل الموسيقى</string>
+    <string name="lng_playback">عرض وتحكم بشتغيل الموسيقى</string>
 
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">إعادة المحاولة</string>
@@ -43,7 +43,7 @@
     <string name="lbl_go_artist">أذهب إلى الفنان</string>
     <string name="lbl_go_album">أذهب إلى الالبوم</string>
 
-    <string name="lng_state_saved">تم حفظ الحالة</string>
+    <string name="lbl_state_saved">تم حفظ الحالة</string>
 
     <string name="lbl_add">أضف</string>
     <string name="lbl_save">احفظ</string>
@@ -82,7 +82,7 @@
 
     <string name="set_audio">صوتيات</string>
     <string name="set_replay_gain">صخب الصوت</string>
-    <string name="lbl_off">اطفاء</string>
+    <string name="set_replay_gain_off">اطفاء</string>
     <string name="set_replay_gain_track">تفضيل المقطع</string>
     <string name="set_replay_gain_album">تفضيل الالبوم</string>
     <string name="set_replay_gain_dynamic">ديناميكي</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9681e5d5a..eeb93d50f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -3,8 +3,8 @@
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Jednoduchý, rozumný hudební přehrávač pro Android.</string>
     <string name="info_playback_channel_name">Přehrávání hudby</string>
-    <string name="info_indexer_channel_name">Načítání hudby</string>
-    <string name="info_widget_desc">Zobrazení a ovládání přehrávání hudby</string>
+    <string name="lbl_indexer">Načítání hudby</string>
+    <string name="lng_playback">Zobrazení a ovládání přehrávání hudby</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lng_indexing_desc">Načítání vaší hudební knihovny…</string>
     <string name="lbl_retry">Zkusit znovu</string>
@@ -40,14 +40,14 @@
     <string name="lng_queue_added">Přidáno do fronty</string>
     <string name="lbl_go_artist">Přejít na umělce</string>
     <string name="lbl_go_album">Přejít na album</string>
-    <string name="lng_state_saved">Stav uložen</string>
+    <string name="lbl_state_saved">Stav uložen</string>
     <!-- Actual string: Ok -->
     <string name="lbl_ok">@android:string/ok</string>
     <!-- Actual string: Cancel -->
     <string name="lbl_cancel">@android:string/cancel</string>
     <string name="lbl_add">Přidat</string>
     <string name="lbl_save">Uložit</string>
-    <string name="lbl_off">Vyp</string>
+    <string name="set_replay_gain_off">Vyp</string>
     <string name="lbl_about">O aplikaci</string>
     <string name="lbl_version">Verze</string>
     <string name="lbl_code">Zdrojový kód</string>
@@ -208,14 +208,14 @@
     <string name="set_quality_tags">Ignorovat štítky MediaStore</string>
     <string name="set_quality_tags_desc">Zvýší kvalitu štítků, ale má za následek delší načítací čas (experimentální)</string>
     <string name="set_restore_state">Obnovit stav přehrávání</string>
-    <string name="lng_state_restored">Stav obnoven</string>
+    <string name="lbl_state_restored">Stav obnoven</string>
     <string name="set_restore_desc">Obnovit dříve uložený stav přehrávání (pokud existuje)</string>
     <string name="err_did_not_restore">Nemohl být obnoven žádný stav</string>
-    <string name="lng_observing">Monitorování hudební knihovny</string>
+    <string name="lbl_observing">Monitorování hudební knihovny</string>
     <string name="set_observing">Automatické znovunačítání</string>
-    <string name="lng_observing_desc">Sledování změn v hudební knihovně…</string>
+    <string name="lng_observing">Sledování změn v hudební knihovně…</string>
     <string name="set_observing_desc">Znovu načíst vaší hudební knihovnu při změně (experimentální)</string>
-    <string name="lng_indexing">Načítání hudby</string>
+    <string name="lbl_indexing">Načítání hudby</string>
     <string name="lbl_sort_date_added">Datum přidání</string>
     <string name="lbl_single">Singl</string>
     <string name="lbl_singles">Singly</string>
@@ -237,7 +237,7 @@
     <string name="lbl_ep_remix">Remixové EP</string>
     <string name="set_wipe_state">Vymazat stav přehrávání</string>
     <string name="set_wipe_desc">Vymazat dříve uložený stav přehrávání (pokud existuje)</string>
-    <string name="lng_state_wiped">Stav vymazán</string>
+    <string name="lbl_state_wiped">Stav vymazán</string>
     <string name="desc_queue_bar">Otevřít frontu</string>
     <string name="lbl_genre">Žánr</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 760424cea..49be45c7b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -28,7 +28,7 @@
     <string name="lng_queue_added">Der Warteschlange hinzugefügt</string>
     <string name="lbl_go_artist">Zum Künstler gehen</string>
     <string name="lbl_go_album">Zum Album gehen</string>
-    <string name="lng_state_saved">Wiedergabezustand gespeichert</string>
+    <string name="lbl_state_saved">Wiedergabezustand gespeichert</string>
     <string name="lbl_add">Hinzufügen</string>
     <string name="lbl_save">Speichern</string>
     <string name="err_no_dirs">Keine Ordner</string>
@@ -38,7 +38,7 @@
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Lizenzen</string>
     <string name="lng_author">Entwickelt von OxygenCobalt</string>
-    <string name="lbl_off">Aus</string>
+    <string name="set_replay_gain_off">Aus</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Einstellungen</string>
     <string name="set_ui">Aussehen</string>
@@ -128,7 +128,7 @@
         <item quantity="other">%d Alben</item>
     </plurals>
     <string name="info_app_desc">Ein einfacher, rationaler Musikplayer für Android.</string>
-    <string name="info_widget_desc">Musikwiedergabe anzeigen und kontrollieren</string>
+    <string name="lng_playback">Musikwiedergabe anzeigen und kontrollieren</string>
     <string name="lbl_artist">Künstler</string>
     <string name="lbl_album">Album</string>
     <string name="lbl_sort_year">Jahr</string>
@@ -189,7 +189,7 @@
     <string name="fmt_indexing">Lade deine Musikbibliothek… (%1$d/%2$d)</string>
     <string name="lbl_shuffle_shortcut_short">Mischen</string>
     <string name="lbl_shuffle_shortcut_long">Alle mischen</string>
-    <string name="info_indexer_channel_name">Musikwiedergabe</string>
+    <string name="lbl_indexer">Musikwiedergabe</string>
     <string name="lng_indexing_desc">Lade deine Musikbibliothek…</string>
     <string name="lbl_sample_rate">Abtastrate</string>
     <string name="lbl_song_detail">Zeige Eigenschaften an</string>
@@ -201,13 +201,13 @@
     <string name="lbl_bitrate">Bitrate</string>
     <string name="set_quality_tags">MediaStore-Tags ignorieren</string>
     <string name="set_quality_tags_desc">Erhöht Tag-Qualität, benötigt aber längere Ladezeiten (Experimentell)</string>
-    <string name="lng_observing">Überwachen der Musikbibliothek</string>
-    <string name="lng_indexing">Musik wird geladen</string>
-    <string name="lng_observing_desc">Musikbibliothek wird auf Änderungen überwacht…</string>
+    <string name="lbl_observing">Überwachen der Musikbibliothek</string>
+    <string name="lbl_indexing">Musik wird geladen</string>
+    <string name="lng_observing">Musikbibliothek wird auf Änderungen überwacht…</string>
     <string name="lbl_sort_date_added">Hinzugefügt am</string>
     <string name="set_observing_desc">Musikbibliothek neuladen, sobald es Änderungen gibt (Experimentell)</string>
     <string name="set_observing">Automatisch neuladen</string>
-    <string name="lng_state_restored">Zustand wiederhergestellt</string>
+    <string name="lbl_state_restored">Zustand wiederhergestellt</string>
     <string name="set_restore_desc">Den vorher gespeicherten Wiedergabezustand wiederherstellen (wenn verfügbar)</string>
     <string name="err_did_not_restore">Kein Zustand konnte wiederhergestellt werden</string>
     <string name="lbl_ep">EP</string>
@@ -230,7 +230,7 @@
     <string name="lbl_single_remix">Remix-Single</string>
     <string name="lbl_live_group">Live</string>
     <string name="set_wipe_desc">Den vorher gespeicherten Wiedergabezustand löschen (wenn vorhanden)</string>
-    <string name="lng_state_wiped">Zustand gelöscht</string>
+    <string name="lbl_state_wiped">Zustand gelöscht</string>
     <string name="desc_queue_bar">Warteschlange öffnen</string>
     <string name="set_wipe_state">Wiedergabezustand löschen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e10d2facf..f092a8a81 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -91,7 +91,7 @@
     <string name="lbl_ep_remix">Ρεμίξ EP</string>
     <string name="lbl_compilations">Συλλογές</string>
     <string name="lbl_compilation">Συλλογή</string>
-    <string name="lng_indexing">Φόρτωση μουσικής</string>
+    <string name="lbl_indexing">Φόρτωση μουσικής</string>
     <string name="lbl_genre">Είδος</string>
     <string name="fmt_db_neg">-%.1f dB</string>
     <string name="fmt_sample_rate">%d Hz</string>
@@ -101,8 +101,8 @@
     <string name="err_no_dirs">Καθόλου φάκελοι</string>
     <string name="info_app_desc">Μιά απλή, λογική εφαρμογή αναπαραγωγής μουσικής για Android.</string>
     <string name="info_playback_channel_name">Αναπαραγωγή Μουσικής</string>
-    <string name="info_indexer_channel_name">Φόρτωση μουσικής</string>
-    <string name="info_widget_desc">Προβολή και έλεγχος αναπαραγωγής μουσικής</string>
+    <string name="lbl_indexer">Φόρτωση μουσικής</string>
+    <string name="lng_playback">Προβολή και έλεγχος αναπαραγωγής μουσικής</string>
     <string name="lbl_album">Album</string>
     <string name="lbl_eps">EP</string>
     <string name="lbl_ep">EP</string>
@@ -123,12 +123,12 @@
     <string name="lbl_cancel">Ακύρωση</string>
     <string name="lbl_sample_rate">Pυθμός δειγματοληψίας</string>
     <string name="lng_indexing_desc">Φόρτωση της μουσικής συλλογής σας…</string>
-    <string name="lng_observing">Παρακολούθηση της μουσικής συλλογής σας</string>
-    <string name="lng_state_saved">Η κατάσταση αναπαραγωγής αποθηκεύτηκε</string>
+    <string name="lbl_observing">Παρακολούθηση της μουσικής συλλογής σας</string>
+    <string name="lbl_state_saved">Η κατάσταση αναπαραγωγής αποθηκεύτηκε</string>
     <string name="set_wipe">Εκκαθάριση κατάστασης αναπαραγωγής</string>
     <string name="set_wipe_desc">Εκκαθάριση της προηγούμενης αποθηκευμένης κατάστασης αναπαραγωγής (αν υπάρχει)</string>
-    <string name="lng_state_wiped">Η κατάσταση αναπαραγωγής εκκαθαρίστηκε</string>
-    <string name="lng_state_restored">Η κατάσταση αναπαραγωγής επαναφέρθηκε</string>
+    <string name="lbl_state_wiped">Η κατάσταση αναπαραγωγής εκκαθαρίστηκε</string>
+    <string name="lbl_state_restored">Η κατάσταση αναπαραγωγής επαναφέρθηκε</string>
     <string name="set_save">Αποθήκευση κατάστασης αναπαραγωγής</string>
     <string name="set_save_desc">Αποθήκευση της τωρινής κατάστασης αναπαραγωγής τώρα</string>
     <string name="set_restore">Αποκατάσταση κατάσταση αναπαραγωγής</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index aac9a9d64..d0d4597d8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,7 +3,7 @@
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Un reproductor de música simple y racional para Android.</string>
     <string name="info_playback_channel_name">Reproducción de música</string>
-    <string name="info_widget_desc">Ver y controlar la reproducción musical</string>
+    <string name="lng_playback">Ver y controlar la reproducción musical</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Reintentar</string>
     <string name="lbl_grant">Permitir</string>
@@ -34,7 +34,7 @@
     <string name="lng_queue_added">Agregado a la cola</string>
     <string name="lbl_go_artist">Ir al artista</string>
     <string name="lbl_go_album">Ir al álbum</string>
-    <string name="lng_state_saved">Estado guardado</string>
+    <string name="lbl_state_saved">Estado guardado</string>
     <string name="lbl_add">Agregar</string>
     <string name="lbl_save">Guardar</string>
     <string name="err_no_dirs">Sin carpetas</string>
@@ -68,7 +68,7 @@
     <string name="set_alt_shuffle">Preferir acción de mezcla</string>
     <string name="set_audio">Sonido</string>
     <string name="set_replay_gain">ReplayGain</string>
-    <string name="lbl_off">Desactivado</string>
+    <string name="set_replay_gain_off">Desactivado</string>
     <string name="set_replay_gain_track">Por pista</string>
     <string name="set_replay_gain_album">Por álbum</string>
     <string name="set_replay_gain_dynamic">Preferir el álbum si se está en reproducción</string>
@@ -170,16 +170,16 @@
     <string name="fmt_indexing">Cargando tu biblioteca de música… (%1$d/%2$d)</string>
     <string name="fmt_lib_artist_count">Artistas cargados: %d</string>
     <string name="fmt_lib_genre_count">Géneros cargados: %d</string>
-    <string name="info_indexer_channel_name">Carga de música</string>
+    <string name="lbl_indexer">Carga de música</string>
     <string name="lbl_sort_count">Número de canciones</string>
-    <string name="lng_state_restored">Estado restaurado</string>
+    <string name="lbl_state_restored">Estado restaurado</string>
     <string name="set_observing">Recarga automática</string>
     <string name="set_observing_desc">Recarga tu biblioteca de música cuando cambia (Experimental)</string>
     <string name="err_did_not_restore">No se puedo restaurar ningún estado</string>
     <string name="lng_indexing_desc">Cargando tu librería de música…</string>
-    <string name="lng_indexing">Cargando música</string>
-    <string name="lng_observing">Monitorizando la librería de música</string>
-    <string name="lng_observing_desc">Monitorizando cambios en tu librería de música…</string>
+    <string name="lbl_indexing">Cargando música</string>
+    <string name="lbl_observing">Monitorizando la librería de música</string>
+    <string name="lng_observing">Monitorizando cambios en tu librería de música…</string>
     <string name="cdc_ogg">Audio ogg</string>
     <string name="set_detail_song_playback_mode">Cuando se reproduce desde los detalles</string>
     <string name="lbl_sort_date_added">Fecha de añadido</string>
@@ -232,6 +232,6 @@
     <string name="set_wipe_desc">Eliminar el estado de reproducción guardado previamente (si existe)</string>
     <string name="desc_queue_bar">Abrir la cola</string>
     <string name="lbl_genre">Género</string>
-    <string name="lng_state_wiped">Estado limpiado</string>
+    <string name="lbl_state_wiped">Estado limpiado</string>
     <string name="set_wipe">Limpiar el estado de reproducción</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index 11e023037..5daffad48 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -3,18 +3,18 @@
     <string name="set_replay_gain_album">Naisin ang album</string>
     <string name="lbl_retry">Subukan muli</string>
     <string name="lng_indexing_desc">Nilo-load ang iyong music library…</string>
-    <string name="lng_observing_desc">Tinitignan ang iyong music library para sa mga pagbabago…</string>
+    <string name="lng_observing">Tinitignan ang iyong music library para sa mga pagbabago…</string>
     <string name="lbl_all_songs">Lahat ng Kanta</string>
     <string name="lbl_albums">Mga Album</string>
     <string name="lbl_album">Album</string>
     <string name="lbl_album_live">Live na album</string>
     <string name="lbl_album_remix">Remix album</string>
     <string name="lbl_ep">EP</string>
-    <string name="lng_indexing">Nilo-load ang music</string>
+    <string name="lbl_indexing">Nilo-load ang music</string>
     <string name="info_playback_channel_name">Pagtugtog ng kanta</string>
-    <string name="info_indexer_channel_name">Pagload ng kanta</string>
+    <string name="lbl_indexer">Pagload ng kanta</string>
     <string name="lbl_eps">Mga EP</string>
-    <string name="lng_observing">Tinitignan ang music library</string>
+    <string name="lbl_observing">Tinitignan ang music library</string>
     <string name="lbl_single">Single</string>
     <string name="lbl_single_live">Live na single</string>
     <string name="lbl_single_remix">Remix single</string>
@@ -52,12 +52,12 @@
     <string name="lbl_size">Laki</string>
     <string name="lbl_bitrate">Tulin ng mga bit</string>
     <string name="lbl_sample_rate">Tulin ng sample</string>
-    <string name="lng_state_restored">Naibalik ang kalagayan</string>
-    <string name="lng_state_saved">Na-save ang kalagayan</string>
+    <string name="lbl_state_restored">Naibalik ang kalagayan</string>
+    <string name="lbl_state_saved">Na-save ang kalagayan</string>
     <string name="lbl_shuffle_shortcut_short">Haluin</string>
     <string name="lbl_add">Idagdag</string>
     <string name="lbl_save">I-save</string>
-    <string name="lbl_off">Naka-patay</string>
+    <string name="set_replay_gain_off">Naka-patay</string>
     <string name="lbl_about">Tungkol</string>
     <string name="lbl_version">Ulat</string>
     <string name="lbl_code">Tignan sa GitHub</string>
@@ -102,7 +102,7 @@
     <string name="lbl_singles">Mga Single</string>
     <string name="lbl_grant">Bigyan</string>
     <string name="lbl_genres">Mga Genre</string>
-    <string name="info_widget_desc">Tignan at ayusin ang pagtugtog ng kanta</string>
+    <string name="lng_playback">Tignan at ayusin ang pagtugtog ng kanta</string>
     <string name="set_theme">Tema</string>
     <string name="set_lib_tabs_desc">Ibahin ang pagkakita at ayos ng mga library tab</string>
     <string name="set_pre_amp_desc">Inilalapat ang pre-amp sa kasalukuyang ayos habang ito\'y tumutugtog</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 76d476281..012b45eca 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -74,7 +74,7 @@
         <item quantity="other">%s Albums</item>
     </plurals>
     <string name="lbl_format">Format</string>
-    <string name="lng_state_saved">État sauvegardé</string>
+    <string name="lbl_state_saved">État sauvegardé</string>
     <string name="lbl_shuffle_shortcut_short">Mélanger</string>
     <string name="lbl_ok">OK</string>
     <string name="lbl_library_counts">Statistiques de la bibliothèque</string>
@@ -91,7 +91,7 @@
     <string name="lbl_save">Enregistrer</string>
     <string name="lbl_size">Taille</string>
     <string name="lbl_add">Ajouter</string>
-    <string name="lbl_off">Désactivé</string>
+    <string name="set_replay_gain_off">Désactivé</string>
     <string name="set_display">Affichage</string>
     <string name="set_show_covers">Afficher les pochettes d\'album</string>
     <string name="set_lib_tabs">Onglets de la bibliothèque</string>
@@ -99,8 +99,8 @@
     <string name="set_alt_repeat">Préférer l\'action en mode répétition</string>
     <string name="info_app_desc">Un lecteur de musique simple et rationnel pour Android.</string>
     <string name="info_playback_channel_name">Lecture de musique</string>
-    <string name="info_indexer_channel_name">Chargement de musique</string>
-    <string name="info_widget_desc">Afficher et contrôler la lecture de la musique</string>
+    <string name="lbl_indexer">Chargement de musique</string>
+    <string name="lng_playback">Afficher et contrôler la lecture de la musique</string>
     <string name="lng_indexing_desc">Chargement de votre bibliothèque musicale…</string>
     <string name="lbl_sort_name">Nom</string>
     <string name="lbl_artist">Artiste</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 88c8310ff..dab68db7c 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="lng_indexing">Učitavanje glazbe</string>
+    <string name="lbl_indexing">Učitavanje glazbe</string>
     <string name="lng_indexing_desc">Učitavanje tvoje zbirke glazbe …</string>
-    <string name="lng_observing">Nadgledavanje zbirke glazbe</string>
-    <string name="lng_observing_desc">Nadgledavanje tvoje zbirke glazbe u slučaju promjena …</string>
+    <string name="lbl_observing">Nadgledavanje zbirke glazbe</string>
+    <string name="lng_observing">Nadgledavanje tvoje zbirke glazbe u slučaju promjena …</string>
     <string name="lbl_songs">Pjesme</string>
     <string name="lbl_all_songs">Sve pjesme</string>
     <string name="lbl_albums">Albumi</string>
@@ -46,15 +46,15 @@
     <string name="lbl_size">Veličina</string>
     <string name="lbl_bitrate">Brzina prijenosa</string>
     <string name="lbl_sample_rate">Frekvencija</string>
-    <string name="lng_state_saved">Stanje spremljeno</string>
-    <string name="lng_state_restored">Stanje vraćeno</string>
+    <string name="lbl_state_saved">Stanje spremljeno</string>
+    <string name="lbl_state_restored">Stanje vraćeno</string>
     <string name="lbl_shuffle_shortcut_short">Izmiješaj</string>
     <string name="lbl_shuffle_shortcut_long">Izmiješaj sve</string>
     <string name="lbl_ok">U redu</string>
     <string name="lbl_cancel">Otkaži</string>
     <string name="lbl_add">Dodaj</string>
     <string name="lbl_save">Spremi</string>
-    <string name="lbl_off">Onemogući</string>
+    <string name="set_replay_gain_off">Onemogući</string>
     <string name="lbl_about">O</string>
     <string name="lbl_version">Inačica</string>
     <string name="lbl_code">Izvorni kod</string>
@@ -182,8 +182,8 @@
     <string name="info_playback_channel_name">Reprodukcija glazbe</string>
     <string name="info_app_desc">Jednostavan i racionalan izvođač glazbe za Android.</string>
     <string name="lbl_retry">Pokušaj ponovo</string>
-    <string name="info_indexer_channel_name">Učitavanje glazbe</string>
-    <string name="info_widget_desc">Pregledaj i upravljaj reprodukcijom glazbe</string>
+    <string name="lbl_indexer">Učitavanje glazbe</string>
+    <string name="lng_playback">Pregledaj i upravljaj reprodukcijom glazbe</string>
     <string name="lbl_grant">Dozvoli</string>
     <string name="lbl_single_live">Singl uživo</string>
     <string name="lbl_single_remix">Singl remiks</string>
@@ -223,7 +223,7 @@
     <string name="clr_purple">Ljubičasto</string>
     <string name="cdc_mka">Matroska Zvuk</string>
     <string name="set_wipe_state">Izbriši stanje reprodukcije</string>
-    <string name="lng_state_wiped">Stanje izbrisano</string>
+    <string name="lbl_state_wiped">Stanje izbrisano</string>
     <string name="set_wipe_desc">Izbriši prethodno stanje reprodukcije (ako postoji)</string>
     <string name="desc_queue_bar">Otvori popis pjesama</string>
     <string name="lbl_genre">Žanr</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index c790707fa..d8ec34771 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -68,7 +68,7 @@
     <string name="set_headset_autoplay">Putar otomatis headset</string>
     <string name="set_headset_autoplay_desc">Selalu mulai bermain ketika headset tersambung (mungkin tidak berfungsi pada semua perangkat)</string>
     <string name="set_replay_gain">ReplayGain</string>
-    <string name="lbl_off">Off</string>
+    <string name="set_replay_gain_off">Off</string>
     <string name="lbl_relative_path">Jalur induk</string>
     <string name="lbl_size">Ukuran</string>
     <string name="lbl_sample_rate">Tingkat sampel</string>
@@ -79,8 +79,8 @@
     <string name="lbl_album">Album</string>
     <string name="info_app_desc">Pemutar musik yang simpel dan rasional untuk android.</string>
     <string name="info_playback_channel_name">Pemutaran Musik</string>
-    <string name="info_indexer_channel_name">Pemuatan Musik</string>
-    <string name="info_widget_desc">Lihat dan kontrol pemutaran musik</string>
+    <string name="lbl_indexer">Pemuatan Musik</string>
+    <string name="lng_playback">Lihat dan kontrol pemutaran musik</string>
     <string name="lbl_sort_year">Tahun</string>
     <string name="lbl_sort_duration">Durasi</string>
     <string name="lbl_sort_disc">Disk</string>
@@ -95,7 +95,7 @@
     <string name="set_alt_shuffle">Lebih suka tindakan mengacak</string>
     <string name="lbl_shuffle_shortcut_short">Acak</string>
     <string name="lbl_shuffle_shortcut_long">Acak Semua</string>
-    <string name="lng_state_saved">Status disimpan</string>
+    <string name="lbl_state_saved">Status disimpan</string>
     <string name="set_replay_gain_track">Lebih suka trek</string>
     <string name="set_replay_gain_album">Lebih suka album</string>
     <string name="set_pre_amp">Pra-amp ReplayGain</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e7b529224..9df20be4e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -3,7 +3,7 @@
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Un semplice, razionale lettore musicale per android.</string>
     <string name="info_playback_channel_name">Riproduzione musicale</string>
-    <string name="info_widget_desc">Vedi e gestisci la riproduzione musicale</string>
+    <string name="lng_playback">Vedi e gestisci la riproduzione musicale</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Riprova</string>
     <string name="lbl_grant">Permetti</string>
@@ -34,7 +34,7 @@
     <string name="lng_queue_added">Accodato</string>
     <string name="lbl_go_artist">Vai all\'artista</string>
     <string name="lbl_go_album">Vai al disco</string>
-    <string name="lng_state_saved">Stato salvato</string>
+    <string name="lbl_state_saved">Stato salvato</string>
     <string name="lbl_add">Aggiungi</string>
     <string name="lbl_save">Salva</string>
     <string name="err_no_dirs">Nessuna cartella</string>
@@ -87,7 +87,7 @@
     <string name="set_save_desc">Salva lo stato di riproduzione corrente</string>
     <string name="set_reindex">Ricarica musica</string>
     <string name="set_reindex_desc">Potrebbe cancellare lo stato di riproduzione</string>
-    <string name="lbl_off">Spento</string>
+    <string name="set_replay_gain_off">Spento</string>
     <!-- Error Namespace | Error Labels -->
     <string name="err_no_music">Musica non trovata</string>
     <string name="err_index_failed">Caricamento musica fallito</string>
@@ -181,7 +181,7 @@
     <string name="fmt_bitrate">%d kbps</string>
     <string name="def_sample_rate">Nessuna frequenza di campionamento</string>
     <string name="fmt_db_neg">-%.1f dB</string>
-    <string name="info_indexer_channel_name">Caricamento musica</string>
+    <string name="lbl_indexer">Caricamento musica</string>
     <string name="lng_indexing_desc">Caricamento libreria musicale…</string>
     <string name="lbl_sort_duration">Durata</string>
     <string name="lbl_sort_count">Numero canzoni</string>
@@ -199,11 +199,11 @@
     <string name="def_bitrate">Nessuna velocità di trasmissione</string>
     <string name="lbl_cancel">Cancella</string>
     <string name="set_pre_amp">Pre-amp ReplayGain</string>
-    <string name="lng_observing_desc">Sto monitorando i cambiamenti nella tua libreria musicale…</string>
+    <string name="lng_observing">Sto monitorando i cambiamenti nella tua libreria musicale…</string>
     <string name="set_observing_desc">Ricarica la tua libreria musicale se subisce cambiamenti (sperimentale)</string>
-    <string name="lng_indexing">Caricamento musica</string>
-    <string name="lng_observing">Monitoraggio libreria musicale</string>
-    <string name="lng_state_restored">Stato ripristinato</string>
+    <string name="lbl_indexing">Caricamento musica</string>
+    <string name="lbl_observing">Monitoraggio libreria musicale</string>
+    <string name="lbl_state_restored">Stato ripristinato</string>
     <string name="lbl_sort_date_added">Data aggiunta</string>
     <string name="set_observing">Ricaricamento automatico</string>
     <string name="set_quality_tags">Ignora tags MediaStore</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 15b126bcf..a3d187d55 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -3,7 +3,7 @@
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">사용하기 쉽고 실용적인 Android 음악 플레이어입니다.</string>
     <string name="info_playback_channel_name">음악 재생</string>
-    <string name="info_widget_desc">음악 재생 제어 및 상태 확인</string>
+    <string name="lng_playback">음악 재생 제어 및 상태 확인</string>
 
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">다시 시도</string>
@@ -46,7 +46,7 @@
     <string name="lbl_go_artist">아티스트로 이동</string>
     <string name="lbl_go_album">앨범으로 이동</string>
 
-    <string name="lng_state_saved">상태를 저장했습니다.</string>
+    <string name="lbl_state_saved">상태를 저장했습니다.</string>
 
     <!-- Actual string: Ok -->
     <string name="lbl_ok">@android:string/ok</string>
@@ -54,7 +54,7 @@
     <string name="lbl_cancel">@android:string/cancel</string>
     <string name="lbl_add">추가</string>
     <string name="lbl_save">저장</string>
-    <string name="lbl_off">끔</string>
+    <string name="set_replay_gain_off">끔</string>
 
     <string name="lbl_about">정보</string>
     <string name="lbl_version">버전</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 3512244dd..79226a2e0 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -40,7 +40,7 @@
     <string name="lbl_save">Išsaugoti</string>
     <string name="lbl_about">Apie</string>
     <string name="lbl_add">Pridėti</string>
-    <string name="lbl_off">Išjungta</string>
+    <string name="set_replay_gain_off">Išjungta</string>
     <string name="lbl_faq">DUK</string>
     <string name="set_ui">Išvaizda</string>
     <string name="lbl_format">Formatas</string>
@@ -50,12 +50,12 @@
     <string name="set_black_mode_desc">Naudokti grynai juodą tamsią temą</string>
     <string name="info_app_desc">Paprastas, racionalus „Android“ muzikos grotuvas.</string>
     <string name="info_playback_channel_name">Muzikos grojimas</string>
-    <string name="info_indexer_channel_name">Kraunama muziką</string>
-    <string name="info_widget_desc">Peržiūrėti ir valdyti muzikos grojimą</string>
+    <string name="lbl_indexer">Kraunama muziką</string>
+    <string name="lng_playback">Peržiūrėti ir valdyti muzikos grojimą</string>
     <string name="lbl_genres">Žanrai</string>
     <string name="lbl_retry">Bandykite dar kartą</string>
     <string name="lbl_grant">Suteikti</string>
-    <string name="lng_indexing">Kraunama muzika</string>
+    <string name="lbl_indexing">Kraunama muzika</string>
     <string name="lng_indexing_desc">Kraunama jūsų muzikos biblioteka…</string>
     <string name="lbl_library_counts">Bibliotekos statistika</string>
     <string name="clr_pink">Rožinis</string>
@@ -74,12 +74,12 @@
     <string name="def_artist">Nežinomas Atlikėjas</string>
     <string name="desc_no_cover">Albumo viršelis</string>
     <string name="clr_deep_purple">Tamsiai Violetinė</string>
-    <string name="lng_observing">Stebėjimas muzikos biblioteką</string>
-    <string name="lng_observing_desc">Stebima, ar jūsų muzikos bibliotekoje yra pakeitimų…</string>
+    <string name="lbl_observing">Stebėjimas muzikos biblioteką</string>
+    <string name="lng_observing">Stebima, ar jūsų muzikos bibliotekoje yra pakeitimų…</string>
     <string name="lbl_shuffle_shortcut_short">Išmaišyti</string>
     <string name="lbl_shuffle_shortcut_long">Išmaišyti viską</string>
-    <string name="lng_state_restored">Atkurta grojimo būsena</string>
-    <string name="lng_state_saved">Išsaugota grojamo būsena</string>
+    <string name="lbl_state_restored">Atkurta grojimo būsena</string>
+    <string name="lbl_state_saved">Išsaugota grojamo būsena</string>
     <string name="lbl_cancel">\@android:string/atšaukti</string>
     <string name="lbl_code">Peržiūrėti per „Github“</string>
     <string name="set_display">Rodyti</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index cf13160c7..e54c25752 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -29,7 +29,7 @@
     <string name="lng_queue_added">Toegevoegd aan de wachtrij</string>
     <string name="lbl_go_artist">Ga naar artiest</string>
     <string name="lbl_go_album">Ga naar album</string>
-    <string name="lng_state_saved">Staat gered</string>
+    <string name="lbl_state_saved">Staat gered</string>
     <string name="lbl_add">Toevoegen</string>
     <string name="lbl_save">Opslaan</string>
     <string name="err_no_dirs">Geen Mappen</string>
@@ -122,7 +122,7 @@
     <string name="fmt_disc_no">Schijf %d</string>
     <string name="fmt_bitrate">%d kbps</string>
     <string name="fmt_db_pos">+%.1f dB</string>
-    <string name="info_widget_desc">Muziekweergave bekijken en regelen</string>
+    <string name="lng_playback">Muziekweergave bekijken en regelen</string>
     <string name="fmt_sample_rate">%d Hz</string>
     <string name="lbl_song_detail">Bekijk eigenschappen</string>
     <string name="lbl_sort_name">Naam</string>
@@ -144,7 +144,7 @@
     <string name="fmt_lib_total_duration">Totale duur: %s</string>
     <string name="lbl_shuffle_shortcut_long">Shuffle Alles</string>
     <string name="lbl_ok">\@android:string/ok</string>
-    <string name="lbl_off">Uit</string>
+    <string name="set_replay_gain_off">Uit</string>
     <string name="set_headset_autoplay_desc">Altijd beginnen met spelen als een headset is aangesloten (werkt mogelijk niet op alle apparaten)</string>
     <string name="desc_shuffle">Schakel shuffle aan of uit</string>
     <string name="set_reindex_desc">Kan afspeelstatus wissen</string>
@@ -163,7 +163,7 @@
     <string name="set_detail_song_playback_mode">Bij het afspelen van item details</string>
     <string name="set_round_mode">Ronde modus</string>
     <string name="set_round_mode_desc">Afgeronde hoeken op extra UI-elementen inschakelen (vereist dat albumhoezen afgerond zijn)</string>
-    <string name="lng_state_restored">Staat gerestaureerd</string>
+    <string name="lbl_state_restored">Staat gerestaureerd</string>
     <string name="lbl_library_counts">Bibliotheekstatistieken</string>
     <string name="set_lib_tabs_desc">Verander de zichtbaarheid en volgorde van bibliotheek-tabbladen</string>
     <string name="set_headset_autoplay">Headset automatisch afspelen</string>
@@ -191,7 +191,7 @@
     <string name="fmt_lib_album_count">Albums geladen: %d</string>
     <string name="fmt_lib_artist_count">Artiesten geladen: %d</string>
     <string name="fmt_lib_genre_count">Genres geladen: %d</string>
-    <string name="info_indexer_channel_name">Muziek aan het laden</string>
+    <string name="lbl_indexer">Muziek aan het laden</string>
     <string name="lbl_album">Album</string>
     <string name="lbl_sort_duration">Looptijd</string>
     <string name="lbl_sort_count">Aantal Liedjes</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2d58a251b..b4bafe3fc 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -115,7 +115,7 @@
     <string name="lbl_size">Tamanho</string>
     <string name="lbl_bitrate">Taxa de bits</string>
     <string name="lbl_sample_rate">Taxa de amostragem</string>
-    <string name="lng_state_saved">Estado salvo</string>
+    <string name="lbl_state_saved">Estado salvo</string>
     <string name="set_lib_tabs_desc">Altere a visibilidade e a ordem das guias da biblioteca</string>
     <string name="set_black_mode">Tema preto</string>
     <string name="set_black_mode_desc">Use um tema escuro puro preto</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e7edff0e0..754255428 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -3,7 +3,7 @@
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Простой и рациональный музыкальный проигрыватель.</string>
     <string name="info_playback_channel_name">Воспроизведение</string>
-    <string name="info_widget_desc">Настройки воспроизведения</string>
+    <string name="lng_playback">Настройки воспроизведения</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Повторить попытку</string>
     <string name="lbl_grant">Разрешить</string>
@@ -34,7 +34,7 @@
     <string name="lng_queue_added">Добавлено в очередь</string>
     <string name="lbl_go_artist">Перейти к исполнителю</string>
     <string name="lbl_go_album">Перейти к альбому</string>
-    <string name="lng_state_saved">Позиция сохранена</string>
+    <string name="lbl_state_saved">Позиция сохранена</string>
     <string name="lbl_add">Добавить</string>
     <string name="lbl_save">Сохранить</string>
     <string name="err_no_dirs">Нет папок</string>
@@ -70,7 +70,7 @@
     <string name="set_headset_autoplay">Воспроизводить при подключении</string>
     <string name="set_headset_autoplay_desc">Всегда начинать воспроизведение при подключении наушников (может работать не на всех устройствах)</string>
     <string name="set_replay_gain">Выравнивание громкости</string>
-    <string name="lbl_off">Выкл.</string>
+    <string name="set_replay_gain_off">Выкл.</string>
     <string name="set_replay_gain_track">По треку</string>
     <string name="set_replay_gain_album">По альбому</string>
     <string name="set_replay_gain_dynamic">Предпочитать альбом, если он воспроизводится</string>
@@ -149,10 +149,10 @@
         <item quantity="many">%d альбомов</item>
         <item quantity="other">%d альбомы</item>
     </plurals>
-    <string name="info_indexer_channel_name">Музыка загружается</string>
-    <string name="lng_indexing">Загрузка музыки</string>
+    <string name="lbl_indexer">Музыка загружается</string>
+    <string name="lbl_indexing">Загрузка музыки</string>
     <string name="lng_indexing_desc">Загрузка музыкальной библиотеки…</string>
-    <string name="lng_observing">Мониторинг музыкальной библиотеки</string>
+    <string name="lbl_observing">Мониторинг музыкальной библиотеки</string>
     <string name="lbl_shuffle_shortcut_short">Перемешать</string>
     <string name="lbl_shuffle_shortcut_long">Перемешать всё</string>
     <string name="lbl_ok">\@android:string/ok</string>
@@ -162,7 +162,7 @@
     <string name="lbl_bitrate">Битрейт</string>
     <string name="lbl_sort_disc">Диск</string>
     <string name="lbl_sort_track">Трек</string>
-    <string name="lng_state_restored">Состояние восстановлено</string>
+    <string name="lbl_state_restored">Состояние восстановлено</string>
     <string name="lbl_cancel">\@android:string/cancel</string>
     <string name="set_pre_amp_warning">Внимание: Изменение предусилителя на большое положительное значение может привести к появлению искажений на некоторых звуковых дорожках.</string>
     <string name="lbl_song_detail">Свойства</string>
@@ -202,8 +202,8 @@
     <string name="cdc_ogg">Ogg</string>
     <string name="lbl_album_live">Концертный альбом</string>
     <string name="lbl_live_group">Концерт</string>
-    <string name="lng_observing_desc">Мониторинг изменений в музыкальной библиотеке…</string>
-    <string name="lng_state_wiped">Состояние очищено</string>
+    <string name="lng_observing">Мониторинг изменений в музыкальной библиотеке…</string>
+    <string name="lbl_state_wiped">Состояние очищено</string>
     <string name="set_dirs">Папки с музыкой</string>
     <string name="set_dirs_mode_include">Включить</string>
     <string name="lbl_album_remix">Альбом ремиксов</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 4563028b4..54d55d879 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -73,17 +73,17 @@
     <string name="lbl_bitrate">Bit hızı</string>
     <string name="lbl_sample_rate">Örnek hızı</string>
     <string name="info_playback_channel_name">Müzik Çalma</string>
-    <string name="info_widget_desc">Müzik çalmayı görüntüle ve kontrol et</string>
+    <string name="lng_playback">Müzik çalmayı görüntüle ve kontrol et</string>
     <string name="info_app_desc">Android için basit, rasyonel bir müzik çalar.</string>
-    <string name="info_indexer_channel_name">Müzik Yükleniyor</string>
+    <string name="lbl_indexer">Müzik Yükleniyor</string>
     <string name="lng_indexing_desc">Müzik kitaplığınız yükleniyor…</string>
     <string name="lbl_sort_name">İsim</string>
     <string name="lbl_artist">Sanatçı</string>
     <string name="lbl_album">Albüm</string>
     <string name="lbl_sort_year">Yıl</string>
     <string name="lbl_sort_duration">Süre</string>
-    <string name="lbl_off">Kapalı</string>
-    <string name="lng_state_saved">Durum kaydedildi</string>
+    <string name="set_replay_gain_off">Kapalı</string>
+    <string name="lbl_state_saved">Durum kaydedildi</string>
     <string name="lng_author">OxygenCobalt tarafından geliştirildi</string>
     <string name="set_black_mode">Siyah tema</string>
     <string name="lbl_library_counts">Kitaplık istatistikleri</string>
@@ -191,7 +191,7 @@
     <string name="clr_cyan">Camgöbeği</string>
     <string name="clr_teal">Deniz mavisi</string>
     <string name="set_round_mode_desc">Ek arayüz öğelerinde yuvarlatılmış köşeleri etkinleştirir (Albüm kapaklarının yuvarlatılmış olmasını gerektirir)</string>
-    <string name="lng_state_restored">Durum geri yüklendi</string>
+    <string name="lbl_state_restored">Durum geri yüklendi</string>
     <string name="set_restore_desc">Önceden kaydedilmiş oynatma durumunu geri getirir (varsa)</string>
     <string name="set_round_mode">Yuvarlak mod</string>
     <string name="set_restore_state">Oynatma durumunu eski haline getir</string>
@@ -199,9 +199,9 @@
     <string name="set_quality_tags_desc">Etiket kalitesini artırır, ancak daha uzun yükleme süreleri gerektirir</string>
     <string name="err_did_not_restore">Hiçbir durum geri getirelemedi</string>
     <string name="set_repeat_pause">Tekrarda duraklat</string>
-    <string name="lng_indexing">Müzik yükleniyor</string>
-    <string name="lng_observing">Müzik kitaplığı denetleniyor</string>
-    <string name="lng_observing_desc">Müzik kitaplığı değişiklikler için denetleniyor…</string>
+    <string name="lbl_indexing">Müzik yükleniyor</string>
+    <string name="lbl_observing">Müzik kitaplığı denetleniyor</string>
+    <string name="lng_observing">Müzik kitaplığı değişiklikler için denetleniyor…</string>
     <string name="set_observing">Otomatik yeniden yükleme</string>
     <string name="set_observing_desc">Müzik kitaplığınız her değiştiğinde yeniden yükler (Deneysel)</string>
     <string name="lbl_sort_date_added">Eklendiği tarih</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 707f931ef..497b36d3b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -3,7 +3,7 @@
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">一款简洁、克制的 Android 音乐播放器。</string>
     <string name="info_playback_channel_name">音乐播放</string>
-    <string name="info_widget_desc">查看并控制音乐播放</string>
+    <string name="lng_playback">查看并控制音乐播放</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">重试</string>
     <string name="lbl_grant">授予</string>
@@ -34,7 +34,7 @@
     <string name="lng_queue_added">已加入播放队列</string>
     <string name="lbl_go_artist">查看艺术家</string>
     <string name="lbl_go_album">查看专辑</string>
-    <string name="lng_state_saved">已保存播放进度</string>
+    <string name="lbl_state_saved">已保存播放进度</string>
     <string name="lbl_add">添加</string>
     <string name="lbl_save">保存</string>
     <string name="err_no_dirs">没有文件夹</string>
@@ -86,7 +86,7 @@
     <string name="set_save_desc">立即保存当前播放状态</string>
     <string name="set_reindex">重新加载音乐</string>
     <string name="set_reindex_desc">可能会抹除播放状态</string>
-    <string name="lbl_off">关闭</string>
+    <string name="set_replay_gain_off">关闭</string>
     <!-- Error Namespace | Error Labels -->
     <string name="err_no_music">没有找到音乐</string>
     <string name="err_index_failed">加载音乐失败</string>
@@ -181,7 +181,7 @@
     <string name="cdc_aac">高级音乐编码 (AAC)</string>
     <string name="fmt_lib_album_count">已加载专辑数量：%d</string>
     <string name="def_sample_rate">没有采样率信息</string>
-    <string name="info_indexer_channel_name">音乐加载中</string>
+    <string name="lbl_indexer">音乐加载中</string>
     <string name="lng_indexing_desc">正在加载您的音乐库……</string>
     <string name="lbl_sort_disc">碟片</string>
     <string name="lbl_sort_duration">时长</string>
@@ -206,11 +206,11 @@
     <string name="set_observing">自动重载中</string>
     <string name="set_observing_desc">发生更改时自动重新加载您的曲库（实验性）</string>
     <string name="desc_queue_bar">打开队列</string>
-    <string name="lng_indexing">正在加载音乐</string>
-    <string name="lng_observing">正在监测曲库</string>
-    <string name="lng_observing_desc">正在监测您的曲库以查找更改…</string>
-    <string name="lng_state_wiped">已清除状态</string>
-    <string name="lng_state_restored">已恢复状态</string>
+    <string name="lbl_indexing">正在加载音乐</string>
+    <string name="lbl_observing">正在监测曲库</string>
+    <string name="lng_observing">正在监测您的曲库以查找更改…</string>
+    <string name="lbl_state_wiped">已清除状态</string>
+    <string name="lbl_state_restored">已恢复状态</string>
     <string name="set_quality_tags">忽略 MediaStore 标签</string>
     <string name="lbl_eps">EP 专辑</string>
     <string name="lbl_ep">EP 专辑</string>
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index 2976ffc43..49f20c66e 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -107,7 +107,7 @@
     </integer-array>
 
     <string-array name="entries_replay_gain">
-        <item>@string/lbl_off</item>
+        <item>@string/set_replay_gain_off</item>
         <item>@string/set_replay_gain_track</item>
         <item>@string/set_replay_gain_album</item>
         <item>@string/set_replay_gain_dynamic</item>
@@ -128,7 +128,7 @@
     <integer name="bar_action_repeat">0xA11A</integer>
     <integer name="bar_action_shuffle">0xA11B</integer>
 
-    <integer name="play_mode_none">-1</integer>
+    <integer name="play_mode_none">-2147483648</integer>
     <integer name="play_mode_genre">0xA103</integer>
     <integer name="play_mode_artist">0xA104</integer>
     <integer name="play_mode_album">0xA105</integer>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 52138e0b9..4926afcbe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,13 +4,17 @@
     <eat-comment />
 
     <string name="info_app_desc">A simple, rational music player for android.</string>
-    <string name="info_playback_channel_name">Music playback</string>
-    <string name="info_indexer_channel_name">Music loading</string>
-    <string name="info_widget_desc">View and control music playback</string>
 
     <!-- Label Namespace | Static Labels -->
     <eat-comment />
 
+    <!-- Not an active task -->
+    <string name="lbl_indexer">Music loading</string>
+    <!-- Is an active task -->
+    <string name="lbl_indexing">Loading music</string>
+    <!-- Monitoring music library for changes -->
+    <string name="lbl_observing">Monitoring music library</string>
+    <!-- As in to retry loading music -->
     <string name="lbl_retry">Retry</string>
     <!-- As in grant permission -->
     <string name="lbl_grant">Grant</string>
@@ -49,11 +53,14 @@
     <string name="lbl_compilation">Compilation</string>
     <string name="lbl_soundtracks">Soundtracks</string>
     <string name="lbl_soundtrack">Soundtrack</string>
+    <!-- As in the collection of music -->
     <string name="lbl_mixtapes">Mixtapes</string>
+    <!-- As in the collection of music -->
     <string name="lbl_mixtape">Mixtape</string>
 
     <!-- As in music that was performed live -->
     <string name="lbl_live_group">Live</string>
+    <!-- As in remixed music -->
     <string name="lbl_remix_group">Remixes</string>
 
     <string name="lbl_artist">Artist</string>
@@ -62,8 +69,11 @@
     <string name="lbl_genre">Genre</string>
     <string name="lbl_genres">Genres</string>
 
+    <!-- Search for music -->
     <string name="lbl_search">Search</string>
+    <!-- As in filtering to particular types of music in the search view -->
     <string name="lbl_filter">Filter</string>
+    <!-- As in to not filter -->
     <string name="lbl_filter_all">All</string>
 
     <string name="lbl_sort">Sort</string>
@@ -107,9 +117,17 @@
     <string name="lbl_ok">@android:string/ok</string>
     <!-- Actual string: Cancel -->
     <string name="lbl_cancel">@android:string/cancel</string>
+    <!-- As in to add a new folder in the "Music folders" setting -->
     <string name="lbl_add">Add</string>
+    <!-- As in to save the "Music folders" setting -->
     <string name="lbl_save">Save</string>
-    <string name="lbl_off">Off</string>
+
+    <!-- Referring to playback state -->
+    <string name="lbl_state_saved">State saved</string>
+    <!-- Referring to playback state -->
+    <string name="lbl_state_wiped">State cleared</string>
+    <!-- Referring to playback state -->
+    <string name="lbl_state_restored">State restored</string>
 
     <string name="lbl_about">About</string>
     <string name="lbl_version">Version</string>
@@ -121,20 +139,14 @@
     <!-- Long Namespace | Longer Descriptions -->
     <eat-comment />
 
-    <string name="lng_indexing">Loading music</string>
-    <string name="lng_indexing_desc">Loading your music library…</string>
-    <string name="lng_observing">Monitoring music library</string>
-    <string name="lng_observing_desc">Monitoring your music library for changes…</string>
+    <string name="lng_indexer">Load and check for new music</string>
+    <string name="lng_playback">View and control music playback</string>
+    <string name="lng_indexing">Loading your music library…</string>
+    <string name="lng_observing">Monitoring your music library for changes…</string>
     <string name="lng_queue_added">Added to queue</string>
     <string name="lng_author">Developed by OxygenCobalt</string>
     <!-- As in music library -->
     <string name="lng_search_library">Search your library…</string>
-    <!-- Referring to playback state -->
-    <string name="lng_state_saved">State saved</string>
-    <!-- Referring to playback state -->
-    <string name="lng_state_wiped">State cleared</string>
-    <!-- Referring to playback state -->
-    <string name="lng_state_restored">State restored</string>
 
     <!-- Settings namespace | Settings-related labels -->
     <eat-comment />
@@ -158,7 +170,7 @@
     <string name="set_quality_covers_desc">Increases album cover quality, but results in longer loading times and higher memory usage</string>
     <string name="set_round_mode">Round mode</string>
     <string name="set_round_mode_desc">Enable rounded corners on additional UI elements (Requires album covers to be rounded)</string>
-    <string name="set_bar_action">Playback bar action</string>
+    <string name="set_bar_action">Playback bar secondary action</string>
     <string name="set_bar_action_next">Skip to next</string>
     <string name="set_bar_action_repeat">Repeat mode</string>
     <string name="set_bar_action_shuffle">@string/lbl_shuffle</string>
@@ -170,6 +182,7 @@
     <string name="set_headset_autoplay">Headset autoplay</string>
     <string name="set_headset_autoplay_desc">Always start playing when a headset is connected (may not work on all devices)</string>
     <string name="set_replay_gain">ReplayGain</string>
+    <string name="set_replay_gain_off">Off</string>
     <string name="set_replay_gain_track">Prefer track</string>
     <string name="set_replay_gain_album">Prefer album</string>
     <string name="set_replay_gain_dynamic">Prefer album if one is playing</string>
@@ -336,4 +349,4 @@
         <item quantity="one">%d album</item>
         <item quantity="other">%d albums</item>
     </plurals>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/xml-v31/widget_info.xml b/app/src/main/res/xml-v31/widget_info.xml
index 78fac7356..3aea33e3b 100644
--- a/app/src/main/res/xml-v31/widget_info.xml
+++ b/app/src/main/res/xml-v31/widget_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:description="@string/info_widget_desc"
+    android:description="@string/lng_playback"
     android:initialLayout="@layout/widget_default"
     android:minWidth="@dimen/widget_width_def"
     android:minHeight="@dimen/widget_height_def"
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png
index 08400729d..33fd21a4b 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png
index 8353c5865..5bd1423e5 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png differ
diff --git a/info/ARCHITECTURE.md b/info/ARCHITECTURE.md
index 0f45720f2..f077e2c63 100644
--- a/info/ARCHITECTURE.md
+++ b/info/ARCHITECTURE.md
@@ -44,7 +44,6 @@ org.oxycblt.auxio  # Main UIs
 │  └──.ui          # Preference extensions
 ├──.ui             # Custom android components
 │  ├──.accent      # Color Scheme UI + Systems
-│  ├──.coordinator # CoordinatorLayout components
 │  ├──.fragment    # Fragment extensions
 │  ├──.recycler    # RecyclerView extensions
 │  └──.system      # System-side components
@@ -314,10 +313,12 @@ integer data that Auxio uses.
 Shared views and view configuration models. This contains:
 
 - Important `Fragment` superclasses like `ViewBindingFragment` and `MenuFragment`
-- Customized views such as `EdgeAppBarLayout`, and others, which fix shortcomings with the
+- Customized views such as `AuxioAppBarLayout`, and others, which fix shortcomings with the
 default implementations.
 - Configuration models like `DisplayMode` and `Sort`, which are used in many places but aren't tied
 to a specific feature.
+- `ForegroundManager` and `ServiceNotification`, which remove boilerplate regarding service
+foreground instantiation.
 - The `RecyclerView` adapter framework described previously.
 - `BottomSheetLayout`, which implements a bottom sheet in a way that is not completely broken and
 insane.
diff --git a/info/FAQ.md b/info/FAQ.md
index cf1d446fc..8689b218d 100644
--- a/info/FAQ.md
+++ b/info/FAQ.md
@@ -19,6 +19,16 @@ As per the [Supported ExoPlayer Formats](https://exoplayer.dev/supported-formats
 MP4, MP3, MKA, OGG, WAV, MPEG, AAC on all versions of Android. Auxio also supports FLAC on all versions
 of Android through the use of the ExoPlayer FLAC extension.
 
+#### Why doesn't Auxio have a built-in equalizer or tag editor?
+
+Auxio tends to abide by a unix-esque philosophy where programs should try to stay in one
+category of tasks and do those tasks well. 
+
+- For equalization, Android already supports external equalizers like Wavelet, which tend to
+work on most modern devices that don't have broken OEM software. This is generally preferred
+compared to implementing my own equalizer.
+- For tag editing, external programs like kid3, picard, or ex falso fill this role.
+
 #### Auxio doesn't load my music correctly!
 This depends on the context:
 1. If "Ignore MediaStore Tags" is enabled, please create a bug report.