diff --git a/app/build.gradle b/app/build.gradle
index 0805c292d..323441507 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,7 +68,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:1.3.2"
 
     // UI
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
 
@@ -85,7 +85,7 @@ dependencies {
 
     // Media
     // TODO: Migrate to media2 when I can figure out how to use it
-    implementation "androidx.media:media:1.2.1"
+    implementation "androidx.media:media:1.3.0"
 
     // Preferences
     implementation "androidx.preference:preference-ktx:1.1.1"
@@ -93,7 +93,7 @@ dependencies {
     // --- THIRD PARTY ---
 
     // ExoPlayer
-    def exoplayer_version = "2.13.2"
+    def exoplayer_version = "2.13.3"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
     implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version"
 
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
index 4393cc621..a1d6a7baf 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
@@ -58,14 +58,14 @@ class QueueDragCallback(private val playbackModel: PlaybackViewModel) : ItemTouc
         target: RecyclerView.ViewHolder
     ): Boolean {
         return playbackModel.moveQueueDataItems(
-            viewHolder.adapterPosition,
-            target.adapterPosition,
+            viewHolder.bindingAdapterPosition,
+            target.bindingAdapterPosition,
             queueAdapter
         )
     }
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        playbackModel.removeQueueDataItem(viewHolder.adapterPosition, queueAdapter)
+        playbackModel.removeQueueDataItem(viewHolder.bindingAdapterPosition, queueAdapter)
     }
 
     /**
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/AboutDialog.kt b/app/src/main/java/org/oxycblt/auxio/settings/AboutDialog.kt
index d982ae85b..c8399544e 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/AboutDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/AboutDialog.kt
@@ -59,7 +59,7 @@ class AboutDialog : BottomSheetDialogFragment() {
 
         if (pkgName != null) {
             if (pkgName == "android") {
-                // No default browser [Must open app chooser, may not be supported
+                // No default browser [Must open app chooser, may not be supported]
                 openAppChooser(browserIntent)
             } else {
                 try {
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
index f494c05f4..c6bb94e53 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
@@ -20,11 +20,8 @@ class SettingsManager private constructor(context: Context) :
     private val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context)
 
     init {
-        // If needed, we need to touch the song mode pref so that it migrates before something
-        // else is written by the Preference.
-        if (!sharedPrefs.contains(KEY_SONG_PLAYBACK_MODE)) {
-            handleSongPlayModeCompat(sharedPrefs)
-        }
+        // Poke the song playback mode pref so that it migrates [if it hasnt already]
+        handleSongPlayModeCompat(sharedPrefs)
 
         sharedPrefs.registerOnSharedPreferenceChangeListener(this)
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 345346b59..641920235 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -78,15 +78,15 @@
     <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. Anrufe]</string>
-    <string name="setting_audio_plug_mgt">Kopfhöreranschluss</string>
+    <string name="setting_audio_plug_mgt">Kopfhörerafokus</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_keep_shuffle">Zufällig-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>
+    <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>
 
     <string name="setting_content">Content</string>
     <string name="setting_content_save">Wiedergabezustand abspeichern</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d014810bf..fb7dbdd38 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,7 +79,7 @@
     <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. Calls]</string>
-    <string name="setting_audio_plug_mgt">Headset plug management</string>
+    <string name="setting_audio_plug_mgt">Headset focus</string>
     <string name="setting_audio_plug_mgt_desc">Play/Pause when the headset connection changes</string>
 
     <string name="setting_behavior">Behavior</string>
diff --git a/build.gradle b/build.gradle
index 4724ca81e..287035c01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = "1.4.32"
-    ext.navigation_version = "2.3.4"
+    ext.navigation_version = "2.3.5"
 
     repositories {
         google()
         mavenCentral()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.trove4j")
-            }
-        }
     }
 
     dependencies {
@@ -28,14 +22,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-
-        // TODO: Eliminate Exoplayer when it migrates to GMaven
-        jcenter {
-            content {
-                includeGroup("com.google.android.exoplayer")
-                includeGroup("org.jetbrains.trove4j")
-            }
-        }
     }
 }