diff --git a/app/build.gradle b/app/build.gradle
index 020ac0f04..5a0d6b87f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,12 +62,12 @@ dependencies {
 
     // General
     implementation "androidx.core:core-ktx:1.6.0"
-    implementation "androidx.activity:activity-ktx:1.3.0"
+    implementation "androidx.activity:activity-ktx:1.3.1"
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // UI
     implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
     implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
 
     // Lifecycle
@@ -83,7 +83,7 @@ dependencies {
 
     // Media
     // TODO: Migrate to media2 when I can figure out how to use it
-    implementation "androidx.media:media:1.4.0"
+    implementation "androidx.media:media:1.4.1"
 
     // Preferences
     implementation "androidx.preference:preference-ktx:1.1.1"
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index bbd3e0212..eca70cfe5 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
index bbd3e0212..eca70cfe5 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20f58f8aa..e46b5c20b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,9 +57,9 @@
             android:roundIcon="@mipmap/ic_launcher_round" />
 
         <receiver
-            android:label="@string/info_widget_name"
             android:name=".widgets.WidgetProvider"
-            android:exported="false">
+            android:exported="false"
+            android:label="@string/info_widget_name">
 
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
diff --git a/app/src/main/res/drawable/ic_artist.xml b/app/src/main/res/drawable/ic_artist.xml
index ae30da331..70312f0a6 100644
--- a/app/src/main/res/drawable/ic_artist.xml
+++ b/app/src/main/res/drawable/ic_artist.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorPrimary"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorPrimary">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
 </vector>
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index 90d2593bd..2cf5a8c2b 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -102,9 +102,9 @@
 
         <SeekBar
             android:id="@+id/playback_seek_bar"
+            style="@style/Widget.SeekBar.Full"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            style="@style/Widget.SeekBar.Full"
             android:layout_marginTop="@dimen/spacing_medium"
             app:layout_constraintBottom_toTopOf="@+id/playback_duration_current"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/item_album_header.xml b/app/src/main/res/layout-land/item_album_header.xml
index c6ed38b2b..b2aa1c994 100644
--- a/app/src/main/res/layout-land/item_album_header.xml
+++ b/app/src/main/res/layout-land/item_album_header.xml
@@ -25,12 +25,12 @@
 
         <ImageView
             android:id="@+id/album_cover"
+            style="@style/Widget.ImageView.Full"
             android:layout_width="@dimen/size_cover_detail_land"
             android:layout_height="@dimen/size_cover_detail_land"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_album_cover(album.name)}"
-            style="@style/Widget.ImageView.Full"
             app:albumArt="@{album}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -84,11 +84,11 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_play_button"
             style="@style/Widget.Button.Vibrant.Secondary"
-            android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
-            android:text="@string/lbl_play"
+            android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
-            android:layout_marginStart="@dimen/spacing_medium"
+            android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
+            android:text="@string/lbl_play"
             app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -97,11 +97,11 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_shuffle_button"
             style="@style/Widget.Button.Vibrant.Primary"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
             android:text="@string/lbl_shuffle"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/album_play_button"
@@ -121,9 +121,9 @@
 
         <ImageButton
             android:id="@+id/album_sort_button"
+            style="@style/Widget.Button.Unbounded.Small"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            style="@style/Widget.Button.Unbounded.Small"
             android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/album_song_header"
diff --git a/app/src/main/res/layout-land/item_genre_header.xml b/app/src/main/res/layout-land/item_genre_header.xml
index b5d49d995..bb27f69cb 100644
--- a/app/src/main/res/layout-land/item_genre_header.xml
+++ b/app/src/main/res/layout-land/item_genre_header.xml
@@ -69,7 +69,7 @@
             style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
             android:text="@string/lbl_play"
-                        android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
             android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
diff --git a/app/src/main/res/layout/fragment_compact_playback.xml b/app/src/main/res/layout/fragment_compact_playback.xml
index 8c8d1cdfe..4800381bf 100644
--- a/app/src/main/res/layout/fragment_compact_playback.xml
+++ b/app/src/main/res/layout/fragment_compact_playback.xml
@@ -46,9 +46,9 @@
         <TextView
             android:id="@+id/playback_song"
             style="@style/Widget.TextView.Compact.Primary"
-            android:text="@{song.name}"
             android:layout_marginStart="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
+            android:text="@{song.name}"
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -71,10 +71,10 @@
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
             style="@style/Widget.Button.Unbounded"
-            android:padding="0dp"
             android:layout_margin="@dimen/spacing_small"
             android:contentDescription="@string/desc_play_pause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
+            android:padding="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 6b316c81d..f72e5427e 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -25,8 +25,8 @@
             android:id="@+id/detail_recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
             tools:listitem="@layout/item_artist_header" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 877b88641..0ec9cc8dc 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -46,9 +46,9 @@
 
         <Button
             android:id="@+id/loading_retry_button"
+            style="@style/Widget.Button.Unbounded.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/Widget.Button.Unbounded.Text"
             android:onClick="@{() -> loadingModel.load(context)}"
             android:text="@string/lbl_retry"
             android:visibility="gone"
@@ -56,9 +56,9 @@
 
         <Button
             android:id="@+id/loading_grant_button"
+            style="@style/Widget.Button.Unbounded.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/Widget.Button.Unbounded.Text"
             android:onClick="@{() -> loadingModel.grant()}"
             android:text="@string/lbl_grant"
             android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 63e498ac2..dabb6983e 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -79,8 +79,8 @@
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:layout_marginBottom="@dimen/spacing_medium"
-            android:text="@{song.album.name}"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
+            android:text="@{song.album.name}"
             app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -88,9 +88,9 @@
 
         <SeekBar
             android:id="@+id/playback_seek_bar"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
             style="@style/Widget.SeekBar.Full"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintBottom_toTopOf="@+id/playback_duration_current"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 46721d346..69da403b1 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -32,8 +32,8 @@
                 app:boxStrokeWidthFocused="2dp"
                 app:endIconContentDescription="@string/desc_clear_search"
                 app:endIconDrawable="@drawable/ic_close"
-                app:endIconTint="?attr/colorControlNormal"
                 app:endIconMode="clear_text"
+                app:endIconTint="?attr/colorControlNormal"
                 app:errorEnabled="false">
 
                 <com.google.android.material.textfield.TextInputEditText
diff --git a/app/src/main/res/layout/item_action_header.xml b/app/src/main/res/layout/item_action_header.xml
index 23c939f06..dc62848f9 100644
--- a/app/src/main/res/layout/item_action_header.xml
+++ b/app/src/main/res/layout/item_action_header.xml
@@ -18,9 +18,9 @@
 
         <TextView
             android:id="@+id/header_title"
+            style="@style/Widget.TextView.Header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.TextView.Header"
             android:text="@{header.name}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -28,9 +28,9 @@
 
         <ImageButton
             android:id="@+id/header_button"
+            style="@style/Widget.Button.Unbounded.Small"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            style="@style/Widget.Button.Unbounded.Small"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/header_title"
diff --git a/app/src/main/res/layout/item_album_header.xml b/app/src/main/res/layout/item_album_header.xml
index f5318deb1..4227f5803 100644
--- a/app/src/main/res/layout/item_album_header.xml
+++ b/app/src/main/res/layout/item_album_header.xml
@@ -79,11 +79,11 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_play_button"
             style="@style/Widget.Button.Vibrant.Secondary"
-            android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
-            android:text="@string/lbl_play"
+            android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
-            android:layout_marginStart="@dimen/spacing_medium"
+            android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
+            android:text="@string/lbl_play"
             app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/album_details" />
@@ -91,11 +91,11 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_shuffle_button"
             style="@style/Widget.Button.Vibrant.Primary"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
             android:text="@string/lbl_shuffle"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/album_play_button"
@@ -103,9 +103,9 @@
 
         <TextView
             android:id="@+id/album_song_header"
+            style="@style/Widget.TextView.Header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
             android:background="@drawable/ui_header_dividers"
             android:text="@string/lbl_songs"
@@ -114,9 +114,9 @@
 
         <ImageButton
             android:id="@+id/album_sort_button"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
             style="@style/Widget.Button.Unbounded.Small"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
             android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/album_song_header"
diff --git a/app/src/main/res/layout/item_artist_header.xml b/app/src/main/res/layout/item_artist_header.xml
index 1259e19b2..2cab60118 100644
--- a/app/src/main/res/layout/item_artist_header.xml
+++ b/app/src/main/res/layout/item_artist_header.xml
@@ -21,11 +21,11 @@
 
         <ImageView
             android:id="@+id/artist_image"
+            style="@style/Widget.ImageView.Full"
             android:layout_width="@dimen/size_cover_detail"
             android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_artist_image(artist.name)}"
-            style="@style/Widget.ImageView.Full"
             app:artistImage="@{artist}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -74,11 +74,11 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_play_button"
             style="@style/Widget.Button.Vibrant.Secondary"
-            android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
-            android:text="@string/lbl_play"
+            android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
-            android:layout_marginStart="@dimen/spacing_medium"
+            android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
+            android:text="@string/lbl_play"
             app:layout_constraintEnd_toStartOf="@+id/artist_shuffle_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/artist_counts" />
@@ -86,11 +86,11 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_shuffle_button"
             style="@style/Widget.Button.Vibrant.Primary"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
             android:text="@string/lbl_shuffle"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/artist_play_button"
diff --git a/app/src/main/res/layout/item_blacklist_entry.xml b/app/src/main/res/layout/item_blacklist_entry.xml
index e2866f9b6..328c275b1 100644
--- a/app/src/main/res/layout/item_blacklist_entry.xml
+++ b/app/src/main/res/layout/item_blacklist_entry.xml
@@ -23,11 +23,11 @@
         <ImageButton
             android:id="@+id/blacklist_clear"
             style="@style/Widget.Button.Unbounded"
-            android:tint="?attr/colorControlNormal"
             android:layout_width="@dimen/size_clear"
             android:layout_height="@dimen/size_clear"
             android:contentDescription="@string/desc_blacklist_delete"
             android:src="@drawable/ic_clear"
+            android:tint="?attr/colorControlNormal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/item_genre_header.xml b/app/src/main/res/layout/item_genre_header.xml
index f7b045b0c..9de547e30 100644
--- a/app/src/main/res/layout/item_genre_header.xml
+++ b/app/src/main/res/layout/item_genre_header.xml
@@ -26,11 +26,11 @@
 
         <ImageView
             android:id="@+id/genre_image"
+            style="@style/Widget.ImageView.Full"
             android:layout_width="@dimen/size_cover_detail"
             android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/spacing_medium"
             android:contentDescription="@{@string/desc_genre_image(genre.name)}"
-            style="@style/Widget.ImageView.Full"
             app:genreImage="@{genre}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -79,11 +79,11 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/genre_play_button"
             style="@style/Widget.Button.Vibrant.Secondary"
-            android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
-            android:text="@string/lbl_play"
+            android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
-            android:layout_marginStart="@dimen/spacing_medium"
+            android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
+            android:text="@string/lbl_play"
             app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/genre_duration" />
@@ -101,9 +101,9 @@
 
         <TextView
             android:id="@+id/genre_song_header"
+            style="@style/Widget.TextView.Header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
             android:text="@string/lbl_songs"
             app:layout_constraintStart_toStartOf="parent"
@@ -111,9 +111,9 @@
 
         <ImageButton
             android:id="@+id/genre_sort_button"
+            style="@style/Widget.Button.Unbounded.Small"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            style="@style/Widget.Button.Unbounded.Small"
             android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementGenreSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/genre_song_header"
diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml
index e2f60e789..eb12a8b98 100644
--- a/app/src/main/res/layout/item_header.xml
+++ b/app/src/main/res/layout/item_header.xml
@@ -12,9 +12,9 @@
 
     <TextView
         android:id="@android:id/title"
+        style="@style/Widget.TextView.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/Widget.TextView.Header"
         android:text="@{header.name}"
         tools:text="Songs" />
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_full.xml b/app/src/main/res/layout/widget_full.xml
index d34d3f07e..6c17228e5 100644
--- a/app/src/main/res/layout/widget_full.xml
+++ b/app/src/main/res/layout/widget_full.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,8 +12,7 @@
         android:contentDescription="@string/desc_no_cover"
         android:src="@drawable/ic_song" />
 
-    <LinearLayout
-        style="@style/Widget.Component.AppWidget.Panel.Base">
+    <LinearLayout style="@style/Widget.Component.AppWidget.Panel.Base">
 
         <TextView
             android:id="@+id/widget_song"
diff --git a/app/src/main/res/layout/widget_small.xml b/app/src/main/res/layout/widget_small.xml
index bfac46c4f..69735e770 100644
--- a/app/src/main/res/layout/widget_small.xml
+++ b/app/src/main/res/layout/widget_small.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,8 +12,7 @@
         android:contentDescription="@string/desc_no_cover"
         android:src="@drawable/ic_song" />
 
-    <LinearLayout
-        style="@style/Widget.Component.AppWidget.Panel.Base">
+    <LinearLayout style="@style/Widget.Component.AppWidget.Panel.Base">
 
         <TextView
             android:id="@+id/widget_song"
diff --git a/app/src/main/res/values-v31/styles_component.xml b/app/src/main/res/values-v31/styles_component.xml
index efb0ce40a..87f67a2e5 100644
--- a/app/src/main/res/values-v31/styles_component.xml
+++ b/app/src/main/res/values-v31/styles_component.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="Widget.Component.AppWidget.Button" parent="Widget.Component.AppWidget.Button.Base">
         <item name="android:background">@drawable/ui_unbounded_ripple</item>
     </style>
diff --git a/app/src/main/res/values-v31/styles_core.xml b/app/src/main/res/values-v31/styles_core.xml
index f891d2f6b..37efdd3c8 100644
--- a/app/src/main/res/values-v31/styles_core.xml
+++ b/app/src/main/res/values-v31/styles_core.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="Theme.Widget" parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="colorPrimary">?android:attr/colorAccent</item>
         <item name="colorSecondary">?android:attr/colorAccent</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 702581a3e..c0e50d74f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="MissingTranslation">
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">A simple, rational music player for android.</string>
diff --git a/app/src/main/res/values/styles_component.xml b/app/src/main/res/values/styles_component.xml
index f8c253c0f..45aafe9a7 100644
--- a/app/src/main/res/values/styles_component.xml
+++ b/app/src/main/res/values/styles_component.xml
@@ -54,11 +54,11 @@
     </style>
 
     <style name="Widget.Component.AppWidget.Button" parent="Widget.Component.AppWidget.Button.Base">
-         <!--
-         Can't use a normal unbounded ripple here since it causes a weird bug
-         where the ripples will have a fixed starting size. Default to the
-         uglier system ripple instead.
-         -->
+        <!--
+        Can't use a normal unbounded ripple here since it causes a weird bug
+        where the ripples will have a fixed starting size. Default to the
+        uglier system ripple instead.
+        -->
         <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
     </style>
 
diff --git a/app/src/main/res/xml-v31/widget_minimal.xml b/app/src/main/res/xml-v31/widget_minimal.xml
index da6d4c4bb..8c6c4f6dc 100644
--- a/app/src/main/res/xml-v31/widget_minimal.xml
+++ b/app/src/main/res/xml-v31/widget_minimal.xml
@@ -1,12 +1,12 @@
 <?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:initialLayout="@layout/widget_small"
-    android:targetCellWidth="2"
-    android:targetCellHeight="2"
     android:minResizeWidth="110dp"
     android:minResizeHeight="110dp"
     android:previewLayout="@layout/widget_small"
-    android:description="@string/info_widget_desc"
     android:resizeMode="horizontal|vertical"
+    android:targetCellWidth="2"
+    android:targetCellHeight="2"
     android:updatePeriodMillis="0"
     android:widgetCategory="home_screen" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index 4cf1da482..042e316b3 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -21,12 +21,12 @@
             app:title="@string/set_accent" />
 
         <SwitchPreferenceCompat
+            app:allowDividerBelow="false"
             app:defaultValue="false"
             app:iconSpaceReserved="false"
             app:key="KEY_BLACK_THEME"
-            app:title="@string/set_black_mode"
             app:summary="@string/setting_black_mode_desc"
-            app:allowDividerBelow="false" />
+            app:title="@string/set_black_mode" />
 
     </PreferenceCategory>
 
diff --git a/app/src/main/res/xml/widget_minimal.xml b/app/src/main/res/xml/widget_minimal.xml
index 416c2f6ff..f3fa64dd3 100644
--- a/app/src/main/res/xml/widget_minimal.xml
+++ b/app/src/main/res/xml/widget_minimal.xml
@@ -3,7 +3,7 @@
     android:initialLayout="@layout/widget_small"
     android:minWidth="110dp"
     android:minHeight="110dp"
+    android:previewImage="@drawable/ui_widget_preview"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
-    android:previewImage="@drawable/ui_widget_preview"
     android:widgetCategory="home_screen" />
\ No newline at end of file