diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 370e36e322..93c221cddd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/Theme.Base"
+        android:theme="@style/Theme.Base.Light"
         android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".ui.main.MainActivity"
@@ -84,7 +84,7 @@
         </activity>
         <activity
             android:name=".ui.security.UnlockActivity"
-            android:theme="@style/Theme.Base" />
+            android:theme="@style/Theme.Base.Light" />
         <activity
             android:name=".ui.webview.WebViewActivity"
             android:configChanges="uiMode|orientation|screenSize" />
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
index cc8740b4a2..1eb7245278 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
@@ -101,12 +101,13 @@ abstract class SettingsController : PreferenceController() {
     private fun animatePreferenceHighlight(view: View) {
         val origBackground = view.background
         ValueAnimator
-            .ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.rippleColor))
+            .ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.colorControlHighlight))
             .apply {
-                duration = 500L
-                repeatCount = 2
+                duration = 200L
+                repeatCount = 5
+                repeatMode = ValueAnimator.REVERSE
                 addUpdateListener { animator -> view.setBackgroundColor(animator.animatedValue as Int) }
-                reverse()
+                start()
             }
             .doOnEnd {
                 // Restore original ripple
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
index b1a7e79bf5..83f46f8d6a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
@@ -157,7 +157,7 @@ class WebViewActivity : BaseViewBindingActivity<WebviewActivityBinding>() {
         backItem?.isEnabled = binding.webview.canGoBack()
         forwardItem?.isEnabled = binding.webview.canGoForward()
 
-        val iconTintColor = getResourceColor(R.attr.colorOnPrimary)
+        val iconTintColor = getResourceColor(R.attr.colorOnToolbar)
         val translucentIconTintColor = ColorUtils.setAlphaComponent(iconTintColor, 127)
         backItem?.icon?.setTint(if (binding.webview.canGoBack()) iconTintColor else translucentIconTintColor)
         forwardItem?.icon?.setTint(if (binding.webview.canGoForward()) iconTintColor else translucentIconTintColor)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
index 5e87c2c612..0ff872bf1d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
@@ -93,7 +93,7 @@ fun Context.copyToClipboard(label: String, content: String) {
  */
 fun Context.notificationBuilder(channelId: String, block: (NotificationCompat.Builder.() -> Unit)? = null): NotificationCompat.Builder {
     val builder = NotificationCompat.Builder(this, channelId)
-        .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
+        .setColor(ContextCompat.getColor(this, R.color.accent_lightblue))
     if (block != null) {
         builder.block()
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
index 78c39c4a63..fb0ff44fdd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.widget
 
 import android.content.Context
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
@@ -12,6 +11,7 @@ import androidx.annotation.StringRes
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.view.isVisible
 import com.google.android.material.button.MaterialButton
+import com.mikepenz.aboutlibraries.util.getThemeColor
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.CommonViewEmptyBinding
 import kotlin.random.Random
@@ -42,17 +42,22 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         binding.textLabel.text = message
 
         binding.actionsContainer.removeAllViews()
+        val buttonContext = ContextThemeWrapper(context, R.style.Widget_Tachiyomi_Button_ActionButton)
+        val buttonColor = ColorStateList.valueOf(context.getThemeColor(R.attr.colorOnBackground))
         actions?.forEach {
-            val button = MaterialButton(ContextThemeWrapper(context, R.style.Theme_Widget_Button_Action)).apply {
+            val button = MaterialButton(
+                buttonContext,
+                null,
+                R.attr.borderlessButtonStyle
+            ).apply {
                 layoutParams = LinearLayout.LayoutParams(
                     0,
                     LinearLayout.LayoutParams.WRAP_CONTENT,
                     1f / actions.size
                 )
 
-                backgroundTintList = ColorStateList.valueOf(Color.TRANSPARENT)
-                stateListAnimator = null
-                elevation = 0f
+                setTextColor(buttonColor)
+                iconTint = buttonColor
 
                 setIconResource(it.iconResId)
                 setText(it.stringResId)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt
index b3fb931ba1..81e1fcef81 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt
@@ -2,22 +2,18 @@ package eu.kanade.tachiyomi.widget
 
 import android.content.Context
 import android.util.AttributeSet
-import androidx.core.content.ContextCompat
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.mikepenz.aboutlibraries.util.getThemeColor
 import eu.kanade.tachiyomi.R
 
-class ThemedSwipeRefreshLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
-    SwipeRefreshLayout(context, attrs) {
-
+class ThemedSwipeRefreshLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : SwipeRefreshLayout(context, attrs) {
     init {
-        setColors()
-    }
-
-    private fun setColors() {
-        // Background is controlled with "swipeRefreshLayoutProgressSpinnerBackgroundColor" in XML
-
+        // Background
+        setProgressBackgroundColorSchemeColor(context.getThemeColor(R.attr.colorPrimary))
         // This updates the progress arrow color
-        val white = ContextCompat.getColor(context, R.color.md_white_1000)
-        setColorSchemeColors(white, white, white)
+        setColorSchemeColors(context.getThemeColor(R.attr.colorOnPrimary))
     }
 }
diff --git a/app/src/main/res/color/background_color_chip_state.xml b/app/src/main/res/color/background_color_chip_state.xml
deleted file mode 100644
index 04f3cfb2d0..0000000000
--- a/app/src/main/res/color/background_color_chip_state.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/rippleColor" android:state_selected="true" />
-    <item android:color="?attr/rippleColor" android:state_pressed="true" />
-    <item android:color="?attr/rippleColor" android:state_focused="true" />
-    <item android:color="@android:color/transparent" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/button_action_selector.xml b/app/src/main/res/color/button_action_selector.xml
index d844195f11..f8e88896b6 100644
--- a/app/src/main/res/color/button_action_selector.xml
+++ b/app/src/main/res/color/button_action_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccent" android:state_activated="true" />
-    <item android:color="?android:attr/textColorHint" android:state_activated="false" />
+    <item android:alpha="1.00" android:color="?attr/colorPrimary" android:state_activated="true" />
+    <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_activated="false" />
 </selector>
diff --git a/app/src/main/res/color/draggable_card_foreground.xml b/app/src/main/res/color/draggable_card_foreground.xml
new file mode 100644
index 0000000000..32750a3a43
--- /dev/null
+++ b/app/src/main/res/color/draggable_card_foreground.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:alpha="0.08" android:color="?attr/colorPrimary" app:state_dragged="true" />
+    <item android:color="@android:color/transparent" />
+</selector>
diff --git a/app/src/main/res/color/library_item_background.xml b/app/src/main/res/color/library_item_background.xml
new file mode 100644
index 0000000000..c967f28e90
--- /dev/null
+++ b/app/src/main/res/color/library_item_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:alpha="0.75" android:color="?attr/colorPrimary" />
+    <item android:state_activated="true" android:alpha="0.75" android:color="?attr/colorPrimary" />
+</selector>
diff --git a/app/src/main/res/color/library_item_foreground.xml b/app/src/main/res/color/library_item_foreground.xml
new file mode 100644
index 0000000000..0a0a946f1b
--- /dev/null
+++ b/app/src/main/res/color/library_item_foreground.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:alpha="0.2" android:color="?attr/colorPrimary" />
+    <item android:state_activated="true" android:alpha="0.2" android:color="?attr/colorPrimary" />
+</selector>
diff --git a/app/src/main/res/color/nav_selector.xml b/app/src/main/res/color/nav_selector.xml
index 8297b43b4b..264e2becf8 100644
--- a/app/src/main/res/color/nav_selector.xml
+++ b/app/src/main/res/color/nav_selector.xml
@@ -3,6 +3,6 @@
   Based on mtrl_bottom_nav_colored_item_tint
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="1.0" android:color="?attr/colorAccentOnPrimary" android:state_checked="true" />
-    <item android:alpha="0.6" android:color="?attr/colorOnPrimary" />
+    <item android:alpha="1.0" android:color="?attr/colorPrimary" android:state_checked="true" />
+    <item android:alpha="0.6" android:color="?attr/colorOnSurface" />
 </selector>
diff --git a/app/src/main/res/color/selector_overlay.xml b/app/src/main/res/color/ripple_colored.xml
similarity index 57%
rename from app/src/main/res/color/selector_overlay.xml
rename to app/src/main/res/color/ripple_colored.xml
index 69bad1405d..71e20d7242 100644
--- a/app/src/main/res/color/selector_overlay.xml
+++ b/app/src/main/res/color/ripple_colored.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.2" android:color="?attr/colorAccent" />
-</selector>
\ No newline at end of file
+    <item android:alpha="0.12" android:color="?attr/colorPrimary" />
+</selector>
diff --git a/app/src/main/res/color/ripple_toolbar_fainter.xml b/app/src/main/res/color/ripple_toolbar_fainter.xml
new file mode 100644
index 0000000000..67e2f7f24b
--- /dev/null
+++ b/app/src/main/res/color/ripple_toolbar_fainter.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 34% of 12% = ~4% -->
+    <item android:alpha="0.34" android:color="?attr/rippleColorToolbar" />
+</selector>
diff --git a/app/src/main/res/color/source_comfortable_item_title.xml b/app/src/main/res/color/source_comfortable_item_title.xml
new file mode 100644
index 0000000000..c643506823
--- /dev/null
+++ b/app/src/main/res/color/source_comfortable_item_title.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="?attr/colorOnPrimary" />
+    <item android:state_activated="true" android:color="?attr/colorOnPrimary" />
+    <item android:color="?android:attr/textColorPrimary" />
+</selector>
diff --git a/app/src/main/res/color/tabs_selector.xml b/app/src/main/res/color/tabs_selector.xml
index 4a70bc2f49..7b417175d3 100644
--- a/app/src/main/res/color/tabs_selector.xml
+++ b/app/src/main/res/color/tabs_selector.xml
@@ -6,6 +6,6 @@
   it (i.e. blue themes).
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccentOnPrimary" android:state_selected="true" />
-    <item android:alpha="0.60" android:color="?attr/colorOnPrimary" />
+    <item android:color="?attr/colorPrimary" android:state_selected="true" />
+    <item android:alpha="0.60" android:color="?attr/colorOnToolbar" />
 </selector>
diff --git a/app/src/main/res/color/tabs_selector_background.xml b/app/src/main/res/color/tabs_selector_background.xml
deleted file mode 100644
index 2824c4f0d8..0000000000
--- a/app/src/main/res/color/tabs_selector_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Based on mtrl_tabs_icon_color_selector_colored.
-
-  Ensures visibility on top of the background color.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccent" android:state_selected="true" />
-    <item android:alpha="0.60" android:color="?attr/colorOnBackground" />
-</selector>
diff --git a/app/src/main/res/color/text_input_stroke.xml b/app/src/main/res/color/text_input_stroke.xml
deleted file mode 100644
index 016705af1d..0000000000
--- a/app/src/main/res/color/text_input_stroke.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  The regular version uses ?attr/colorPrimary when focused, which doesn't work well with our themes.
-  https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/textfield/res/color/mtrl_filled_stroke_color.xml
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorSecondary" android:state_focused="true" />
-    <item android:alpha="0.87" android:color="?attr/colorOnSurface" android:state_hovered="true" />
-    <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false" />
-    <item android:alpha="0.38" android:color="?attr/colorOnSurface" />
-</selector>
diff --git a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
index f2fb02a3e5..5233c9fe83 100644
--- a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/colorPrimary"/>
+<background android:drawable="@color/accent_lightblue"/>
 <foreground>
     <vector
         android:width="120dp"
@@ -11,10 +11,10 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/textColorPrimaryDark"
+                android:fillColor="@color/md_white_1000"
                 android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/>
             <path
-                android:fillColor="@color/textColorPrimaryDark"
+                android:fillColor="@color/md_white_1000"
                 android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z"/>
         </group>
     </vector>
diff --git a/app/src/main/res/drawable-v26/sc_explore_48dp.xml b/app/src/main/res/drawable-v26/sc_explore_48dp.xml
index 9a574c0644..61f1e9e39a 100644
--- a/app/src/main/res/drawable-v26/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_explore_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/colorPrimary"/>
+<background android:drawable="@color/accent_lightblue"/>
 <foreground>
     <vector
         android:width="120dp"
@@ -11,7 +11,7 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/textColorPrimaryDark"
+                android:fillColor="@color/md_white_1000"
                 android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
         </group>
     </vector>
diff --git a/app/src/main/res/drawable-v26/sc_history_48dp.xml b/app/src/main/res/drawable-v26/sc_history_48dp.xml
index 4ce51f848c..3b9cbc93fd 100644
--- a/app/src/main/res/drawable-v26/sc_history_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_history_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/colorPrimary"/>
+<background android:drawable="@color/accent_lightblue"/>
 <foreground>
     <vector
         android:width="120dp"
@@ -11,7 +11,7 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/textColorPrimaryDark"
+                android:fillColor="@color/md_white_1000"
                 android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
         </group>
     </vector>
diff --git a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
index 9b8fd1cb61..401d906e50 100644
--- a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-<background android:drawable="@color/colorPrimary"/>
+<background android:drawable="@color/accent_lightblue"/>
 <foreground>
     <vector
         android:width="120dp"
@@ -11,7 +11,7 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/textColorPrimaryDark"
+                android:fillColor="@color/md_white_1000"
                 android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
         </group>
     </vector>
diff --git a/app/src/main/res/drawable/library_item_selector.xml b/app/src/main/res/drawable/library_item_selector.xml
index 11714e2ee5..074ea244b0 100644
--- a/app/src/main/res/drawable/library_item_selector.xml
+++ b/app/src/main/res/drawable/library_item_selector.xml
@@ -1,42 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorLibrarySelection">
+    android:color="?attr/colorPrimary">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/card_selector_radius" />
+            <solid android:color="#80FFFFFF" />
+        </shape>
+    </item>
     <item>
-        <selector>
-            <item
-                android:state_selected="true"
-                android:top="2dp"
-                android:right="2dp"
-                android:bottom="2dp"
-                android:left="2dp">
-                <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_selector_radius" />
-                    <solid android:color="?attr/colorLibrarySelectionActive" />
-                </shape>
-            </item>
-
-            <item
-                android:state_activated="true"
-                android:top="2dp"
-                android:right="2dp"
-                android:bottom="2dp"
-                android:left="2dp">
-                <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_selector_radius" />
-                    <solid android:color="?attr/colorLibrarySelectionActive" />
-                </shape>
-            </item>
-
-            <item
-                android:top="2dp"
-                android:right="2dp"
-                android:bottom="2dp"
-                android:left="2dp">
-                <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_selector_radius" />
-                    <solid android:color="?android:attr/colorBackground" />
-                </shape>
-            </item>
-        </selector>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/card_selector_radius" />
+            <solid android:color="@color/library_item_background" />
+        </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/library_item_selector_overlay.xml b/app/src/main/res/drawable/library_item_selector_overlay.xml
index ac49770e08..4c19540e32 100644
--- a/app/src/main/res/drawable/library_item_selector_overlay.xml
+++ b/app/src/main/res/drawable/library_item_selector_overlay.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorLibrarySelection">
+    android:color="?attr/colorPrimary">
     <item>
-        <selector xmlns:android="http://schemas.android.com/apk/res/android">
-            <item android:state_selected="true">
-                <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_selector_radius" />
-                    <solid android:color="@color/selector_overlay" />
-                </shape>
-            </item>
-
-            <item android:state_activated="true">
-                <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/card_selector_radius" />
-                    <solid android:color="@color/selector_overlay" />
-                </shape>
-            </item>
-        </selector>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/card_selector_radius" />
+            <solid android:color="@color/library_item_foreground" />
+        </shape>
     </item>
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/app/src/main/res/drawable/list_item_selector.xml b/app/src/main/res/drawable/list_item_selector.xml
index 1e25926654..4bdb726006 100644
--- a/app/src/main/res/drawable/list_item_selector.xml
+++ b/app/src/main/res/drawable/list_item_selector.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/rippleColor">
+    android:color="?attr/colorControlHighlight">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="?attr/rippleColor" />
+                <color android:color="?attr/colorControlHighlight" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="?attr/rippleColor" />
+                <color android:color="?attr/colorControlHighlight" />
             </item>
 
             <item>
diff --git a/app/src/main/res/drawable/list_item_selector_background.xml b/app/src/main/res/drawable/list_item_selector_background.xml
index e1b1ed5db3..26682873a9 100644
--- a/app/src/main/res/drawable/list_item_selector_background.xml
+++ b/app/src/main/res/drawable/list_item_selector_background.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/rippleColor">
+    android:color="?attr/colorControlHighlight">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="?attr/rippleColor" />
+                <color android:color="?attr/colorControlHighlight" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="?attr/rippleColor" />
+                <color android:color="?attr/colorControlHighlight" />
             </item>
 
             <item>
diff --git a/app/src/main/res/drawable/reader_seekbar_background.xml b/app/src/main/res/drawable/reader_seekbar_background.xml
index f3e97c5406..ecb8171f0e 100644
--- a/app/src/main/res/drawable/reader_seekbar_background.xml
+++ b/app/src/main/res/drawable/reader_seekbar_background.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="?attr/actionBarSize" />
-    <solid android:color="?attr/colorPrimary" />
+    <solid android:color="?attr/colorToolbar" />
 </shape>
diff --git a/app/src/main/res/drawable/reader_seekbar_ripple.xml b/app/src/main/res/drawable/reader_seekbar_ripple.xml
index 0c8c0e16be..982f2361e0 100644
--- a/app/src/main/res/drawable/reader_seekbar_ripple.xml
+++ b/app/src/main/res/drawable/reader_seekbar_ripple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/rippleColor">
+    android:color="?attr/colorControlHighlight">
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
diff --git a/app/src/main/res/drawable/ripple_background.xml b/app/src/main/res/drawable/ripple_background.xml
deleted file mode 100644
index 7c51636027..0000000000
--- a/app/src/main/res/drawable/ripple_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/rippleColor">
-    <item android:drawable="?android:attr/colorBackground" />
-</ripple>
diff --git a/app/src/main/res/drawable/ripple_regular.xml b/app/src/main/res/drawable/ripple_regular.xml
deleted file mode 100644
index d697f52330..0000000000
--- a/app/src/main/res/drawable/ripple_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/rippleColor" />
diff --git a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
index ad99bbb47e..e14bcd139a 100644
--- a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
+++ b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
@@ -6,17 +6,17 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@color/accent_lightblue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/textColorPrimaryDark"
+            android:fillColor="@color/md_white_1000"
             android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z" />
         <path
-            android:fillColor="@color/textColorPrimaryDark"
+            android:fillColor="@color/md_white_1000"
             android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/sc_explore_48dp.xml b/app/src/main/res/drawable/sc_explore_48dp.xml
index 1d054fb765..10847d5b72 100644
--- a/app/src/main/res/drawable/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable/sc_explore_48dp.xml
@@ -6,14 +6,14 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@color/accent_lightblue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/textColorPrimaryDark"
+            android:fillColor="@color/md_white_1000"
             android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/sc_history_48dp.xml b/app/src/main/res/drawable/sc_history_48dp.xml
index ebf179e4d8..2630973ba3 100644
--- a/app/src/main/res/drawable/sc_history_48dp.xml
+++ b/app/src/main/res/drawable/sc_history_48dp.xml
@@ -6,14 +6,14 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@color/accent_lightblue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/textColorPrimaryDark"
+            android:fillColor="@color/md_white_1000"
             android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/sc_new_releases_48dp.xml b/app/src/main/res/drawable/sc_new_releases_48dp.xml
index ac295ee81d..84ee728097 100644
--- a/app/src/main/res/drawable/sc_new_releases_48dp.xml
+++ b/app/src/main/res/drawable/sc_new_releases_48dp.xml
@@ -6,14 +6,14 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@color/accent_lightblue"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/textColorPrimaryDark"
+            android:fillColor="@color/md_white_1000"
             android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/selectable_item_background.xml b/app/src/main/res/drawable/selectable_item_background.xml
deleted file mode 100644
index dbaebc3253..0000000000
--- a/app/src/main/res/drawable/selectable_item_background.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ripple_regular" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_background.xml b/app/src/main/res/drawable/splash_background.xml
index c62fb2192a..761fbac44b 100644
--- a/app/src/main/res/drawable/splash_background.xml
+++ b/app/src/main/res/drawable/splash_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="?attr/colorBackgroundSplash" />
+    <item android:drawable="@color/splash" />
 
     <item
         android:width="72dp"
diff --git a/app/src/main/res/drawable/tab_indicator.xml b/app/src/main/res/drawable/tab_indicator.xml
index e9ae933c1f..f5788153fe 100644
--- a/app/src/main/res/drawable/tab_indicator.xml
+++ b/app/src/main/res/drawable/tab_indicator.xml
@@ -3,5 +3,5 @@
     <corners
         android:topLeftRadius="4dp"
         android:topRightRadius="4dp" />
-    <solid android:color="?attr/colorAccentOnPrimary" />
+    <solid android:color="@android:color/white" />
 </shape>
diff --git a/app/src/main/res/layout-sw720dp/main_activity.xml b/app/src/main/res/layout-sw720dp/main_activity.xml
index 697d50fa24..9e357023b3 100644
--- a/app/src/main/res/layout-sw720dp/main_activity.xml
+++ b/app/src/main/res/layout-sw720dp/main_activity.xml
@@ -77,7 +77,7 @@
             android:layout_height="0dp"
             app:elevation="0dp"
             app:itemIconTint="@color/nav_selector"
-            app:itemRippleColor="?attr/rippleSecondaryColor"
+            app:itemRippleColor="?attr/colorControlHighlight"
             app:itemTextColor="@color/nav_selector"
             app:labelVisibilityMode="labeled"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -87,7 +87,7 @@
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
-            style="@style/Theme.Widget.Tabs"
+            style="@style/Widget.Tachiyomi.TabLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw720dp/manga_info_header.xml b/app/src/main/res/layout-sw720dp/manga_info_header.xml
index 3be161c59a..1d51cd91e4 100644
--- a/app/src/main/res/layout-sw720dp/manga_info_header.xml
+++ b/app/src/main/res/layout-sw720dp/manga_info_header.xml
@@ -149,7 +149,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_favorite"
-            style="@style/Theme.Widget.Button.Action"
+            style="@style/Widget.Tachiyomi.Button.ActionButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -158,7 +158,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_tracking"
-            style="@style/Theme.Widget.Button.Action"
+            style="@style/Widget.Tachiyomi.Button.ActionButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -169,7 +169,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_webview"
-            style="@style/Theme.Widget.Button.Action"
+            style="@style/Widget.Tachiyomi.Button.ActionButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -219,7 +219,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/manga_info_toggle_more"
-            style="@style/Theme.Widget.Button.TextButton"
+            style="@style/Widget.Tachiyomi.Button.InlineButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="8dp"
@@ -231,7 +231,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/manga_info_toggle_less"
-            style="@style/Theme.Widget.Button.TextButton"
+            style="@style/Widget.Tachiyomi.Button.InlineButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/action_toolbar.xml b/app/src/main/res/layout/action_toolbar.xml
index 43835cebfe..f78162c578 100644
--- a/app/src/main/res/layout/action_toolbar.xml
+++ b/app/src/main/res/layout/action_toolbar.xml
@@ -19,8 +19,6 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_gravity="bottom"
-            android:background="?attr/colorPrimary"
-            android:theme="?attr/actionBarTheme"
             app:contentInsetEnd="8dp"
             app:contentInsetStart="8dp">
 
diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml
index a729e8982b..cade6d105d 100644
--- a/app/src/main/res/layout/categories_item.xml
+++ b/app/src/main/res/layout/categories_item.xml
@@ -6,12 +6,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:cardBackgroundColor="?android:attr/colorBackground"
-    app:cardElevation="0dp">
+    app:cardElevation="0dp"
+    app:cardForegroundColor="@color/draggable_card_foreground">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/list_item_selector_background">
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/reorder"
diff --git a/app/src/main/res/layout/chapter_download_view.xml b/app/src/main/res/layout/chapter_download_view.xml
index 99d7c21723..5575d562af 100644
--- a/app/src/main/res/layout/chapter_download_view.xml
+++ b/app/src/main/res/layout/chapter_download_view.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="42dp"
     android:layout_height="42dp"
-    android:background="@drawable/ripple_regular"
+    android:background="?attr/selectableItemBackgroundBorderless"
     android:padding="8dp">
 
     <ImageView
diff --git a/app/src/main/res/layout/common_spinner_item.xml b/app/src/main/res/layout/common_spinner_item.xml
index 38c180e650..07cb1dd486 100644
--- a/app/src/main/res/layout/common_spinner_item.xml
+++ b/app/src/main/res/layout/common_spinner_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
-    style="@style/Theme.Widget.SpinnerItem"
+    style="@style/Widget.Tachiyomi.SpinnerItem"
     android:layout_width="match_parent"
     android:layout_height="?attr/dropdownListPreferredItemHeight"
     android:ellipsize="end"
diff --git a/app/src/main/res/layout/common_tabbed_sheet.xml b/app/src/main/res/layout/common_tabbed_sheet.xml
index 59dd9d9f84..9b7014fa53 100644
--- a/app/src/main/res/layout/common_tabbed_sheet.xml
+++ b/app/src/main/res/layout/common_tabbed_sheet.xml
@@ -12,8 +12,8 @@
 
         <!-- Remove background color so rounded sheet corners work -->
         <com.google.android.material.tabs.TabLayout
+            style="@style/Widget.Tachiyomi.TabLayout"
             android:id="@+id/tabs"
-            style="@style/Theme.Widget.Tabs"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -22,15 +22,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:tabGravity="fill"
-            app:tabIndicatorColor="?attr/colorAccent"
-            app:tabMode="fixed"
-            app:tabTextColor="@color/tabs_selector_background" />
+            app:tabMode="fixed" />
 
         <ImageButton
             android:id="@+id/menu"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="@drawable/ripple_regular"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/action_menu"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
@@ -39,7 +37,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/ic_overflow_24dp"
-            app:tint="?attr/colorOnBackground"
+            app:tint="?attr/colorOnSurface"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index b353473cb0..61c222e699 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -7,12 +7,12 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
     app:cardBackgroundColor="?android:attr/colorBackground"
-    app:cardElevation="0dp">
+    app:cardElevation="0dp"
+    app:cardForegroundColor="@color/draggable_card_foreground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/list_item_selector_background">
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/reorder"
@@ -98,7 +98,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/download_progress_text"
-            android:background="@drawable/ripple_regular"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/action_menu"
             android:paddingHorizontal="10dp"
             android:paddingVertical="16dp"
diff --git a/app/src/main/res/layout/extension_card_item.xml b/app/src/main/res/layout/extension_card_item.xml
index 7fbcb33e3f..8ac5919d4e 100644
--- a/app/src/main/res/layout/extension_card_item.xml
+++ b/app/src/main/res/layout/extension_card_item.xml
@@ -76,7 +76,7 @@
 
     <Button
         android:id="@+id/ext_button"
-        style="@style/Theme.Widget.Button"
+        style="?attr/borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/app/src/main/res/layout/extension_detail_header.xml b/app/src/main/res/layout/extension_detail_header.xml
index ddd9ec61e7..95bf05f95f 100644
--- a/app/src/main/res/layout/extension_detail_header.xml
+++ b/app/src/main/res/layout/extension_detail_header.xml
@@ -20,7 +20,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
+        android:background="?attr/colorToolbar"
         android:elevation="2dp"
         android:padding="16dp">
 
@@ -98,7 +98,6 @@
 
         <Button
             android:id="@+id/extension_uninstall_button"
-            style="@style/Theme.Widget.Button.FilledAccent"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/global_search_controller_card.xml b/app/src/main/res/layout/global_search_controller_card.xml
index 6915a1a903..80dbf051d5 100644
--- a/app/src/main/res/layout/global_search_controller_card.xml
+++ b/app/src/main/res/layout/global_search_controller_card.xml
@@ -10,7 +10,7 @@
         android:id="@+id/title_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/selectable_item_background">
+        android:background="?attr/selectableItemBackground">
 
         <TextView
             android:id="@+id/title"
@@ -67,7 +67,7 @@
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress"
-        style="@style/Theme.Widget.CircularProgressIndicator.Small"
+        style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/global_search_controller_card_item.xml b/app/src/main/res/layout/global_search_controller_card_item.xml
index 790728c6ea..5ab5c88cdc 100644
--- a/app/src/main/res/layout/global_search_controller_card_item.xml
+++ b/app/src/main/res/layout/global_search_controller_card_item.xml
@@ -22,7 +22,7 @@
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/progress"
-            style="@style/Theme.Widget.CircularProgressIndicator.Small"
+            style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -50,7 +50,6 @@
         android:lineSpacingExtra="-4dp"
         android:maxLines="2"
         android:padding="4dp"
-        android:shadowColor="@color/textColorPrimaryLight"
         app:layout_constraintEnd_toEndOf="@+id/card"
         app:layout_constraintStart_toStartOf="@+id/card"
         app:layout_constraintTop_toBottomOf="@+id/card"
diff --git a/app/src/main/res/layout/history_item.xml b/app/src/main/res/layout/history_item.xml
index 8956561ce7..bdd77bc56e 100644
--- a/app/src/main/res/layout/history_item.xml
+++ b/app/src/main/res/layout/history_item.xml
@@ -9,7 +9,7 @@
     android:paddingTop="8dp"
     android:paddingEnd="8dp"
     android:paddingBottom="8dp"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:orientation="horizontal">
 
     <ImageView
@@ -57,7 +57,7 @@
         android:id="@+id/remove"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/ripple_regular"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_resume"
         android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -70,7 +70,7 @@
         android:id="@+id/resume"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/ripple_regular"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_resume"
         android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/library_controller.xml b/app/src/main/res/layout/library_controller.xml
index 2df778c033..9fdc7de35c 100644
--- a/app/src/main/res/layout/library_controller.xml
+++ b/app/src/main/res/layout/library_controller.xml
@@ -12,7 +12,7 @@
 
         <Button
             android:id="@+id/btn_global_search"
-            style="@style/Theme.Widget.Button"
+            style="?attr/borderlessButtonStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
diff --git a/app/src/main/res/layout/library_grid_recycler.xml b/app/src/main/res/layout/library_grid_recycler.xml
index 68d03e83ed..e80b60499c 100644
--- a/app/src/main/res/layout/library_grid_recycler.xml
+++ b/app/src/main/res/layout/library_grid_recycler.xml
@@ -2,7 +2,7 @@
 <eu.kanade.tachiyomi.widget.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/library_grid"
-    style="@style/Theme.Widget.GridView.Source"
+    style="@style/Widget.Tachiyomi.GridView.Source"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 9e78a2229b..e57b5b088f 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -17,13 +17,11 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
             android:theme="?attr/actionBarTheme"
             app:layout_scrollFlags="scroll|enterAlways" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
-            style="@style/Theme.Widget.Tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
@@ -77,13 +75,10 @@
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_nav"
-        style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        app:itemIconTint="@color/nav_selector"
-        app:itemRippleColor="?attr/rippleSecondaryColor"
-        app:itemTextColor="@color/nav_selector"
+        app:itemRippleColor="@color/ripple_toolbar_fainter"
         app:labelVisibilityMode="labeled"
         app:layout_insetEdge="bottom"
         app:menu="@menu/main_nav" />
diff --git a/app/src/main/res/layout/main_activity_fab.xml b/app/src/main/res/layout/main_activity_fab.xml
index e12ffac76f..e1a270ef6c 100644
--- a/app/src/main/res/layout/main_activity_fab.xml
+++ b/app/src/main/res/layout/main_activity_fab.xml
@@ -2,7 +2,11 @@
 <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_fab"
-    style="@style/Theme.Widget.FAB"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:layout_gravity="bottom|end"
+    android:minWidth="0dp"
     android:visibility="gone"
     tools:icon="@drawable/ic_add_24dp"
     tools:text="Action"
diff --git a/app/src/main/res/layout/main_activity_toolbar.xml b/app/src/main/res/layout/main_activity_toolbar.xml
index 4a1a6a5ae8..3f63dbd5af 100644
--- a/app/src/main/res/layout/main_activity_toolbar.xml
+++ b/app/src/main/res/layout/main_activity_toolbar.xml
@@ -11,13 +11,10 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:theme="?attr/actionBarTheme"
         app:layout_scrollFlags="scroll|enterAlways" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabs"
-        style="@style/Theme.Widget.Tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/manga_chapters_header.xml b/app/src/main/res/layout/manga_chapters_header.xml
index c17d99c063..51ab83f24f 100644
--- a/app/src/main/res/layout/manga_chapters_header.xml
+++ b/app/src/main/res/layout/manga_chapters_header.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="16dp"
     android:paddingTop="4dp"
     android:paddingEnd="12dp"
@@ -28,12 +28,12 @@
         android:id="@+id/btn_chapters_filter"
         android:layout_width="28dp"
         android:layout_height="28dp"
-        android:background="@drawable/ripple_regular"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_filter"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_filter_list_24dp"
-        app:tint="?attr/colorOnPrimary" />
+        app:tint="?attr/colorOnBackground" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml
index cfeb98c811..20b496fdbb 100644
--- a/app/src/main/res/layout/manga_info_header.xml
+++ b/app/src/main/res/layout/manga_info_header.xml
@@ -137,7 +137,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_favorite"
-            style="@style/Theme.Widget.Button.Action"
+            style="@style/Widget.Tachiyomi.Button.ActionButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -146,7 +146,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_tracking"
-            style="@style/Theme.Widget.Button.Action"
+            style="@style/Widget.Tachiyomi.Button.ActionButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -157,7 +157,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_webview"
-            style="@style/Theme.Widget.Button.Action"
+            style="@style/Widget.Tachiyomi.Button.ActionButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -206,7 +206,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/manga_info_toggle_more"
-            style="@style/Theme.Widget.Button.TextButton"
+            style="@style/Widget.Tachiyomi.Button.InlineButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="8dp"
@@ -218,7 +218,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/manga_info_toggle_less"
-            style="@style/Theme.Widget.Button.TextButton"
+            style="@style/Widget.Tachiyomi.Button.InlineButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/navigation_view_checkbox.xml b/app/src/main/res/layout/navigation_view_checkbox.xml
index d1bd53190d..2c36b7bf4c 100644
--- a/app/src/main/res/layout/navigation_view_checkbox.xml
+++ b/app/src/main/res/layout/navigation_view_checkbox.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
     android:paddingEnd="?attr/listPreferredItemPaddingEnd">
diff --git a/app/src/main/res/layout/navigation_view_checkedtext.xml b/app/src/main/res/layout/navigation_view_checkedtext.xml
index c625d96a7f..51243946cc 100644
--- a/app/src/main/res/layout/navigation_view_checkedtext.xml
+++ b/app/src/main/res/layout/navigation_view_checkedtext.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
     android:paddingEnd="?attr/listPreferredItemPaddingEnd">
diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml
index 772122e56a..8caca0f3d0 100644
--- a/app/src/main/res/layout/navigation_view_group.xml
+++ b/app/src/main/res/layout/navigation_view_group.xml
@@ -24,6 +24,6 @@
         android:id="@+id/expand_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:tint="?attr/colorOnPrimary" />
+        app:tint="?attr/colorOnBackground" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_radio.xml b/app/src/main/res/layout/navigation_view_radio.xml
index 0cbeff65a1..7ac1d6687f 100644
--- a/app/src/main/res/layout/navigation_view_radio.xml
+++ b/app/src/main/res/layout/navigation_view_radio.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
     android:paddingEnd="?attr/listPreferredItemPaddingEnd">
diff --git a/app/src/main/res/layout/navigation_view_spinner.xml b/app/src/main/res/layout/navigation_view_spinner.xml
index acab1c8f08..2d3b8a6306 100644
--- a/app/src/main/res/layout/navigation_view_spinner.xml
+++ b/app/src/main/res/layout/navigation_view_spinner.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
     android:paddingEnd="?attr/listPreferredItemPaddingEnd">
diff --git a/app/src/main/res/layout/navigation_view_text.xml b/app/src/main/res/layout/navigation_view_text.xml
index ca1e1d1eac..359b825d85 100644
--- a/app/src/main/res/layout/navigation_view_text.xml
+++ b/app/src/main/res/layout/navigation_view_text.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:baselineAligned="false"
     android:focusable="true"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
@@ -10,7 +10,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/nav_view_item_wrapper"
-        style="@style/Theme.Widget.TextInputLayout.OutlinedBox.Dense"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/app/src/main/res/layout/pref_account_login.xml b/app/src/main/res/layout/pref_account_login.xml
index 35254a738c..ea4391164e 100644
--- a/app/src/main/res/layout/pref_account_login.xml
+++ b/app/src/main/res/layout/pref_account_login.xml
@@ -41,7 +41,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:text="@string/login"
-        android:textColor="@android:color/white"
+        android:textColor="?attr/colorOnPrimary"
+        app:pb_colorNormal="?attr/colorPrimary"
+        app:pb_colorPressed="?attr/colorPrimary"
         app:pb_textComplete="@string/login_success"
         app:pb_textError="@string/invalid_login"
         app:pb_textProgress="@string/loading" />
diff --git a/app/src/main/res/layout/pref_more_header.xml b/app/src/main/res/layout/pref_more_header.xml
index 0cce1abb5f..ae2b209578 100644
--- a/app/src/main/res/layout/pref_more_header.xml
+++ b/app/src/main/res/layout/pref_more_header.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
+    android:background="?attr/colorToolbar"
     android:elevation="2dp"
     android:padding="32dp">
 
@@ -12,6 +12,6 @@
         android:layout_height="56dp"
         android:layout_gravity="center"
         app:srcCompat="@drawable/ic_tachi"
-        app:tint="?attr/colorOnPrimary" />
+        app:tint="?attr/colorOnToolbar" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/pref_settings.xml b/app/src/main/res/layout/pref_settings.xml
index a747c57ceb..a4b6f6ebac 100644
--- a/app/src/main/res/layout/pref_settings.xml
+++ b/app/src/main/res/layout/pref_settings.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:background="@drawable/ripple_regular"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/label_settings"
         android:padding="8dp"
         app:srcCompat="@drawable/ic_settings_24dp"
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index 94f4ece1b6..9217591b4a 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -61,7 +61,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/colorToolbar"
             android:minHeight="?attr/actionBarSize" />
 
         <LinearLayout
@@ -90,7 +90,7 @@
                     android:contentDescription="@string/action_previous_chapter"
                     android:padding="@dimen/screen_edge_margin"
                     app:srcCompat="@drawable/ic_skip_previous_24dp"
-                    app:tint="?attr/colorOnPrimary" />
+                    app:tint="?attr/colorOnToolbar" />
 
                 <LinearLayout
                     android:id="@+id/reader_seekbar"
@@ -106,7 +106,7 @@
                         android:layout_width="32dp"
                         android:layout_height="match_parent"
                         android:gravity="center"
-                        android:textColor="?attr/colorOnPrimary"
+                        android:textColor="?attr/colorOnToolbar"
                         android:textSize="15sp"
                         tools:text="1" />
 
@@ -127,7 +127,7 @@
                         android:layout_width="32dp"
                         android:layout_height="match_parent"
                         android:gravity="center"
-                        android:textColor="?attr/colorOnPrimary"
+                        android:textColor="?attr/colorOnToolbar"
                         android:textSize="15sp"
                         tools:text="15" />
 
@@ -142,7 +142,7 @@
                     android:contentDescription="@string/action_next_chapter"
                     android:padding="@dimen/screen_edge_margin"
                     app:srcCompat="@drawable/ic_skip_next_24dp"
-                    app:tint="?attr/colorOnPrimary" />
+                    app:tint="?attr/colorOnToolbar" />
 
             </LinearLayout>
 
@@ -150,59 +150,59 @@
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 android:layout_gravity="bottom"
-                android:background="?attr/colorPrimary">
+                android:background="?attr/colorToolbar">
 
                 <ImageButton
                     android:id="@+id/action_reading_mode"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:background="@drawable/ripple_regular"
+                    android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/viewer"
                     android:padding="@dimen/screen_edge_margin"
                     app:layout_constraintEnd_toStartOf="@id/action_crop_borders"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_reader_default_24dp"
-                    app:tint="?attr/colorOnPrimary" />
+                    app:tint="?attr/colorOnToolbar" />
 
                 <ImageButton
                     android:id="@+id/action_crop_borders"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:background="@drawable/ripple_regular"
+                    android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/pref_crop_borders"
                     android:padding="@dimen/screen_edge_margin"
                     app:layout_constraintEnd_toStartOf="@id/action_rotation"
                     app:layout_constraintStart_toEndOf="@+id/action_reading_mode"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_crop_24dp"
-                    app:tint="?attr/colorOnPrimary" />
+                    app:tint="?attr/colorOnToolbar" />
 
                 <ImageButton
                     android:id="@+id/action_rotation"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:background="@drawable/ripple_regular"
+                    android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/pref_rotation_type"
                     android:padding="@dimen/screen_edge_margin"
                     app:layout_constraintEnd_toStartOf="@id/action_settings"
                     app:layout_constraintStart_toEndOf="@+id/action_crop_borders"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_screen_rotation_24dp"
-                    app:tint="?attr/colorOnPrimary" />
+                    app:tint="?attr/colorOnToolbar" />
 
                 <ImageButton
                     android:id="@+id/action_settings"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:background="@drawable/ripple_regular"
+                    android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/action_settings"
                     android:padding="@dimen/screen_edge_margin"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/action_rotation"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_settings_24dp"
-                    app:tint="?attr/colorOnPrimary" />
+                    app:tint="?attr/colorOnToolbar" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/reader_page_sheet.xml b/app/src/main/res/layout/reader_page_sheet.xml
index 83c3ef373f..c44b686949 100644
--- a/app/src/main/res/layout/reader_page_sheet.xml
+++ b/app/src/main/res/layout/reader_page_sheet.xml
@@ -11,7 +11,7 @@
         android:layout_height="56dp"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="@drawable/selectable_item_background"
+        android:foreground="?attr/selectableItemBackground"
         android:gravity="center"
         android:paddingStart="16dp"
         android:paddingEnd="16dp">
@@ -37,7 +37,7 @@
         android:layout_height="56dp"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="@drawable/selectable_item_background"
+        android:foreground="?attr/selectableItemBackground"
         android:gravity="center"
         android:paddingStart="16dp"
         android:paddingEnd="16dp">
@@ -63,7 +63,7 @@
         android:layout_height="56dp"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="@drawable/selectable_item_background"
+        android:foreground="?attr/selectableItemBackground"
         android:gravity="center"
         android:paddingStart="16dp"
         android:paddingEnd="16dp">
diff --git a/app/src/main/res/layout/settings_search_controller_card.xml b/app/src/main/res/layout/settings_search_controller_card.xml
index 33eb822f24..50dcf119b8 100644
--- a/app/src/main/res/layout/settings_search_controller_card.xml
+++ b/app/src/main/res/layout/settings_search_controller_card.xml
@@ -4,7 +4,7 @@
     android:id="@+id/title_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:orientation="vertical"
     android:padding="16dp">
 
diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml
index df786db6b9..c67d5cf2db 100644
--- a/app/src/main/res/layout/source_comfortable_grid_item.xml
+++ b/app/src/main/res/layout/source_comfortable_grid_item.xml
@@ -88,7 +88,7 @@
 
             <com.google.android.material.progressindicator.CircularProgressIndicator
                 android:id="@+id/progress"
-                style="@style/Theme.Widget.CircularProgressIndicator.Small"
+                style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -107,7 +107,7 @@
             android:lineSpacingExtra="-4dp"
             android:maxLines="2"
             android:padding="4dp"
-            android:shadowColor="@color/textColorPrimaryLight"
+            android:textColor="@color/source_comfortable_item_title"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/card"
             tools:text="Sample name" />
diff --git a/app/src/main/res/layout/source_compact_grid_item.xml b/app/src/main/res/layout/source_compact_grid_item.xml
index 609535dfdf..6df505c648 100644
--- a/app/src/main/res/layout/source_compact_grid_item.xml
+++ b/app/src/main/res/layout/source_compact_grid_item.xml
@@ -96,7 +96,7 @@
             android:lineSpacingExtra="-4dp"
             android:maxLines="2"
             android:padding="8dp"
-            android:shadowColor="@color/textColorPrimaryLight"
+            android:shadowColor="@color/md_black_1000"
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="4"
@@ -105,7 +105,7 @@
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/progress"
-            style="@style/Theme.Widget.CircularProgressIndicator.Small"
+            style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/source_filter_sheet.xml b/app/src/main/res/layout/source_filter_sheet.xml
index 044075429d..7a6ba7776a 100644
--- a/app/src/main/res/layout/source_filter_sheet.xml
+++ b/app/src/main/res/layout/source_filter_sheet.xml
@@ -16,7 +16,7 @@
 
         <Button
             android:id="@+id/reset_btn"
-            style="@style/Theme.Widget.Button"
+            style="?attr/borderlessButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/action_reset"
@@ -26,7 +26,6 @@
 
         <Button
             android:id="@+id/filter_btn"
-            style="@style/Theme.Widget.Button.FilledAccent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/source_main_controller_card_item.xml b/app/src/main/res/layout/source_main_controller_card_item.xml
index cfe0bb83ec..030ac0cf6a 100644
--- a/app/src/main/res/layout/source_main_controller_card_item.xml
+++ b/app/src/main/res/layout/source_main_controller_card_item.xml
@@ -52,7 +52,7 @@
 
     <Button
         android:id="@+id/source_latest"
-        style="@style/Theme.Widget.Button"
+        style="?attr/borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:maxHeight="48dp"
@@ -72,7 +72,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="8dp"
-        android:background="@drawable/ripple_regular"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_pin"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/source_recycler_autofit.xml b/app/src/main/res/layout/source_recycler_autofit.xml
index 902ae8bc55..a3198c0b52 100644
--- a/app/src/main/res/layout/source_recycler_autofit.xml
+++ b/app/src/main/res/layout/source_recycler_autofit.xml
@@ -2,7 +2,7 @@
 <eu.kanade.tachiyomi.widget.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/source_grid"
-    style="@style/Theme.Widget.GridView.Source"
+    style="@style/Widget.Tachiyomi.GridView.Source"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
diff --git a/app/src/main/res/layout/spinner_preference.xml b/app/src/main/res/layout/spinner_preference.xml
index 354bf5b7b8..0fdd72ef50 100644
--- a/app/src/main/res/layout/spinner_preference.xml
+++ b/app/src/main/res/layout/spinner_preference.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:background="@drawable/selectable_item_background"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="16dp"
     android:paddingEnd="16dp">
 
@@ -47,7 +47,7 @@
         app:layout_constraintBottom_toBottomOf="@id/details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/details"
-        app:tint="?android:attr/textColorSecondary"
+        app:tint="?android:attr/colorControlNormal"
         tools:ignore="ContentDescription" />
 
     <androidx.constraintlayout.widget.Guideline
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 0dbf1becef..07746c2cec 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/track"
-    style="@style/Theme.Widget.CardView.Item"
+    style="@style/Widget.Tachiyomi.CardView.Item"
     android:padding="0dp">
 
     <LinearLayout
@@ -45,7 +45,7 @@
 
                 <Button
                     android:id="@+id/track_set"
-                    style="@style/Theme.Widget.Button"
+                    style="?attr/borderlessButtonStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml
index fcf8a040b0..10af85031f 100644
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -42,7 +42,7 @@
 
         <ListView
             android:id="@+id/track_search_list"
-            style="@style/Theme.Widget.CardView"
+            style="@style/Widget.Tachiyomi.CardView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:choiceMode="singleChoice"
diff --git a/app/src/main/res/layout/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml
index 7daacc99eb..ed5d740a1a 100644
--- a/app/src/main/res/layout/track_search_item.xml
+++ b/app/src/main/res/layout/track_search_item.xml
@@ -2,7 +2,7 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Theme.Widget.CardView.Item"
+    style="@style/Widget.Tachiyomi.CardView.Item"
     android:layout_margin="0dp"
     android:padding="0dp">
 
diff --git a/app/src/main/res/layout/webview_activity.xml b/app/src/main/res/layout/webview_activity.xml
index 017df7f33b..480c80a794 100644
--- a/app/src/main/res/layout/webview_activity.xml
+++ b/app/src/main/res/layout/webview_activity.xml
@@ -14,8 +14,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            android:theme="?attr/actionBarTheme"
             app:navigationIcon="@drawable/ic_close_24dp" />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/menu/browse_extensions.xml b/app/src/main/res/menu/browse_extensions.xml
index 1a0d8e698e..0578641b5e 100644
--- a/app/src/main/res/menu/browse_extensions.xml
+++ b/app/src/main/res/menu/browse_extensions.xml
@@ -6,14 +6,14 @@
         android:icon="@drawable/ic_search_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_translate_24dp"
         android:title="@string/action_filter"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/browse_migrate.xml b/app/src/main/res/menu/browse_migrate.xml
index 000574fd01..bc4155f0fb 100644
--- a/app/src/main/res/menu/browse_migrate.xml
+++ b/app/src/main/res/menu/browse_migrate.xml
@@ -5,7 +5,7 @@
         android:id="@+id/action_source_migration_help"
         android:icon="@drawable/ic_help_24dp"
         android:title="@string/migration_help_guide"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/browse_sources.xml b/app/src/main/res/menu/browse_sources.xml
index 1a0d8e698e..0578641b5e 100644
--- a/app/src/main/res/menu/browse_sources.xml
+++ b/app/src/main/res/menu/browse_sources.xml
@@ -6,14 +6,14 @@
         android:icon="@drawable/ic_search_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_translate_24dp"
         android:title="@string/action_filter"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/category_selection.xml b/app/src/main/res/menu/category_selection.xml
index c8b4e46f0a..40a9491d86 100644
--- a/app/src/main/res/menu/category_selection.xml
+++ b/app/src/main/res/menu/category_selection.xml
@@ -6,14 +6,14 @@
         android:id="@+id/action_edit"
         android:icon="@drawable/ic_edit_24dp"
         android:title="@string/action_edit"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_24dp"
         android:title="@string/action_delete"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/chapter_selection.xml b/app/src/main/res/menu/chapter_selection.xml
index 65fe48c6cb..e224e0da14 100644
--- a/app/src/main/res/menu/chapter_selection.xml
+++ b/app/src/main/res/menu/chapter_selection.xml
@@ -6,49 +6,49 @@
         android:id="@+id/action_download"
         android:icon="@drawable/ic_get_app_24dp"
         android:title="@string/action_download"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_24dp"
         android:title="@string/action_delete"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_bookmark"
         android:icon="@drawable/ic_bookmark_border_24dp"
         android:title="@string/action_bookmark"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_remove_bookmark"
         android:icon="@drawable/ic_bookmark_24dp"
         android:title="@string/action_remove_bookmark"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_read"
         android:icon="@drawable/ic_done_24dp"
         android:title="@string/action_mark_as_read"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_unread"
         android:icon="@drawable/ic_done_outline_24dp"
         android:title="@string/action_mark_as_unread"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_previous_as_read"
         android:icon="@drawable/ic_done_prev_24dp"
         android:title="@string/action_mark_previous_as_read"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/extension_details.xml b/app/src/main/res/menu/extension_details.xml
index dcdbdef1cb..646e3c76a2 100644
--- a/app/src/main/res/menu/extension_details.xml
+++ b/app/src/main/res/menu/extension_details.xml
@@ -5,7 +5,7 @@
         android:id="@+id/action_history"
         android:icon="@drawable/ic_history_24dp"
         android:title="@string/whats_new"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
diff --git a/app/src/main/res/menu/generic_selection.xml b/app/src/main/res/menu/generic_selection.xml
index 644acf4b3b..0c8df145c9 100644
--- a/app/src/main/res/menu/generic_selection.xml
+++ b/app/src/main/res/menu/generic_selection.xml
@@ -6,14 +6,14 @@
         android:id="@+id/action_select_all"
         android:icon="@drawable/ic_select_all_24dp"
         android:title="@string/action_select_all"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_select_inverse"
         android:icon="@drawable/ic_flip_to_back_24dp"
         android:title="@string/action_select_inverse"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/global_search.xml b/app/src/main/res/menu/global_search.xml
index 112431a726..efbd32c55a 100644
--- a/app/src/main/res/menu/global_search.xml
+++ b/app/src/main/res/menu/global_search.xml
@@ -6,7 +6,7 @@
         android:icon="@drawable/ic_search_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="collapseActionView|ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/history.xml b/app/src/main/res/menu/history.xml
index 4f645e5558..426bc8889f 100644
--- a/app/src/main/res/menu/history.xml
+++ b/app/src/main/res/menu/history.xml
@@ -7,14 +7,14 @@
         android:icon="@drawable/ic_search_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom|collapseActionView" />
 
     <item
         android:id="@+id/action_clear_history"
         android:icon="@drawable/ic_delete_sweep_24dp"
         android:title="@string/pref_clear_history"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml
index a34649976e..5d45e24926 100644
--- a/app/src/main/res/menu/library.xml
+++ b/app/src/main/res/menu/library.xml
@@ -8,21 +8,21 @@
         android:icon="@drawable/ic_search_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
         android:id="@+id/action_filter"
         android:icon="@drawable/ic_filter_list_24dp"
         android:title="@string/action_filter"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_update_library"
         android:icon="@drawable/ic_refresh_24dp"
         android:title="@string/action_update_library"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/library_selection.xml b/app/src/main/res/menu/library_selection.xml
index 4815092144..136ef7840a 100644
--- a/app/src/main/res/menu/library_selection.xml
+++ b/app/src/main/res/menu/library_selection.xml
@@ -6,35 +6,35 @@
         android:id="@+id/action_move_to_category"
         android:icon="@drawable/ic_label_24dp"
         android:title="@string/action_move_category"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_download_unread"
         android:icon="@drawable/ic_get_app_24dp"
         android:title="@string/action_download_unread"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_read"
         android:icon="@drawable/ic_done_24dp"
         android:title="@string/action_mark_as_read"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_unread"
         android:icon="@drawable/ic_done_outline_24dp"
         android:title="@string/action_mark_as_unread"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_24dp"
         android:title="@string/action_delete"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/manga.xml b/app/src/main/res/menu/manga.xml
index d71888c39a..4cec21edaf 100644
--- a/app/src/main/res/menu/manga.xml
+++ b/app/src/main/res/menu/manga.xml
@@ -6,14 +6,14 @@
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share_24dp"
         android:title="@string/action_share"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/download_group"
         android:icon="@drawable/ic_get_app_24dp"
         android:title="@string/manga_download"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom">
         <menu>
             <item
diff --git a/app/src/main/res/menu/migration.xml b/app/src/main/res/menu/migration.xml
index 9dc9d931a5..7c8458196b 100644
--- a/app/src/main/res/menu/migration.xml
+++ b/app/src/main/res/menu/migration.xml
@@ -6,7 +6,7 @@
         android:id="@+id/action_change_source"
         android:icon="@drawable/ic_filter_list_24dp"
         android:title="@string/action_filter"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/reader.xml b/app/src/main/res/menu/reader.xml
index 79d1f44848..60c637b3c3 100644
--- a/app/src/main/res/menu/reader.xml
+++ b/app/src/main/res/menu/reader.xml
@@ -6,14 +6,14 @@
         android:id="@+id/action_bookmark"
         android:icon="@drawable/ic_bookmark_border_24dp"
         android:title="@string/action_bookmark"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_remove_bookmark"
         android:icon="@drawable/ic_bookmark_24dp"
         android:title="@string/action_remove_bookmark"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/settings_main.xml b/app/src/main/res/menu/settings_main.xml
index 112431a726..efbd32c55a 100644
--- a/app/src/main/res/menu/settings_main.xml
+++ b/app/src/main/res/menu/settings_main.xml
@@ -6,7 +6,7 @@
         android:icon="@drawable/ic_search_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="collapseActionView|ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/settings_tracking.xml b/app/src/main/res/menu/settings_tracking.xml
index cdab602071..a7e77dd430 100644
--- a/app/src/main/res/menu/settings_tracking.xml
+++ b/app/src/main/res/menu/settings_tracking.xml
@@ -5,7 +5,7 @@
         android:id="@+id/action_tracking_help"
         android:icon="@drawable/ic_help_24dp"
         android:title="@string/tracking_guide"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/source_browse.xml b/app/src/main/res/menu/source_browse.xml
index e98a68bb42..9c50d54007 100644
--- a/app/src/main/res/menu/source_browse.xml
+++ b/app/src/main/res/menu/source_browse.xml
@@ -6,13 +6,13 @@
         android:icon="@drawable/ic_search_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
         android:icon="@drawable/ic_view_module_24dp"
         android:title="@string/action_display_mode"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom">
         <menu>
             <group android:checkableBehavior="single">
@@ -33,14 +33,14 @@
         android:id="@+id/action_open_in_web_view"
         android:icon="@drawable/ic_public_24dp"
         android:title="@string/action_open_in_web_view"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_local_source_help"
         android:icon="@drawable/ic_help_24dp"
         android:title="@string/local_source_help_guide"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/updates.xml b/app/src/main/res/menu/updates.xml
index 38a131c391..34bdd2fbb6 100644
--- a/app/src/main/res/menu/updates.xml
+++ b/app/src/main/res/menu/updates.xml
@@ -7,7 +7,7 @@
         android:id="@+id/action_update_library"
         android:icon="@drawable/ic_refresh_24dp"
         android:title="@string/action_update_library"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/updates_chapter_selection.xml b/app/src/main/res/menu/updates_chapter_selection.xml
index cdcc0b8af5..40713c00c4 100644
--- a/app/src/main/res/menu/updates_chapter_selection.xml
+++ b/app/src/main/res/menu/updates_chapter_selection.xml
@@ -6,28 +6,28 @@
         android:id="@+id/action_download"
         android:icon="@drawable/ic_get_app_24dp"
         android:title="@string/action_download"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_24dp"
         android:title="@string/action_delete"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_read"
         android:icon="@drawable/ic_done_24dp"
         android:title="@string/action_mark_as_read"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_unread"
         android:icon="@drawable/ic_done_outline_24dp"
         android:title="@string/action_mark_as_unread"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/webview.xml b/app/src/main/res/menu/webview.xml
index 0b07de5a91..7b1ae01a84 100644
--- a/app/src/main/res/menu/webview.xml
+++ b/app/src/main/res/menu/webview.xml
@@ -6,14 +6,14 @@
         android:id="@+id/action_web_back"
         android:icon="@drawable/ic_arrow_back_24dp"
         android:title="@string/action_webview_back"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_web_forward"
         android:icon="@drawable/ic_arrow_forward_24dp"
         android:title="@string/action_webview_forward"
-        app:iconTint="?attr/colorOnPrimary"
+        app:iconTint="?attr/colorOnToolbar"
         app:showAsAction="ifRoom" />
 
     <item
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..f77a6ca688
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="splash">@color/background_dark</color>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 9851cc77bf..0000000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--===============-->
-    <!-- Launch Screen -->
-    <!--===============-->
-    <style name="Theme.Splash" parent="Theme.Tachiyomi.Dark">
-        <item name="colorBackgroundSplash">@color/backgroundDark</item>
-
-        <item name="android:windowBackground">@drawable/splash_background</item>
-        <item name="android:statusBarColor">?attr/colorBackgroundSplash</item>
-        <item name="android:navigationBarColor">?attr/colorBackgroundSplash</item>
-    </style>
-
-</resources>
diff --git a/app/src/main/res/values-v26/colors.xml b/app/src/main/res/values-v26/colors.xml
index 81fe85a9b9..5c2c719d0a 100644
--- a/app/src/main/res/values-v26/colors.xml
+++ b/app/src/main/res/values-v26/colors.xml
@@ -2,6 +2,6 @@
 <resources>
 
     <!-- Reader Theme -->
-    <color name="readerColorDarkPrimary">#BF212121</color>
+    <color name="reader_toolbar">#BF212121</color>
 
 </resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index d766629dce..7087b33603 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="Base.V27.Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light">
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index f9ef51421f..a841e19da1 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -17,14 +17,17 @@
         <attr name="summary" format="reference|string" />
     </declare-styleable>
 
-    <attr name="colorLibrarySelection" format="reference|integer"/>
-    <attr name="colorLibrarySelectionActive" format="reference|integer"/>
     <attr name="colorFilterActive" format="reference|integer"/>
-    <attr name="colorBackgroundSplash" format="reference|integer"/>
-    <attr name="colorAccentOnPrimary" format="reference|integer"/>
     <attr name="colorTertiary" format="reference|integer"/>
     <attr name="colorOnTertiary" format="reference|integer"/>
-    <attr name="rippleSecondaryColor" format="reference|integer"/>
-    <attr name="rippleToolbarColor" format="reference|integer"/>
+
+    <!-- Ripple color for toolbar elements -->
+    <attr name="rippleColorToolbar" format="reference|color"/>
+
+    <!-- Toolbar color. Not actually used by the toolbar. -->
+    <attr name="colorToolbar" format="reference|color"/>
+
+    <!-- For anything that is drawn on the toolbar -->
+    <attr name="colorOnToolbar" format="reference|integer"/>
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f431270bca..271de01e92 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,104 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Application Colors -->
-    <color name="colorPrimary">#54759E</color>
-    <color name="colorPrimaryDark">#435E7E</color>
-    <color name="colorPrimary_70">#B354759E</color>
-
-    <!-- Dark Application Colors -->
-    <color name="colorDarkPrimary">#242529</color>
-    <color name="colorDarkPrimaryDark">#202125</color>
-
-    <!-- AMOLED Application Colors -->
-    <color name="colorAmoledPrimary">@color/md_black_1000</color>
-
-    <!-- Splash Color -->
-    <color name="splashBackgroundColor">@color/colorPrimary</color>
+    <color name="splash">@color/accent_lightblue</color>
 
     <!-- Light Theme -->
-    <color name="colorAccentLight">@color/md_blue_A400</color>
-    <color name="textColorPrimaryLight">@color/md_black_1000_87</color>
-    <color name="textColorSecondaryLight">@color/md_black_1000_54</color>
-    <color name="textColorHintLight">@color/md_black_1000_38</color>
-    <color name="dividerLight">@color/md_black_1000_12</color>
-    <color name="rippleColorLight">@color/md_black_1000_6</color>
-    <color name="rippleSecondaryColorLight">@color/md_blue_A400_4</color>
-    <color name="rippleToolbarColorLight">@color/rippleColorLight</color>
-    <color name="backgroundLight">@color/md_grey_50</color>
-    <color name="dialogLight">@color/md_white_1000</color>
-    <color name="selectorColorLight">@color/md_blue_A400_75</color>
+    <color name="accent_light">@color/md_blue_A400</color>
+    <color name="divider_light">@color/md_black_1000_12</color>
+    <color name="surface_light">@color/md_white_1000</color>
+    <color name="background_light">@color/md_grey_50</color>
+
+    <!-- Light Blue Theme -->
+    <color name="accent_lightblue">#54759E</color>
+    <color name="ripple_colored_lightblue">#1F54759E</color>
 
     <!-- Strawberry Daiquiri Theme -->
-    <color name="colorAccentStrawberry">#ED4A65</color>
-    <color name="rippleSecondaryColorStrawberry">#0AED4A65</color>
-    <color name="selectorColorStrawberry">#BFED4A65</color>
+    <color name="accent_strawberry">#ED4A65</color>
 
     <!-- Yotsuba Theme -->
-    <color name="colorAccentYotsuba">#FC8C5C</color>
-    <color name="rippleSecondaryColorYotsuba">#0AFC8C5C</color>
-    <color name="selectorColorYotsuba">#BFFC8C5C</color>
+    <color name="accent_yotsuba">#FC8C5C</color>
 
     <!-- Dark Theme -->
-    <color name="colorAccentDark">#3399FF</color>
-    <color name="textColorPrimaryDark">@color/md_white_1000</color>
-    <color name="textColorSecondaryDark">@color/md_white_1000_70</color>
-    <color name="textColorHintDark">@color/md_white_1000_50</color>
-    <color name="dividerDark">@android:color/transparent</color>
-    <color name="rippleColorDark">@color/md_white_1000_6</color>
-    <color name="rippleSecondaryColorDark">#0A3399FF</color>
-    <color name="rippleToolbarColorDark">@color/rippleColorDark</color>
-    <color name="backgroundDark">@color/colorDarkPrimaryDark</color>
-    <color name="dialogDark">@color/colorDarkPrimary</color>
-    <color name="selectorColorDark">@color/md_blue_A200_50</color>
+    <color name="accent_dark">#3399FF</color>
+    <color name="divider_dark">@color/md_white_1000_12</color>
+    <color name="surface_dark">#242529</color>
+    <color name="background_dark">#202125</color>
+
+    <!-- Dark Blue Theme -->
+    <color name="accent_darkblue">#54759E</color>
+    <color name="ripple_colored_darkblue">#1F54759E</color>
 
     <!-- Green Apple Theme -->
-    <color name="colorAccentApple">#48E484</color>
-    <color name="colorOnSecondaryApple">@color/md_black_1000</color>
-    <color name="rippleSecondaryColorApple">#0A48E484</color>
-    <color name="selectorColorApple">#BF48E484</color>
+    <color name="accent_greenapple">#48E484</color>
 
     <!-- Midnight Dusk Theme -->
-    <color name="colorAccentDusk">#F02475</color>
-    <color name="textColorPrimaryDusk">@color/md_white_1000</color>
-    <color name="textColorSecondaryDusk">@color/md_white_1000_70</color>
-    <color name="textColorHintDusk">@color/md_white_1000_50</color>
-    <color name="dividerDusk">#12ffffff</color>
-    <color name="rippleSecondaryColorDusk">#0FF02475</color>
-    <color name="backgroundDusk">#16151D</color>
-    <color name="dialogDusk">#201F27</color>
-    <color name="selectorColorDusk">#BFF02475</color>
+    <color name="accent_midnightdusk">#F02475</color>
+    <color name="background_midnightdusk">#16151D</color>
+    <color name="surface_midnightdusk">#201F27</color>
 
     <!-- AMOLED Theme -->
-    <color name="colorAccentAmoled">#3399FF</color>
-    <color name="textColorPrimaryAmoled">@color/md_white_1000</color>
-    <color name="textColorSecondaryAmoled">@color/md_white_1000_70</color>
-    <color name="textColorHintAmoled">@color/md_white_1000_50</color>
-    <color name="dividerAmoled">@android:color/transparent</color>
-    <color name="rippleColorAmoled">@color/md_white_1000_8</color>
-    <color name="rippleSecondaryColorAmoled">#0A3399FF</color>
-    <color name="rippleToolbarColorAmoled">@color/rippleColorAmoled</color>
-    <color name="backgroundAmoled">@color/colorAmoledPrimary</color>
-    <color name="dialogAmoled">@color/colorAmoledPrimary</color>
-    <color name="selectorColorAmoled">@color/md_blue_A200_75</color>
+    <color name="accent_amoled">#3399FF</color>
+    <color name="divider_amoled">@android:color/transparent</color>
+    <color name="surface_amoled">@color/md_black_1000</color>
+    <color name="background_amoled">@color/md_black_1000</color>
 
     <!-- Hot Pink Theme -->
-    <color name="colorAccentPink">#FF3399</color>
-    <color name="textColorPrimaryPink">@color/md_white_1000</color>
-    <color name="textColorSecondaryPink">@color/md_white_1000_70</color>
-    <color name="textColorHintPink">@color/md_white_1000_50</color>
-    <color name="rippleSecondaryColorPink">#0AFF3399</color>
-    <color name="selectorColorPink">#BFFF69B4</color>
+    <color name="accent_hotpink">#FF3399</color>
 
     <!-- Reader Theme -->
-    <color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
-    <color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
-    <color name="pageNumberBackgroundDark">@color/md_grey_900_75</color>
+    <color name="reader_toolbar">#242529</color>
 
     <color name="filterColorLight">#FFC107</color>
     <color name="filterColorDark">#FFEB3B</color>
     <color name="filterColorAmoled">#FFEB3B</color>
 
-    <!-- Text Colors -->
+    <!-- Material Design Colors -->
+    <color name="md_black_1000">#000000</color>
     <color name="md_black_1000_87">#DE000000</color>
     <color name="md_black_1000_54">#8A000000</color>
     <color name="md_black_1000_38">#61000000</color>
@@ -115,9 +70,6 @@
     <color name="md_white_1000_8">#14FFFFFF</color>
     <color name="md_white_1000_6">#0FFFFFFF</color>
 
-    <!-- Material Design Colors -->
-    <color name="md_black_1000">#000000</color>
-
     <color name="md_grey_50">#FAFAFA</color>
     <color name="md_grey_50_75">#BFFAFAFA</color>
     <color name="md_grey_100">#F5F5F5</color>
@@ -133,7 +85,7 @@
     <color name="md_blue_A400">#2979FF</color>
     <color name="md_blue_A400_75">#BF2979FF</color>
     <color name="md_blue_A400_38">#612979FF</color>
-    <color name="md_blue_A400_4">#0A2979FF</color>
+    <color name="md_blue_A400_12">#1F2979FF</color>
 
     <color name="md_blue_grey_900">#263238</color>
     <color name="md_blue_grey_800">#37474F</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e5e98b5eea..7c375e4050 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,4 +17,7 @@
     <dimen name="screen_edge_margin">16dp</dimen>
 
     <dimen name="tablet_horizontal_cover_margin">128dp</dimen>
+
+    <!-- material-dialogs button radius -->
+    <dimen name="md_action_button_corner_radius">4dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b424e0883d..4e38b20f2f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,96 +4,40 @@
     <!--========-->
     <!--Toolbars-->
     <!--========-->
-    <style name="Theme.Toolbar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" />
 
-    <style name="Theme.Toolbar.Custom.Light" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
-        <item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
+    <style name="ThemeOverlay.Tachiyomi.ActionBar" parent="ThemeOverlay.MaterialComponents.ActionBar">
+        <item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
     </style>
 
-    <style name="Theme.Toolbar.Custom.Dark" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
-        <item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
+    <style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="tint">?attr/colorOnToolbar</item>
     </style>
 
-    <style name="Theme.Toolbar.Custom.Amoled" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
-        <item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
+    <style name="Widget.Tachiyomi.ActionMode" parent="Widget.AppCompat.ActionMode">
+        <item name="background">?attr/colorToolbar</item>
+        <item name="titleTextStyle">@style/TextAppearance.Tachiyomi.ActionMode.Title</item>
     </style>
 
-    <style name="Theme.Toolbar.Custom.PopupTheme" parent="Theme.Toolbar.Custom.Dark">
-        <item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
+    <style name="Theme.Tachiyomi.ActionMode.CloseButton" parent="Widget.AppCompat.ActionButton.CloseMode">
+        <item name="android:tint">?attr/colorOnToolbar</item>
     </style>
 
-    <style name="Theme.Toolbar.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="tint">?attr/colorOnPrimary</item>
+    <style name="Theme.Tachiyomi.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">?attr/colorOnToolbar</item>
     </style>
 
-    <style name="Theme.ActionMode" parent="Base.Widget.AppCompat.ActionMode">
-        <item name="background">?attr/colorPrimary</item>
-    </style>
-
-    <style name="Theme.ActionMode.CloseButton" parent="Base.Widget.AppCompat.ActionButton.CloseMode">
-        <item name="android:tint">?attr/colorOnPrimary</item>
+    <style name="Widget.Tachiyomi.Toolbar.Primary" parent="Widget.MaterialComponents.Toolbar.Primary">
+        <item name="android:elevation">0dp</item>
     </style>
 
 
     <!--===========-->
     <!--AlertDialog-->
     <!--===========-->
-    <style name="Theme.AlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-        <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
-
+    <style name="ThemeOverlay.Tachiyomi.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="android:background">?attr/colorSurface</item>
-        <item name="shapeAppearanceOverlay">@style/Theme.MaterialAlertDialog.Style.ShapeAppearance</item>
-
-        <item name="materialAlertDialogTitleTextStyle">@style/Theme.MaterialAlertDialog.Style.Title</item>
         <item name="android:textColorPrimary">?attr/colorOnSurface</item>
         <item name="android:textColor">?attr/colorOnSurface</item>
-
-        <item name="buttonBarPositiveButtonStyle">@style/Theme.Widget.Button</item>
-        <item name="buttonBarNegativeButtonStyle">@style/Theme.Widget.Button</item>
-        <item name="buttonBarNeutralButtonStyle">@style/Theme.Widget.Button</item>
-    </style>
-
-    <style name="Theme.MaterialAlertDialog.Style.ShapeAppearance" parent="">
-        <item name="cornerSize">@dimen/dialog_radius</item>
-    </style>
-
-    <style name="Theme.MaterialAlertDialog.Style.Title" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text">
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:textSize">@dimen/md_title_textsize</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Light" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentLight</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Light.StrawberryDaiquiri" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentStrawberry</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Light.Yotsuba" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentYotsuba</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Dark" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentDark</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Dark.GreenApple" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentApple</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Dark.MidnightDusk" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentDusk</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Amoled" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentAmoled</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Amoled.HotPink" parent="Theme.AlertDialog">
-        <item name="colorAccent">@color/colorAccentPink</item>
     </style>
 
 
@@ -101,19 +45,16 @@
     <!--BottomSheet-->
     <!--===========-->
 
-    <style name="Theme.BottomSheet" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">?attr/colorSurface</item>
-        <item name="bottomSheetStyle">@style/Theme.BottomSheet.Style</item>
-        <item name="android:windowAnimationStyle">@style/Animation.BottomSheetDialog</item>
+    <style name="ThemeOverlay.Tachiyomi.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/Widget.Tachiyomi.BottomSheet.Modal</item>
+        <item name="android:windowAnimationStyle">@style/Animation.Tachiyomi.BottomSheetDialog</item>
     </style>
 
-    <style name="Theme.BottomSheet.Style" parent="Widget.MaterialComponents.BottomSheet">
-        <item name="shapeAppearanceOverlay">@style/Theme.BottomSheet.Style.ShapeAppearance</item>
+    <style name="Widget.Tachiyomi.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Tachiyomi.BottomSheet</item>
     </style>
 
-    <style name="Theme.BottomSheet.Style.ShapeAppearance" parent="">
+    <style name="ShapeAppearanceOverlay.Tachiyomi.BottomSheet" parent="">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSizeTopRight">@dimen/dialog_radius</item>
         <item name="cornerSizeTopLeft">@dimen/dialog_radius</item>
@@ -121,7 +62,7 @@
         <item name="cornerSizeBottomLeft">0dp</item>
     </style>
 
-    <style name="Animation.BottomSheetDialog" parent="Animation.AppCompat.Dialog">
+    <style name="Animation.Tachiyomi.BottomSheetDialog" parent="Animation.AppCompat.Dialog">
         <item name="android:windowEnterAnimation">@anim/bottom_sheet_slide_in</item>
         <item name="android:windowExitAnimation">@anim/bottom_sheet_slide_out</item>
     </style>
@@ -130,7 +71,7 @@
     <!--===============-->
     <!--Text Appearance-->
     <!--===============-->
-    <style name="TextAppearance" parent="@android:style/TextAppearance">
+    <style name="TextAppearance" parent="android:TextAppearance">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
@@ -185,7 +126,7 @@
     </style>
 
     <style name="TextAppearance.Widget.Button" parent="TextAppearance.MaterialComponents.Button">
-        <item name="android:letterSpacing">0</item>
+        <item name="android:letterSpacing">-0.006</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
@@ -198,25 +139,16 @@
         <item name="android:letterSpacing">0</item>
     </style>
 
+    <style name="TextAppearance.Tachiyomi.ActionMode.Title" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="android:textColor">?attr/colorOnToolbar</item>
+    </style>
+
 
     <!--=======-->
     <!--Widgets-->
     <!--=======-->
-    <style name="Theme.Widget" />
 
-    <style name="Theme.Widget.FAB" parent="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="fabCustomSize">@dimen/fab_size</item>
-        <item name="android:minWidth">@dimen/fab_size</item>
-        <item name="android:layout_gravity">bottom|end</item>
-        <item name="android:layout_margin">16dp</item>
-        <item name="android:scaleType">fitCenter</item>
-        <item name="layout_anchorGravity">bottom|right|end</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="Theme.Widget.CardView" parent="CardView">
+    <style name="Widget.Tachiyomi.CardView" parent="CardView">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:padding">16dp</item>
@@ -229,19 +161,19 @@
         <item name="cardElevation">2dp</item>
     </style>
 
-    <style name="Theme.Widget.CardView.Item">
+    <style name="Widget.Tachiyomi.CardView.Item">
         <item name="android:layout_marginTop">@dimen/space_between_cards</item>
         <item name="android:layout_marginBottom">@dimen/space_between_cards</item>
     </style>
 
-    <style name="Theme.Widget.GridView">
+    <style name="Widget.Tachiyomi.GridView" parent="android:Widget">
         <item name="android:smoothScrollbar">true</item>
         <item name="android:numColumns">auto_fit</item>
         <item name="android:stretchMode">columnWidth</item>
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>
 
-    <style name="Theme.Widget.GridView.Source">
+    <style name="Widget.Tachiyomi.GridView.Source">
         <item name="android:gravity">top|left</item>
         <item name="android:smoothScrollbar">true</item>
         <item name="android:cacheColorHint">?android:attr/textColorHint</item>
@@ -251,26 +183,27 @@
     </style>
 
 
-    <style name="Theme.Widget.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
+    <style name="Widget.Tachiyomi.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
         <item name="android:textColor">?attr/colorOnSurface</item>
         <item name="android:background">@drawable/list_item_selector</item>
     </style>
 
 
-    <style name="Theme.Widget.Snackbar" parent="Widget.MaterialComponents.Snackbar">
+    <style name="Widget.Tachiyomi.Snackbar" parent="Widget.MaterialComponents.Snackbar">
         <item name="android:background">@drawable/snackbar_background</item>
         <item name="actionTextColorAlpha">1</item>
     </style>
-    <style name="Theme.Widget.Snackbar.TextView" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+    <style name="Widget.Tachiyomi.Snackbar.TextView" parent="Widget.MaterialComponents.Snackbar.TextView">
         <item name="android:textColor">?attr/colorOnSurface</item>
     </style>
 
 
-    <style name="Theme.Widget.Chip" parent="Widget.MaterialComponents.Chip.Action">
+    <style name="Widget.Tachiyomi.Chip.Action" parent="Widget.MaterialComponents.Chip.Action">
         <item name="chipStrokeWidth">1dp</item>
-        <item name="chipStrokeColor">?attr/colorAccent</item>
-        <item name="chipBackgroundColor">@color/background_color_chip_state</item>
-        <item name="android:textColor">?attr/colorAccent</item>
+        <item name="chipStrokeColor">?attr/colorPrimary</item>
+        <item name="chipBackgroundColor">@android:color/transparent</item>
+        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="rippleColor">?attr/colorControlHighlight</item>
 
         <!-- Custom chip states -->
         <item name="android:clickable">true</item>
@@ -286,79 +219,29 @@
     </style>
 
 
-    <style name="Theme.Widget.BasicSwitch" parent="Widget.MaterialComponents.CompoundButton.Switch">
+    <style name="Widget.Tachiyomi.BasicSwitch" parent="Widget.MaterialComponents.CompoundButton.Switch">
         <item name="useMaterialThemeColors">false</item>
     </style>
 
 
-    <style name="Theme.Widget.CircularProgressIndicator" parent="Widget.MaterialComponents.CircularProgressIndicator">
-        <item name="indicatorColor">?attr/colorAccent</item>
-    </style>
-    <style name="Theme.Widget.CircularProgressIndicator.Small" parent="Theme.Widget.CircularProgressIndicator">
+    <style name="Widget.Tachiyomi.CircularProgressIndicator.Small" parent="Widget.MaterialComponents.CircularProgressIndicator">
         <item name="indicatorSize">16dp</item>
         <item name="trackThickness">2dp</item>
     </style>
 
-    <style name="Theme.Widget.LinearProgressIndicator" parent="Widget.MaterialComponents.LinearProgressIndicator">
-        <item name="indicatorColor">?attr/colorAccent</item>
-    </style>
-
-
-    <!--=======================-->
-    <!--Widgets.TextInputLayout-->
-    <!--=======================-->
-
-    <style name="ThemeOverlay.Widget.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
-        <item name="colorControlActivated">?attr/colorSecondary</item>
-    </style>
-
-    <style name="Theme.Widget.TextInputLayout.OutlinedBox" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-        <item name="materialThemeOverlay">@style/ThemeOverlay.Widget.TextInputEditText.OutlinedBox</item>
-        <item name="boxStrokeColor">@color/text_input_stroke</item>
-        <item name="hintTextColor">?attr/colorSecondary</item>
-    </style>
-
-    <style name="Theme.Widget.TextInputLayout.OutlinedBox.Dense" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
-        <item name="materialThemeOverlay">@style/ThemeOverlay.Widget.TextInputEditText.OutlinedBox</item>
-        <item name="boxStrokeColor">@color/text_input_stroke</item>
-        <item name="hintTextColor">?attr/colorSecondary</item>
-    </style>
-
 
     <!--==============-->
     <!--Widgets.Button-->
     <!--==============-->
-    <style name="Theme.Widget.Button" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textColor">?attr/colorAccent</item>
-        <item name="rippleColor">?attr/rippleSecondaryColor</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <style name="Theme.Widget.Button.FilledAccent" parent="Widget.MaterialComponents.Button">
-        <item name="android:textColor">?attr/colorOnSecondary</item>
-        <item name="backgroundTint">?attr/colorAccent</item>
-        <item name="rippleColor">?attr/rippleColor</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <style name="Theme.Widget.Button.Action" parent="Widget.MaterialComponents.Button.UnelevatedButton.Icon">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textAllCaps">false</item>
-
-        <item name="backgroundTint">@android:color/transparent</item>
-        <item name="rippleColor">?attr/rippleColor</item>
-
+    <style name="Widget.Tachiyomi.Button.ActionButton" parent="Widget.MaterialComponents.Button.TextButton.Icon">
         <item name="iconGravity">top</item>
         <item name="iconTint">@color/button_action_selector</item>
         <item name="iconPadding">4dp</item>
         <item name="android:textColor">@color/button_action_selector</item>
+        <item name="android:textSize">12sp</item>
     </style>
 
-    <style name="Theme.Widget.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="android:letterSpacing">0.0</item>
-        <item name="android:textColor">?attr/colorAccent</item>
-        <item name="android:textAllCaps">false</item>
-
+    <style name="Widget.Tachiyomi.Button.InlineButton" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:minHeight">0dp</item>
         <item name="android:minWidth">0dp</item>
         <item name="android:paddingTop">0dp</item>
@@ -375,18 +258,26 @@
     <!--=================-->
     <!--Widgets.TabLayout-->
     <!--=================-->
-    <style name="Theme.Widget.Tabs" parent="Widget.MaterialComponents.TabLayout.Colored">
+    <style name="Widget.Tachiyomi.TabLayout" parent="Widget.MaterialComponents.TabLayout">
         <item name="tabGravity">center</item>
         <item name="tabIndicator">@drawable/tab_indicator</item>
-        <item name="tabIndicatorColor">?attr/colorAccentOnPrimary</item>
-        <item name="tabTextColor">@color/tabs_selector</item>
         <item name="tabIndicatorFullWidth">false</item>
         <item name="tabIndicatorHeight">3dp</item>
         <item name="tabInlineLabel">true</item>
         <item name="tabMinWidth">75dp</item>
         <item name="tabMode">scrollable</item>
-        <item name="tabTextAppearance">@style/TextAppearance.Widget.Tab</item>
-        <item name="tabRippleColor">?attr/rippleSecondaryColor</item>
+        <item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
+    </style>
+
+    <style name="Widget.Tachiyomi.TabLayout.Colored" parent="Widget.MaterialComponents.TabLayout.Colored">
+        <item name="tabGravity">center</item>
+        <item name="tabIndicator">@drawable/tab_indicator</item>
+        <item name="tabIndicatorFullWidth">false</item>
+        <item name="tabIndicatorHeight">3dp</item>
+        <item name="tabInlineLabel">true</item>
+        <item name="tabMinWidth">75dp</item>
+        <item name="tabMode">scrollable</item>
+        <item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
     </style>
 
 
@@ -406,12 +297,19 @@
         <item name="android:textSize">15sp</item>
     </style>
 
+    <!--================================-->
+    <!--material-dialogs style overrides-->
+    <!--================================-->
+    <style name="MD_Light" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+        <item name="md_divider_color">@color/md_divider_light_theme</item>
+        <item name="md_item_selector">@drawable/md_item_selector</item>
+        <item name="md_button_selector">@drawable/md_btn_selector</item>
+    </style>
 
-    <!--===============-->
-    <!--Custom Selector-->
-    <!--===============-->
-    <style name="PreferenceThemeCustom" parent="@style/PreferenceThemeOverlay">
-        <item name="android:selectableItemBackground">@drawable/ripple_background</item>
+    <style name="MD_Dark" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+        <item name="md_divider_color">@color/md_divider_dark_theme</item>
+        <item name="md_item_selector">@drawable/md_item_selector_dark</item>
+        <item name="md_button_selector">@drawable/md_btn_selector_dark</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 516b3c218f..bd79e5cfcc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,49 +5,30 @@
     <!-- Base Theme -->
     <!--============-->
 
-    <!--== Theme ==-->
-    <style name="Theme" />
-
     <!--== Theme base ==-->
-    <style name="Theme.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <!-- AppBar -->
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+    <style name="Theme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Disallow 'Force dark theme' -->
         <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
 
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/md_white_1000</item>
-        <item name="colorOnPrimary">@color/md_black_1000</item>
-        <item name="colorAccentOnPrimary">@color/colorAccentLight</item>
-        <item name="colorPrimaryVariant">@color/md_white_1000</item>
-        <item name="colorSecondary">@color/colorAccentLight</item>
-        <item name="colorOnSecondary">@color/md_white_1000</item>
+        <item name="colorPrimary">@color/accent_light</item>
+        <item name="colorPrimaryVariant">?attr/colorPrimary</item>
+        <item name="colorOnPrimary">@color/md_white_1000</item>
+        <item name="colorSecondary">?attr/colorPrimary</item>
+        <item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
+        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
         <item name="colorTertiary">@color/green</item>
         <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorSurface">@color/dialogLight</item>
-        <item name="colorOnSurface">@color/textColorPrimaryLight</item>
-        <item name="colorOnBackground">@color/textColorPrimaryLight</item>
-        <item name="colorAccent">@color/colorAccentLight</item>
-
-        <!-- Base background/text colors -->
-        <item name="android:colorBackground">@color/backgroundLight</item>
-        <item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
-        <item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
-        <item name="android:textColorHint">@color/textColorHintLight</item>
-        <item name="android:textColorPrimaryInverse">@color/textColorPrimaryDark</item>
-        <item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
-        <item name="android:textColorHintInverse">@color/textColorHintDark</item>
-        <item name="android:colorEdgeEffect">?attr/colorAccent</item>
-
-        <item name="android:divider">@color/dividerLight</item>
+        <item name="colorToolbar">?attr/colorSurface</item>
+        <item name="colorOnToolbar">?attr/colorOnSurface</item>
+        <item name="colorSurface">@color/surface_light</item>
+        <item name="android:colorBackground">@color/background_light</item>
+        <item name="android:divider">@color/divider_light</item>
         <item name="android:listDivider">@drawable/line_divider</item>
 
         <!-- Ripples -->
-        <item name="rippleColor">@color/rippleColorLight</item>
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorLight</item>
-        <item name="rippleToolbarColor">@color/rippleToolbarColorLight</item>
-        <item name="android:colorControlHighlight">@color/rippleColorLight</item>
+        <item name="colorControlHighlight">@color/ripple_colored</item>
+        <item name="rippleColorToolbar">?attr/colorControlHighlight</item>
 
         <!-- Handles RTL text -->
         <item name="android:textAlignment">gravity</item>
@@ -58,42 +39,38 @@
         <item name="android:navigationBarColor">@color/md_black_1000</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="elevationOverlayEnabled">false</item>
-        <item name="actionModeStyle">@style/Theme.ActionMode</item>
-        <item name="actionModeCloseButtonStyle">@style/Theme.ActionMode.CloseButton</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
-        <item name="actionBarTheme">@style/Theme.Toolbar.Custom.Light</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
-        <item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
-        <item name="preferenceTheme">@style/PreferenceThemeCustom</item>
-        <item name="dialogTheme">@style/Theme.AlertDialog.Light</item>
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
-        <item name="chipStyle">@style/Theme.Widget.Chip</item>
-        <item name="buttonStyle">@style/Theme.Widget.Button</item>
-        <item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
-        <item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
-        <item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
-        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
-        <item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
         <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
-        <item name="swipeRefreshLayoutProgressSpinnerBackgroundColor">?attr/colorAccent</item>
-        <item name="circularProgressIndicatorStyle">@style/Theme.Widget.CircularProgressIndicator</item>
-        <item name="linearProgressIndicatorStyle">@style/Theme.Widget.LinearProgressIndicator</item>
+        <item name="android:backgroundDimAmount">0.32</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
+        <item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
+        <item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
+        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
+        <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
+        <item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
+        <item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
+        <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
+        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
+        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
+        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
+        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
+
+        <!-- Text Appearances -->
+        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
 
         <!-- Material Dialogs -->
         <item name="md_background_color">?attr/colorSurface</item>
         <item name="md_color_title">?attr/colorOnSurface</item>
         <item name="md_color_content">?attr/colorOnSurface</item>
-        <item name="md_color_button_text">?attr/colorAccent</item>
-        <item name="md_ripple_color">?attr/rippleColor</item>
+        <item name="md_color_button_text">?attr/colorPrimary</item>
         <item name="md_button_casing">literal</item>
         <item name="md_corner_radius">@dimen/dialog_radius</item>
 
         <!-- Custom Attributes-->
-        <item name="colorLibrarySelection">?attr/colorAccent</item>
-        <item name="colorLibrarySelectionActive">@color/selectorColorLight</item>
         <item name="colorFilterActive">@color/filterColorLight</item>
     </style>
 
@@ -102,11 +79,10 @@
     <!--==============-->
 
     <!--== Light base ==-->
-    <style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base">
+    <style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base.Light">
         <!-- Base background/text colors -->
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="background">@color/dialogLight</item>
     </style>
 
     <!--== Light theme ==-->
@@ -115,63 +91,46 @@
     <!--== Light Blue theme ==-->
     <style name="Theme.Tachiyomi.Light.Blue">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorOnPrimary">@color/textColorPrimaryDark</item>
-        <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
-        <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/accent_lightblue</item>
         <item name="colorFilterActive">@color/filterColorDark</item>
+        <item name="colorToolbar">?attr/colorPrimary</item>
+        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
 
         <!-- Base background/text colors -->
-        <item name="background">@color/colorPrimary</item>
+        <item name="background">@color/accent_lightblue</item>
 
         <!-- Ripples -->
-        <item name="rippleSecondaryColor">@color/md_white_1000_6</item>
-        <item name="rippleToolbarColor">@color/md_white_1000_12</item>
+        <item name="colorControlHighlight">@color/ripple_colored_lightblue</item>
+        <item name="rippleColorToolbar">@color/md_white_1000_12</item>
 
         <!-- Themes -->
-        <item name="actionBarTheme">@style/Theme.Toolbar.Custom.PopupTheme</item>
+        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
+        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
+        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
+        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
+        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
+        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
+
 
         <!-- Status/Navigation bar -->
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:navigationBarColor">?attr/colorPrimary</item>
     </style>
 
     <!--== Strawberry Daiquiri theme ==-->
     <style name="Theme.Tachiyomi.Light.StrawberryDaiquiri">
         <!-- Theme colors -->
-        <item name="colorAccentOnPrimary">@color/colorAccentStrawberry</item>
-        <item name="colorSecondary">@color/colorAccentStrawberry</item>
+        <item name="colorPrimary">@color/accent_strawberry</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorAccent">@color/colorAccentStrawberry</item>
-
-        <!-- Ripples -->
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorStrawberry</item>
-
-        <!-- Themes -->
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light.StrawberryDaiquiri</item>
-
-        <!-- Custom Attributes-->
-        <item name="colorLibrarySelectionActive">@color/selectorColorStrawberry</item>
     </style>
 
     <!--== Yotsuba theme ==-->
     <style name="Theme.Tachiyomi.Light.Yotsuba">
         <!-- Theme colors -->
-        <item name="colorAccentOnPrimary">@color/colorAccentYotsuba</item>
-        <item name="colorSecondary">@color/colorAccentYotsuba</item>
+        <item name="colorPrimary">@color/accent_yotsuba</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorAccent">@color/colorAccentYotsuba</item>
-
-        <!-- Ripples -->
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorYotsuba</item>
-
-        <!-- Themes -->
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light.Yotsuba</item>
-
-        <!-- Custom Attributes-->
-        <item name="colorLibrarySelectionActive">@color/selectorColorYotsuba</item>
     </style>
 
     <!--=============-->
@@ -180,154 +139,121 @@
 
     <!--== Dark base ==-->
     <style name="Theme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
+        <!-- Disallow 'Force dark theme' -->
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/colorDarkPrimary</item>
-        <item name="colorOnPrimary">@color/textColorPrimaryDark</item>
-        <item name="colorAccentOnPrimary">@color/colorAccentDark</item>
-        <item name="colorPrimaryVariant">@color/colorDarkPrimary</item>
-        <item name="colorSecondary">@color/colorAccentDark</item>
-        <item name="colorOnSecondary">@color/textColorPrimaryDark</item>
+        <item name="colorPrimary">@color/accent_dark</item>
+        <item name="colorPrimaryVariant">?attr/colorPrimary</item>
+        <item name="colorOnPrimary">@color/md_white_1000</item>
+        <item name="colorSecondary">?attr/colorPrimary</item>
+        <item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
+        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
         <item name="colorTertiary">@color/green</item>
         <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorSurface">@color/dialogDark</item>
-        <item name="colorOnSurface">@color/textColorPrimaryDark</item>
-        <item name="colorOnBackground">@color/textColorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccentDark</item>
+        <item name="colorToolbar">?attr/colorSurface</item>
+        <item name="colorOnToolbar">?attr/colorOnSurface</item>
+        <item name="colorSurface">@color/surface_dark</item>
+        <item name="android:colorBackground">@color/background_dark</item>
+        <item name="android:divider">@color/divider_dark</item>
+        <item name="android:listDivider">@drawable/line_divider</item>
+
+        <!-- Ripples -->
+        <item name="colorControlHighlight">@color/ripple_colored</item>
+        <item name="rippleColorToolbar">?attr/colorControlHighlight</item>
 
         <!-- Handles RTL text -->
         <item name="android:textAlignment">gravity</item>
         <item name="android:textDirection">locale</item>
 
-        <!-- Base background/text colors -->
-        <item name="android:colorBackground">@color/backgroundDark</item>
-        <item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
-        <item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
-        <item name="android:textColorHint">@color/textColorHintDark</item>
-        <item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
-        <item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
-        <item name="android:textColorHintInverse">@color/textColorHintLight</item>
-        <item name="android:colorEdgeEffect">?attr/colorAccent</item>
-        <item name="background">@color/colorDarkPrimaryDark</item>
-
-        <item name="android:divider">@color/dividerDark</item>
-        <item name="android:listDivider">@drawable/line_divider</item>
-
-        <!-- Ripples -->
-        <item name="rippleColor">@color/rippleColorDark</item>
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorDark</item>
-        <item name="rippleToolbarColor">@color/rippleToolbarColorDark</item>
-        <item name="android:colorControlHighlight">@color/rippleColorDark</item>
-
         <!-- Themes -->
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
+        <item name="android:statusBarColor">@color/md_black_1000</item>
+        <item name="android:navigationBarColor">@color/md_black_1000</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="elevationOverlayEnabled">false</item>
-        <item name="actionModeStyle">@style/Theme.ActionMode</item>
-        <item name="actionModeCloseButtonStyle">@style/Theme.ActionMode.CloseButton</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
-        <item name="actionBarTheme">@style/Theme.Toolbar.Custom.Dark</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
-        <item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
-        <item name="preferenceTheme">@style/PreferenceThemeCustom</item>
-        <item name="dialogTheme">@style/Theme.AlertDialog.Dark</item>
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Dark</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
-        <item name="chipStyle">@style/Theme.Widget.Chip</item>
-        <item name="buttonStyle">@style/Theme.Widget.Button</item>
-        <item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
-        <item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
-        <item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
-        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
-        <item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
         <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
-        <item name="swipeRefreshLayoutProgressSpinnerBackgroundColor">?attr/colorAccent</item>
-        <item name="circularProgressIndicatorStyle">@style/Theme.Widget.CircularProgressIndicator</item>
-        <item name="linearProgressIndicatorStyle">@style/Theme.Widget.LinearProgressIndicator</item>
+        <item name="android:backgroundDimAmount">0.32</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
+        <item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
+        <item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
+        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
+        <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
+        <item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
+        <item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
+        <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
+        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
+        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
+        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
+        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
+        <item name="elevationOverlayEnabled">false</item>
+
+        <!-- Text Appearances -->
+        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
 
         <!-- Material Dialogs -->
         <item name="md_background_color">?attr/colorSurface</item>
         <item name="md_color_title">?attr/colorOnSurface</item>
         <item name="md_color_content">?attr/colorOnSurface</item>
-        <item name="md_color_button_text">?attr/colorAccent</item>
-        <item name="md_ripple_color">?attr/rippleColor</item>
+        <item name="md_color_button_text">?attr/colorPrimary</item>
         <item name="md_button_casing">literal</item>
         <item name="md_corner_radius">@dimen/dialog_radius</item>
 
         <!-- Custom Attributes-->
-        <item name="colorLibrarySelection">?attr/colorAccent</item>
-        <item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
         <item name="colorFilterActive">@color/filterColorDark</item>
     </style>
 
     <!--== Dark theme ==-->
-    <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark" />
+    <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
+        <item name="android:statusBarColor">?attr/colorSurface</item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+    </style>
 
     <!--== Dark Blue theme ==-->
     <style name="Theme.Tachiyomi.Dark.Blue">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
-        <item name="colorPrimaryVariant">@color/colorPrimary</item>
-
-        <!-- Base background/text colors -->
-        <item name="background">@color/colorPrimary</item>
+        <item name="colorPrimary">@color/accent_darkblue</item>
+        <item name="colorToolbar">?attr/colorPrimary</item>
+        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
 
         <!-- Ripples -->
-        <item name="rippleSecondaryColor">@color/md_black_1000_6</item>
-        <item name="rippleToolbarColor">@color/md_black_1000_12</item>
+        <item name="colorControlHighlight">@color/ripple_colored_darkblue</item>
+        <item name="rippleColorToolbar">@color/md_white_1000_12</item>
+
+        <!-- Themes -->
+        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
+        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
+        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
+        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
+        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
+        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
+
+        <!-- Status/Navigation bar -->
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:navigationBarColor">?attr/colorPrimary</item>
     </style>
 
     <!--== Green Apple theme ==-->
     <style name="Theme.Tachiyomi.Dark.GreenApple">
         <!-- Theme colors -->
-        <item name="colorAccentOnPrimary">@color/colorAccentApple</item>
-        <item name="colorSecondary">@color/colorAccentApple</item>
-        <item name="colorOnSecondary">@color/colorOnSecondaryApple</item>
+        <item name="colorPrimary">@color/accent_greenapple</item>
+        <item name="colorOnPrimary">@color/md_black_1000</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorAccent">@color/colorAccentApple</item>
-
-        <!-- Ripples -->
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorApple</item>
-
-        <!-- Themes -->
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Dark.GreenApple</item>
-
-        <!-- Custom Attributes-->
-        <item name="colorLibrarySelectionActive">@color/selectorColorApple</item>
     </style>
 
     <!--== Midnight Dusk theme ==-->
-    <style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
+    <style name="Theme.Tachiyomi.Dark.MidnightDusk">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/dialogDusk</item>
-        <item name="colorOnPrimary">@color/textColorPrimaryDusk</item>
-        <item name="colorAccentOnPrimary">@color/colorAccentDusk</item>
-        <item name="colorPrimaryVariant">@color/dialogDusk</item>
-        <item name="colorSecondary">@color/colorAccentDusk</item>
-        <item name="colorOnSecondary">@color/textColorPrimaryDusk</item>
+        <item name="colorPrimary">@color/accent_midnightdusk</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorSurface">@color/dialogDusk</item>
-        <item name="colorOnSurface">@color/textColorPrimaryDusk</item>
-        <item name="colorOnBackground">@color/textColorPrimaryDusk</item>
-        <item name="colorAccent">@color/colorAccentDusk</item>
+        <item name="colorSurface">@color/surface_midnightdusk</item>
 
         <!-- Base background/text colors -->
-        <item name="android:colorBackground">@color/backgroundDusk</item>
-        <item name="background">@color/backgroundDusk</item>
-
-        <!-- Ripples -->
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorDusk</item>
-
-        <!-- Themes -->
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Dark.MidnightDusk</item>
-
-        <!-- Custom Attributes-->
-        <item name="colorLibrarySelectionActive">@color/selectorColorDusk</item>
+        <item name="android:colorBackground">@color/background_midnightdusk</item>
     </style>
 
     <!--===============-->
@@ -336,86 +262,74 @@
 
     <!--== AMOLED base ==-->
     <style name="Theme.Base.Amoled" parent="Theme.MaterialComponents.NoActionBar">
+        <!-- Disallow 'Force dark theme' -->
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/colorAmoledPrimary</item>
-        <item name="colorOnPrimary">@color/textColorPrimaryAmoled</item>
-        <item name="colorAccentOnPrimary">@color/colorAccentAmoled</item>
-        <item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
-        <item name="colorSecondary">@color/colorAccentAmoled</item>
-        <item name="colorOnSecondary">@color/textColorPrimaryAmoled</item>
-        <item name="colorSurface">@color/dialogAmoled</item>
-        <item name="colorOnSurface">@color/textColorPrimaryAmoled</item>
-        <item name="colorOnBackground">@color/textColorPrimaryAmoled</item>
-        <item name="colorAccent">@color/colorAccentAmoled</item>
+        <item name="colorPrimary">@color/accent_amoled</item>
+        <item name="colorPrimaryVariant">?attr/colorPrimary</item>
+        <item name="colorOnPrimary">@color/md_white_1000</item>
+        <item name="colorSecondary">?attr/colorPrimary</item>
+        <item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
+        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
+        <item name="colorTertiary">@color/green</item>
+        <item name="colorOnTertiary">@color/md_white_1000</item>
+        <item name="colorToolbar">?attr/colorSurface</item>
+        <item name="colorOnToolbar">?attr/colorOnSurface</item>
+        <item name="colorSurface">@color/surface_amoled</item>
+        <item name="android:colorBackground">@color/background_amoled</item>
+        <item name="android:divider">@color/divider_amoled</item>
+        <item name="android:listDivider">@drawable/line_divider</item>
+
+        <!-- Ripples -->
+        <item name="colorControlHighlight">@color/ripple_colored</item>
+        <item name="rippleColorToolbar">?attr/colorControlHighlight</item>
 
         <!-- Handles RTL text -->
         <item name="android:textAlignment">gravity</item>
         <item name="android:textDirection">locale</item>
 
-        <!-- Base background/text colors -->
-        <item name="android:colorBackground">@color/colorAmoledPrimary</item>
-        <item name="android:textColorPrimary">@color/textColorPrimaryAmoled</item>
-        <item name="android:textColorSecondary">@color/textColorSecondaryAmoled</item>
-        <item name="android:textColorHint">@color/textColorHintAmoled</item>
-        <item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
-        <item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
-        <item name="android:textColorHintInverse">@color/textColorHintLight</item>
-        <item name="android:colorEdgeEffect">?attr/colorAccent</item>
-        <item name="background">@color/colorAmoledPrimary</item>
-
-        <item name="android:divider">@color/dividerAmoled</item>
-        <item name="android:listDivider">@drawable/line_divider</item>
-
-        <!-- Ripples -->
-        <item name="rippleColor">@color/rippleColorAmoled</item>
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorAmoled</item>
-        <item name="rippleToolbarColor">@color/rippleToolbarColorAmoled</item>
-        <item name="android:colorControlHighlight">@color/rippleColorAmoled</item>
-
         <!-- Themes -->
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="elevationOverlayEnabled">false</item>
-        <item name="actionModeStyle">@style/Theme.ActionMode</item>
-        <item name="actionModeCloseButtonStyle">@style/Theme.ActionMode.CloseButton</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
-        <item name="actionBarTheme">@style/Theme.Toolbar.Custom.Amoled</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
-        <item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
-        <item name="preferenceTheme">@style/PreferenceThemeCustom</item>
-        <item name="dialogTheme">@style/Theme.AlertDialog.Amoled</item>
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Amoled</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
-        <item name="chipStyle">@style/Theme.Widget.Chip</item>
-        <item name="buttonStyle">@style/Theme.Widget.Button</item>
-        <item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
-        <item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
-        <item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
-        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
-        <item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
         <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
-        <item name="swipeRefreshLayoutProgressSpinnerBackgroundColor">?attr/colorAccent</item>
-        <item name="circularProgressIndicatorStyle">@style/Theme.Widget.CircularProgressIndicator</item>
-        <item name="linearProgressIndicatorStyle">@style/Theme.Widget.LinearProgressIndicator</item>
+        <item name="android:backgroundDimAmount">0.32</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
+        <item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
+        <item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
+        <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
+        <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
+        <item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
+        <item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
+        <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
+        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
+        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
+        <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
+        <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
+        <item name="elevationOverlayEnabled">false</item>
+
+        <!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
+        <item name="android:navigationBarColor">#000001</item>
+
+        <!-- Text Appearances -->
+        <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
 
         <!-- Material Dialogs -->
         <item name="md_background_color">?attr/colorSurface</item>
         <item name="md_color_title">?attr/colorOnSurface</item>
         <item name="md_color_content">?attr/colorOnSurface</item>
-        <item name="md_color_button_text">?attr/colorAccent</item>
-        <item name="md_ripple_color">?attr/rippleColor</item>
+        <item name="md_color_button_text">?attr/colorPrimary</item>
         <item name="md_button_casing">literal</item>
         <item name="md_corner_radius">@dimen/dialog_radius</item>
 
         <!-- Custom Attributes-->
-        <item name="colorLibrarySelection">?attr/colorAccent</item>
-        <item name="colorLibrarySelectionActive">@color/selectorColorAmoled</item>
         <item name="colorFilterActive">@color/filterColorAmoled</item>
-
-        <!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
-        <item name="android:navigationBarColor">#000001</item>
     </style>
 
     <!--== AMOLED theme ==-->
@@ -424,24 +338,8 @@
     <!--== Hot Pink theme ==-->
     <style name="Theme.Tachiyomi.Amoled.HotPink">
         <!-- Theme colors -->
-        <item name="colorOnPrimary">@color/textColorPrimaryPink</item>
-        <item name="colorAccentOnPrimary">@color/colorAccentPink</item>
-        <item name="colorSecondary">@color/colorAccentPink</item>
-        <item name="colorOnSecondary">@color/textColorPrimaryPink</item>
+        <item name="colorPrimary">@color/accent_hotpink</item>
         <item name="colorTertiary">@color/md_blue_A400</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-        <item name="colorOnSurface">@color/textColorPrimaryPink</item>
-        <item name="colorOnBackground">@color/textColorPrimaryPink</item>
-        <item name="colorAccent">@color/colorAccentPink</item>
-
-        <!-- Ripples -->
-        <item name="rippleSecondaryColor">@color/rippleSecondaryColorPink</item>
-
-        <!-- Themes -->
-        <item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Amoled.HotPink</item>
-
-        <!-- Custom Attributes-->
-        <item name="colorLibrarySelectionActive">@color/selectorColorPink</item>
     </style>
 
     <!--===============-->
@@ -449,24 +347,22 @@
     <!--===============-->
 
     <!--== Light Reader base ==-->
-    <style name="Theme.Base.Reader.Light" parent="Theme.Base">
+    <style name="Theme.Base.Reader.Light" parent="Theme.Base.Light">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/readerColorDarkPrimary</item>
-        <item name="colorOnPrimary">@color/textColorPrimaryDark</item>
-        <item name="colorPrimaryVariant">@color/readerColorDarkPrimary</item>
         <item name="colorSurface">@color/md_white_1000</item>
+        <item name="colorToolbar">@color/reader_toolbar</item>
+        <item name="colorOnToolbar">@color/md_white_1000</item>
 
         <!-- Base background/text colors -->
         <item name="android:colorBackground">@color/md_white_1000</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorToolbar</item>
+        <item name="android:navigationBarColor">?attr/colorToolbar</item>
 
         <!-- Themes -->
-        <item name="actionBarTheme">@style/Theme.Toolbar.Custom.Dark</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
-        <item name="switchStyle">@style/Theme.Widget.BasicSwitch</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
-        <item name="android:alertDialogTheme">@style/Theme.AlertDialog.Light</item>
+        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
+        <item name="switchStyle">@style/Widget.Tachiyomi.BasicSwitch</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
+        <item name="android:alertDialogTheme">@style/ThemeOverlay.Tachiyomi.MaterialAlertDialog</item>
     </style>
 
     <!--== Light Reader ==-->
@@ -475,22 +371,18 @@
     <!--== Dark Reader base ==-->
     <style name="Theme.Base.Reader.Dark" parent="Theme.Base.Dark">
         <!-- Theme colors -->
-        <item name="colorPrimary">@color/readerColorDarkPrimary</item>
-        <item name="colorOnPrimary">@color/textColorPrimaryDark</item>
-        <item name="colorPrimaryVariant">@color/readerColorDarkPrimary</item>
         <item name="colorSurface">@color/md_black_1000</item>
+        <item name="colorToolbar">@color/reader_toolbar</item>
 
         <!-- Base background/text colors -->
         <item name="android:colorBackground">@color/md_black_1000</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorToolbar</item>
+        <item name="android:navigationBarColor">?attr/colorToolbar</item>
 
         <!-- Themes -->
-        <item name="actionBarTheme">@style/Theme.Toolbar.Custom.Dark</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
-        <item name="switchStyle">@style/Theme.Widget.BasicSwitch</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
-        <item name="android:alertDialogTheme">@style/Theme.AlertDialog.Amoled</item>
+        <item name="switchStyle">@style/Widget.Tachiyomi.BasicSwitch</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
+        <item name="android:alertDialogTheme">@style/ThemeOverlay.Tachiyomi.MaterialAlertDialog</item>
     </style>
 
     <!--== Dark Reader ==-->
@@ -499,14 +391,13 @@
     <!--== Dark Grey Reader ==-->
     <style name="Theme.Reader.Dark.Grey" parent="Theme.Base.Reader.Dark">
         <!-- Theme colors -->
-        <item name="colorSurface">@color/backgroundDark</item>
+        <item name="colorSurface">@color/background_dark</item>
 
         <!-- Base background/text colors -->
-        <item name="android:colorBackground">@color/backgroundDark</item>
+        <item name="android:colorBackground">@color/background_dark</item>
 
         <!-- Alert Dialog -->
-        <item name="android:alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
-
+        <item name="android:alertDialogTheme">@style/ThemeOverlay.Tachiyomi.MaterialAlertDialog</item>
     </style>
 
     <!--===============-->
@@ -515,13 +406,9 @@
 
     <!--== Splash theme ==-->
     <style name="Theme.Splash" parent="Theme.Tachiyomi.Light.Blue">
-        <!-- Theme colors -->
-        <item name="colorBackgroundSplash">@color/colorPrimary</item>
-
-        <!-- Base background/text colors -->
         <item name="android:windowBackground">@drawable/splash_background</item>
-        <item name="android:statusBarColor">?attr/colorBackgroundSplash</item>
-        <item name="android:navigationBarColor">?attr/colorBackgroundSplash</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
 </resources>