diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbebcf85b..c9fd1f7d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ be parsed as images
 - Fixed issue where the notification would not respond to changes in the album cover setting
 - Fixed issue where short names starting with an article would not be correctly sorted (ex. "the 1")
 
+#### Dev/Meta
+- Switched to androidx media3 (New Home of ExoPlayer) for backing player components
+
 ## 3.0.5
 
 #### What's Fixed
diff --git a/app/src/main/java/org/oxycblt/auxio/music/device/DeviceLibrary.kt b/app/src/main/java/org/oxycblt/auxio/music/device/DeviceLibrary.kt
index 120cd5875..af42d85ab 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/device/DeviceLibrary.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/device/DeviceLibrary.kt
@@ -210,8 +210,6 @@ private class DeviceLibraryImpl(rawSongs: List<RawSong>, settings: MusicSettings
         albums: List<AlbumImpl>,
         settings: MusicSettings
     ): List<ArtistImpl> {
-        // TODO: Debug an issue with my current library config that results in two duplicate
-        //  artists.
         // Add every raw artist credited to each Song/Album to the grouping. This way,
         // different multi-artist combinations are not treated as different artists.
         val musicByArtist = mutableMapOf<RawArtist, MutableList<Music>>()
diff --git a/app/src/main/java/org/oxycblt/auxio/music/picker/DeletePlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/picker/DeletePlaylistDialog.kt
index 155846606..cada8ed00 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/picker/DeletePlaylistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/picker/DeletePlaylistDialog.kt
@@ -36,6 +36,7 @@ import org.oxycblt.auxio.util.unlikelyToBeNull
 
 /**
  * A [ViewBindingDialogFragment] that asks the user to confirm the deletion of a [Playlist].
+ *
  * @author Alexander Capehart (OxygenCobalt)
  */
 @AndroidEntryPoint
diff --git a/media b/media
index 4ab06ffd6..8712967a7 160000
--- a/media
+++ b/media
@@ -1 +1 @@
-Subproject commit 4ab06ffd6039c038f2995f1a06bafed28bdd9be4
+Subproject commit 8712967a789192d60d2207451cd5ed2b3191999e
diff --git a/settings.gradle b/settings.gradle
index 4595c06e6..c8be53d93 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 include ':app'
 rootProject.name = "Auxio"
 gradle.ext.androidxMediaModulePrefix = 'media-'
+gradle.ext.androidxMediaProjectName = 'media-'
 apply from: file("media/core_settings.gradle")
\ No newline at end of file