diff --git a/README.md b/README.md
index abb8ee9bd..8a19cbe90 100644
--- a/README.md
+++ b/README.md
@@ -22,14 +22,14 @@ I primarily built Auxio for myself, but you can use it too, I guess.
 ## Screenshots
 
 <p align="center">
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot0.png" width=200>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png" width=200>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot2.png" width=200>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot3.png" width=200>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot4.png" width=200>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot5.png" width=200>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png" width=200>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot7.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot0.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot2.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot3.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot4.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot5.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot7.png" width=200>
 </p>
 
 ## Features
@@ -51,7 +51,6 @@ I primarily built Auxio for myself, but you can use it too, I guess.
 ## To possibly come in the future:
 
 - Artist Images
-- Black theme
 - Custom accents
 - Playlists
 - Liked songs
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt b/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt
index dd9b64c34..eb3a9416f 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt
@@ -5,9 +5,11 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.oxycblt.auxio.R
+import org.oxycblt.auxio.ui.resolveAttr
 import org.oxycblt.auxio.ui.toDrawable
 
 /**
@@ -20,7 +22,7 @@ abstract class LifecycleDialog : AppCompatDialogFragment() {
 
         // Setting the background in XML will also apply it to the tooltip for some inane reason
         // so we have to do it programmatically instead.
-        builder.background = R.color.surface_color.toDrawable(requireContext())
+        builder.background = R.attr.colorSurface.resolveAttr(requireContext()).toDrawable()
 
         onConfigDialog(builder)
 
diff --git a/app/src/main/res/layout/dialog_blacklist.xml b/app/src/main/res/layout/dialog_blacklist.xml
index afeba3541..1614ebbcd 100644
--- a/app/src/main/res/layout/dialog_blacklist.xml
+++ b/app/src/main/res/layout/dialog_blacklist.xml
@@ -6,10 +6,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorSurface"
         android:orientation="vertical"
-        android:paddingTop="@dimen/spacing_small"
-        android:theme="@style/Theme.Neutral">
+        android:paddingTop="@dimen/spacing_small">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/blacklist_recycler"
diff --git a/app/src/main/res/layout/item_blacklist_entry.xml b/app/src/main/res/layout/item_blacklist_entry.xml
index ace6a7938..7b1e02b75 100644
--- a/app/src/main/res/layout/item_blacklist_entry.xml
+++ b/app/src/main/res/layout/item_blacklist_entry.xml
@@ -23,6 +23,7 @@
         <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/description_blacklist_delete"
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index 22c2ce07c..f148817d1 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -9,24 +9,26 @@
         <item name="cornerRadius">0dp</item>
     </style>
 
-    <!-- Toolbar popup menu -->
-    <style name="ThemeOverlay.ToolbarPopup" parent="ThemeOverlay.AppCompat.DayNight">
+    <style name="ThemeOverlay.ToolbarPopup.Base" parent="ThemeOverlay.AppCompat.DayNight">
         <item name="android:colorBackground">?attr/colorSurface</item>
+    </style>
+
+    <!-- Toolbar popup menu -->
+    <style name="ThemeOverlay.ToolbarPopup" parent="ThemeOverlay.ToolbarPopup.Base">
         <item name="colorControlHighlight">@color/selection_color</item>
     </style>
 
     <!-- Toolbar popup menu [Black] -->
-    <style name="ThemeOverlay.ToolbarPopup.Black" parent="ThemeOverlay.ToolbarPopup">
+    <style name="ThemeOverlay.ToolbarPopup.Black" parent="ThemeOverlay.ToolbarPopup.Base">
         <item name="colorControlHighlight">@color/selection_color_black</item>
     </style>
 
-    <!-- Custom Dialog EntryNames -->
-    <style name="Theme.CustomDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="android:colorControlHighlight">@color/selection_color</item>
+    <!-- Base custom dialog theme. Don't try to understand this. -->
+    <style name="Theme.CustomDialog.Base" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
         <item name="android:checkedTextViewStyle">@style/Widget.CheckedTextView.Dialog</item>
 
         <item name="materialAlertDialogTitleTextStyle">@style/Widget.TextView.Dialog.Title</item>
-        <item name="colorBackgroundFloating">@color/surface_color</item>
         <item name="alertDialogStyle">@style/MaterialAlertDialog.App</item>
 
         <item name="buttonBarPositiveButtonStyle">@style/Widget.Button.Dialog</item>
@@ -34,7 +36,19 @@
         <item name="buttonBarNeutralButtonStyle">@style/Widget.Button.Dialog.Neutral</item>
     </style>
 
-    <!-- Baseline dialog style -->
+    <!-- Normal DayNight dialog theme -->
+    <style name="Theme.CustomDialog" parent="Theme.CustomDialog.Base">
+        <item name="colorSurface">@color/surface_color</item>
+        <item name="colorControlHighlight">@color/selection_color</item>
+    </style>
+
+    <!-- Black theme dialog theme -->
+    <style name="Theme.CustomDialog.Black" parent="Theme.CustomDialog.Base">
+        <item name="colorSurface">@color/surface_color_black</item>
+        <item name="colorControlHighlight">@color/selection_color_black</item>
+    </style>
+
+    <!-- Material-specific dialog style -->
     <style name="MaterialAlertDialog.App" parent="MaterialAlertDialog.MaterialComponents">
         <item name="shapeAppearanceOverlay">@style/ShapeAppearance.Angular</item>
     </style>
@@ -64,7 +78,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:textAppearance">?android:attr/textAppearanceButton</item>
-        <item name="rippleColor">@color/selection_color</item>
+        <item name="rippleColor">?android:attr/colorControlHighlight</item>
         <item name="cornerRadius">0dp</item>
     </style>
 
@@ -72,6 +86,4 @@
     <style name="Widget.Button.Dialog.Neutral" parent="Widget.Button.Dialog">
         <item name="android:layout_marginStart">0dp</item>
     </style>
-
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index b9db5b514..5484ea2ef 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -45,5 +45,6 @@
         <item name="colorSurface">@color/surface_color_black</item>
         <item name="colorControlHighlight">@color/selection_color_black</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.ToolbarPopup.Black</item>
+        <item name="materialAlertDialogTheme">@style/Theme.CustomDialog.Black</item>
     </style>
 </resources>
\ No newline at end of file