diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
index 88d2fdd03..a27db01ea 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
@@ -15,7 +15,7 @@ enum class ColorScheme(
 
 	DEFAULT(R.style.ThemeOverlay_Kotatsu, R.string.system_default),
 	MONET(R.style.ThemeOverlay_Kotatsu_Monet, R.string.theme_name_dynamic),
-	EXPRESSIVE(R.style.ThemeOverlay_Kotatsu_Expressive, R.string.theme_name_dynamic_v2),
+	EXPRESSIVE(R.style.ThemeOverlay_Kotatsu_Expressive, R.string.theme_name_expressive),
 	MIKU(R.style.ThemeOverlay_Kotatsu_Miku, R.string.theme_name_miku),
 	RENA(R.style.ThemeOverlay_Kotatsu_Asuka, R.string.theme_name_asuka),
 	FROG(R.style.ThemeOverlay_Kotatsu_Mion, R.string.theme_name_mion),
diff --git a/app/src/main/res/layout-w600dp-land/activity_color_filter.xml b/app/src/main/res/layout-w600dp-land/activity_color_filter.xml
index 61058fc16..1166f1433 100644
--- a/app/src/main/res/layout-w600dp-land/activity_color_filter.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_color_filter.xml
@@ -16,7 +16,6 @@
 
 		<Button
 			android:id="@+id/button_done"
-			style="@style/Widget.Material3.Button.UnelevatedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
diff --git a/app/src/main/res/layout-w600dp-land/activity_reader.xml b/app/src/main/res/layout-w600dp-land/activity_reader.xml
index a74557a31..3b0e865e9 100644
--- a/app/src/main/res/layout-w600dp-land/activity_reader.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_reader.xml
@@ -60,7 +60,6 @@
 			android:layout_height="wrap_content"
 			android:elevation="@dimen/m3_card_elevated_elevation"
 			app:elevation="@dimen/m3_card_elevated_elevation"
-			app:popupTheme="@style/ThemeOverlay.Kotatsu"
 			tools:menu="@menu/opt_reader">
 
 			<org.koitharu.kotatsu.reader.ui.ReaderActionsView
diff --git a/app/src/main/res/layout/activity_app_update.xml b/app/src/main/res/layout/activity_app_update.xml
index 0fc0605ed..7d83f7110 100644
--- a/app/src/main/res/layout/activity_app_update.xml
+++ b/app/src/main/res/layout/activity_app_update.xml
@@ -68,7 +68,7 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_cancel"
-		style="@style/Widget.Material3.Button.OutlinedButton"
+		style="?materialButtonOutlinedStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@android:string/cancel"
@@ -77,7 +77,6 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_update"
-		style="@style/Widget.Material3.Button.TonalButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:enabled="false"
diff --git a/app/src/main/res/layout/activity_appwidget_recent.xml b/app/src/main/res/layout/activity_appwidget_recent.xml
index 7bb6d288e..58851c6e1 100644
--- a/app/src/main/res/layout/activity_appwidget_recent.xml
+++ b/app/src/main/res/layout/activity_appwidget_recent.xml
@@ -16,7 +16,6 @@
 
 		<Button
 			android:id="@+id/button_done"
-			style="@style/Widget.Material3.Button.UnelevatedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
diff --git a/app/src/main/res/layout/activity_appwidget_shelf.xml b/app/src/main/res/layout/activity_appwidget_shelf.xml
index 31f427be8..5920648c2 100644
--- a/app/src/main/res/layout/activity_appwidget_shelf.xml
+++ b/app/src/main/res/layout/activity_appwidget_shelf.xml
@@ -21,7 +21,6 @@
 
 			<Button
 				android:id="@+id/button_done"
-				style="@style/Widget.Material3.Button.UnelevatedButton"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="end"
diff --git a/app/src/main/res/layout/activity_categories.xml b/app/src/main/res/layout/activity_categories.xml
index c7946e672..3029de8c4 100644
--- a/app/src/main/res/layout/activity_categories.xml
+++ b/app/src/main/res/layout/activity_categories.xml
@@ -28,7 +28,6 @@
 
 				<Button
 					android:id="@+id/button_done"
-					style="@style/Widget.Material3.Button.UnelevatedButton"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="end"
diff --git a/app/src/main/res/layout/activity_category_edit.xml b/app/src/main/res/layout/activity_category_edit.xml
index e8cc3faac..6fbef9ae6 100644
--- a/app/src/main/res/layout/activity_category_edit.xml
+++ b/app/src/main/res/layout/activity_category_edit.xml
@@ -14,7 +14,6 @@
 
 		<Button
 			android:id="@+id/button_done"
-			style="@style/Widget.Material3.Button.UnelevatedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
diff --git a/app/src/main/res/layout/activity_color_filter.xml b/app/src/main/res/layout/activity_color_filter.xml
index 7e39dcbda..06abfc378 100644
--- a/app/src/main/res/layout/activity_color_filter.xml
+++ b/app/src/main/res/layout/activity_color_filter.xml
@@ -16,7 +16,6 @@
 
 		<Button
 			android:id="@+id/button_done"
-			style="@style/Widget.Material3.Button.UnelevatedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
diff --git a/app/src/main/res/layout/activity_kitsu_auth.xml b/app/src/main/res/layout/activity_kitsu_auth.xml
index 45de42782..b3e197a29 100644
--- a/app/src/main/res/layout/activity_kitsu_auth.xml
+++ b/app/src/main/res/layout/activity_kitsu_auth.xml
@@ -41,7 +41,7 @@
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/layout_email"
-			style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+			style="?textInputOutlinedStyle"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_below="@id/textView_subtitle"
@@ -67,7 +67,7 @@
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/layout_password"
-			style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+			style="?textInputOutlinedStyle"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_below="@id/layout_email"
@@ -94,7 +94,7 @@
 
 		<Button
 			android:id="@+id/button_cancel"
-			style="@style/Widget.Material3.Button.OutlinedButton"
+			style="?materialButtonOutlinedStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentStart="true"
@@ -103,7 +103,6 @@
 
 		<Button
 			android:id="@+id/button_done"
-			style="@style/Widget.Material3.Button.TonalButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/activity_override_edit.xml b/app/src/main/res/layout/activity_override_edit.xml
index c42618822..6895190a0 100644
--- a/app/src/main/res/layout/activity_override_edit.xml
+++ b/app/src/main/res/layout/activity_override_edit.xml
@@ -14,7 +14,6 @@
 
 		<Button
 			android:id="@+id/button_done"
-			style="@style/Widget.Material3.Button.UnelevatedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
diff --git a/app/src/main/res/layout/activity_protect.xml b/app/src/main/res/layout/activity_protect.xml
index 7b22fd413..c85b80ae8 100644
--- a/app/src/main/res/layout/activity_protect.xml
+++ b/app/src/main/res/layout/activity_protect.xml
@@ -36,7 +36,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_password"
-		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+		style="?textInputOutlinedStyle"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
@@ -64,7 +64,7 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_cancel"
-		style="@style/Widget.Material3.Button.OutlinedButton"
+		style="?materialButtonOutlinedStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@android:string/cancel"
@@ -73,7 +73,6 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_next"
-		style="@style/Widget.Material3.Button.TonalButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:enabled="false"
diff --git a/app/src/main/res/layout/activity_setup_protect.xml b/app/src/main/res/layout/activity_setup_protect.xml
index e3984df0b..57ee70f7a 100644
--- a/app/src/main/res/layout/activity_setup_protect.xml
+++ b/app/src/main/res/layout/activity_setup_protect.xml
@@ -36,7 +36,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_password"
-		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+		style="?textInputOutlinedStyle"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
@@ -78,7 +78,7 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_cancel"
-		style="@style/Widget.Material3.Button.OutlinedButton"
+		style="?materialButtonOutlinedStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@android:string/cancel"
@@ -87,7 +87,6 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_next"
-		style="@style/Widget.Material3.Button.TonalButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:enabled="false"
diff --git a/app/src/main/res/layout/activity_sync_auth.xml b/app/src/main/res/layout/activity_sync_auth.xml
index fad483c1a..7d7621137 100644
--- a/app/src/main/res/layout/activity_sync_auth.xml
+++ b/app/src/main/res/layout/activity_sync_auth.xml
@@ -47,7 +47,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_email"
-		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+		style="?textInputOutlinedStyle"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
@@ -73,7 +73,7 @@
 
 	<Button
 		android:id="@+id/button_cancel"
-		style="@style/Widget.Material3.Button.OutlinedButton"
+		style="?materialButtonOutlinedStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@android:string/cancel"
@@ -82,7 +82,6 @@
 
 	<Button
 		android:id="@+id/button_next"
-		style="@style/Widget.Material3.Button.TonalButton"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:enabled="false"
@@ -104,7 +103,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_password"
-		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+		style="?textInputOutlinedStyle"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
@@ -131,7 +130,7 @@
 
 	<Button
 		android:id="@+id/button_back"
-		style="@style/Widget.Material3.Button.OutlinedButton"
+		style="?materialButtonOutlinedStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@string/back"
@@ -140,7 +139,6 @@
 
 	<Button
 		android:id="@+id/button_done"
-		style="@style/Widget.Material3.Button.TonalButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:enabled="false"
diff --git a/app/src/main/res/layout/dialog_two_buttons.xml b/app/src/main/res/layout/dialog_two_buttons.xml
index ca17c410a..0aafa452f 100644
--- a/app/src/main/res/layout/dialog_two_buttons.xml
+++ b/app/src/main/res/layout/dialog_two_buttons.xml
@@ -24,13 +24,13 @@
 		android:layout_marginVertical="18dp"
 		android:gravity="center_horizontal"
 		android:textAlignment="center"
-		android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+		android:textAppearance="?textAppearanceLabelLarge"
 		android:textSize="18sp"
 		tools:text="@string/suggestions_summary" />
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@android:id/button1"
-		style="@style/Widget.Material3.Button.TonalButton"
+		style="?materialButtonTonalStyle"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:minHeight="62dp"
@@ -42,7 +42,7 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@android:id/button2"
-		style="@style/Widget.Material3.Button.TonalButton"
+		style="?materialButtonTonalStyle"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:minHeight="62dp"
@@ -54,7 +54,7 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@android:id/button3"
-		style="@style/Widget.Material3.Button.TonalButton"
+		style="?materialButtonTonalStyle"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:minHeight="62dp"
diff --git a/app/src/main/res/layout/item_bookmark_large.xml b/app/src/main/res/layout/item_bookmark_large.xml
index 6dcbed6d1..ac2ba0a26 100644
--- a/app/src/main/res/layout/item_bookmark_large.xml
+++ b/app/src/main/res/layout/item_bookmark_large.xml
@@ -3,7 +3,7 @@
 	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/Widget.Kotatsu.CardView.Outlined"
+	style="?materialCardViewOutlinedStyle"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
diff --git a/app/src/main/res/layout/item_empty_card.xml b/app/src/main/res/layout/item_empty_card.xml
index 5441628a3..6ee55d421 100644
--- a/app/src/main/res/layout/item_empty_card.xml
+++ b/app/src/main/res/layout/item_empty_card.xml
@@ -46,7 +46,7 @@
 
 		<Button
 			android:id="@+id/button_retry"
-			style="@style/Widget.Material3.Button.TonalButton"
+			style="?materialButtonTonalStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/margin_small"
diff --git a/app/src/main/res/layout/item_empty_hint.xml b/app/src/main/res/layout/item_empty_hint.xml
index e43adbbf1..bf8c5196c 100644
--- a/app/src/main/res/layout/item_empty_hint.xml
+++ b/app/src/main/res/layout/item_empty_hint.xml
@@ -42,7 +42,7 @@
 
 	<Button
 		android:id="@+id/button_retry"
-		style="@style/Widget.Material3.Button.TonalButton"
+		style="?materialButtonTonalStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/margin_small"
diff --git a/app/src/main/res/layout/item_error_state.xml b/app/src/main/res/layout/item_error_state.xml
index c0ca23455..8e79b1790 100644
--- a/app/src/main/res/layout/item_error_state.xml
+++ b/app/src/main/res/layout/item_error_state.xml
@@ -23,7 +23,7 @@
 
 	<Button
 		android:id="@+id/button_retry"
-		style="@style/Widget.Material3.Button.TonalButton"
+		style="?materialButtonTonalStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="16dp"
@@ -31,7 +31,7 @@
 
 	<Button
 		android:id="@+id/button_secondary"
-		style="@style/Widget.Material3.Button.TextButton"
+		style="?borderlessButtonStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:visibility="gone"
diff --git a/app/src/main/res/layout/item_manga_alternative.xml b/app/src/main/res/layout/item_manga_alternative.xml
index 92216b125..ef9aeecd8 100644
--- a/app/src/main/res/layout/item_manga_alternative.xml
+++ b/app/src/main/res/layout/item_manga_alternative.xml
@@ -89,7 +89,7 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_migrate"
-			style="@style/Widget.Material3.Button.TonalButton"
+			style="?materialButtonTonalStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginEnd="12dp"
diff --git a/app/src/main/res/layout/item_scrobbling_info.xml b/app/src/main/res/layout/item_scrobbling_info.xml
index c8d2f7e62..129640fe3 100644
--- a/app/src/main/res/layout/item_scrobbling_info.xml
+++ b/app/src/main/res/layout/item_scrobbling_info.xml
@@ -3,7 +3,7 @@
 	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/Widget.Material3.CardView.Outlined"
+	style="?materialCardViewOutlinedStyle"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -33,7 +33,7 @@
 			android:layout_marginHorizontal="16dp"
 			android:layout_toEndOf="@id/imageView_cover"
 			android:singleLine="true"
-			android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+			android:textAppearance="?textAppearanceTitleSmall"
 			app:layout_constraintBottom_toTopOf="@id/textView_status"
 			app:layout_constraintEnd_toStartOf="@id/imageView_cover"
 			app:layout_constraintStart_toEndOf="@id/imageView_icon"
@@ -60,7 +60,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="4dp"
-			android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+			android:textAppearance="?textAppearanceBody1"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintStart_toEndOf="@id/imageView_icon"
 			app:layout_constraintTop_toBottomOf="@id/textView_title"
diff --git a/app/src/main/res/layout/item_search_suggestion_manga_grid.xml b/app/src/main/res/layout/item_search_suggestion_manga_grid.xml
index edec4a0b6..8e98a295f 100644
--- a/app/src/main/res/layout/item_search_suggestion_manga_grid.xml
+++ b/app/src/main/res/layout/item_search_suggestion_manga_grid.xml
@@ -3,7 +3,7 @@
 	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/Widget.Material3.CardView.Filled"
+	style="?materialCardViewFilledStyle"
 	android:layout_width="wrap_content"
 	android:layout_height="match_parent"
 	app:shapeAppearance="?shapeAppearanceCornerSmall"
diff --git a/app/src/main/res/layout/item_search_suggestion_text.xml b/app/src/main/res/layout/item_search_suggestion_text.xml
index 5440f9815..f668b8b28 100644
--- a/app/src/main/res/layout/item_search_suggestion_text.xml
+++ b/app/src/main/res/layout/item_search_suggestion_text.xml
@@ -8,7 +8,7 @@
 	android:paddingVertical="@dimen/margin_small"
 	android:paddingStart="?listPreferredItemPaddingStart"
 	android:paddingEnd="?listPreferredItemPaddingEnd"
-	android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+	android:textAppearance="?textAppearanceBodySmall"
 	android:textColor="?android:textColorSecondary"
 	tools:drawableStart="@drawable/ic_error_small"
 	tools:text="@string/error_corrupted_file" />
diff --git a/app/src/main/res/layout/item_sources_empty.xml b/app/src/main/res/layout/item_sources_empty.xml
index 3aad1bbe4..3deb11625 100644
--- a/app/src/main/res/layout/item_sources_empty.xml
+++ b/app/src/main/res/layout/item_sources_empty.xml
@@ -5,5 +5,5 @@
 	android:layout_height="wrap_content"
 	android:padding="12dp"
 	android:text="@string/nothing_found"
-	android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-	android:textColor="?android:textColorSecondary" />
\ No newline at end of file
+	android:textAppearance="?textAppearanceBody1"
+	android:textColor="?android:textColorSecondary" />
diff --git a/app/src/main/res/layout/item_tip.xml b/app/src/main/res/layout/item_tip.xml
index 9390a2fba..5cbf45a82 100644
--- a/app/src/main/res/layout/item_tip.xml
+++ b/app/src/main/res/layout/item_tip.xml
@@ -40,7 +40,7 @@
 
 			<Button
 				android:id="@+id/button_close"
-				style="@style/Widget.Material3.Button.TextButton"
+				style="?borderlessButtonStyle"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="end"
diff --git a/app/src/main/res/layout/layout_page_info.xml b/app/src/main/res/layout/layout_page_info.xml
index deba562f2..24aa534c5 100644
--- a/app/src/main/res/layout/layout_page_info.xml
+++ b/app/src/main/res/layout/layout_page_info.xml
@@ -57,7 +57,7 @@
 			android:drawablePadding="12dp"
 			android:gravity="center_horizontal"
 			android:textAlignment="center"
-			android:textAppearance="@style/TextAppearance.AppCompat.Small"
+			android:textAppearance="?textAppearanceBodyMedium"
 			app:drawableTopCompat="@drawable/ic_error_large"
 			tools:text="@tools:sample/lorem[6]" />
 
diff --git a/app/src/main/res/layout/preference_toggle_header.xml b/app/src/main/res/layout/preference_toggle_header.xml
index e897803dd..36c707270 100644
--- a/app/src/main/res/layout/preference_toggle_header.xml
+++ b/app/src/main/res/layout/preference_toggle_header.xml
@@ -3,7 +3,7 @@
 	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/Widget.Material3.CardView.Filled"
+	style="?materialCardViewFilledStyle"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_marginHorizontal="16dp"
@@ -32,7 +32,7 @@
 				android:id="@android:id/title"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+				android:textAppearance="?textAppearanceTitleLarge"
 				android:textSize="20sp"
 				tools:text="Title" />
 
@@ -43,7 +43,7 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="start"
 				android:maxLines="10"
-				android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+				android:textAppearance="?textAppearanceTitleSmall"
 				tools:text="Subtitle" />
 
 		</LinearLayout>
diff --git a/app/src/main/res/layout/sheet_chapters_pages.xml b/app/src/main/res/layout/sheet_chapters_pages.xml
index 0a552fdd3..c65916d09 100644
--- a/app/src/main/res/layout/sheet_chapters_pages.xml
+++ b/app/src/main/res/layout/sheet_chapters_pages.xml
@@ -26,7 +26,7 @@
 
 			<com.google.android.material.tabs.TabLayout
 				android:id="@+id/tabs"
-				style="@style/Widget.Material3.TabLayout.Secondary"
+				style="?tabSecondaryStyle"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_gravity="start|center_vertical"
diff --git a/app/src/main/res/layout/sheet_reader_config.xml b/app/src/main/res/layout/sheet_reader_config.xml
index c08038ac6..ede2d829d 100644
--- a/app/src/main/res/layout/sheet_reader_config.xml
+++ b/app/src/main/res/layout/sheet_reader_config.xml
@@ -29,34 +29,35 @@
 			<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
 				android:id="@+id/button_save_page"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/save_page"
-				android:textAppearance="?attr/textAppearanceButton"
 				app:drawableStartCompat="@drawable/ic_save" />
 
 			<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
 				android:id="@+id/button_bookmark"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/bookmark_add"
-				android:textAppearance="?attr/textAppearanceButton"
 				app:drawableStartCompat="@drawable/ic_bookmark" />
 
 			<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
 				android:id="@+id/button_image_server"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
+				android:drawableEnd="@drawable/ic_expand_more_22px"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/image_server"
-				android:textAppearance="?attr/textAppearanceButton"
 				android:visibility="gone"
 				app:drawableStartCompat="@drawable/ic_images"
 				tools:visibility="visible" />
@@ -129,25 +130,26 @@
 			<com.google.android.material.materialswitch.MaterialSwitch
 				android:id="@+id/switch_double_reader"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/margin_normal"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/use_two_pages_landscape"
-				android:textAppearance="?attr/textAppearanceButton"
+				android:textAppearance="?textAppearanceListItem"
 				android:textColor="?colorOnSurfaceVariant"
 				app:drawableStartCompat="@drawable/ic_split_horizontal" />
 
 			<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
 				android:id="@+id/button_screen_rotate"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/rotate_screen"
-				android:textAppearance="?attr/textAppearanceButton"
 				android:visibility="gone"
 				app:drawableStartCompat="@drawable/ic_screen_rotation"
 				tools:visibility="visible" />
@@ -155,14 +157,15 @@
 			<com.google.android.material.materialswitch.MaterialSwitch
 				android:id="@+id/switch_screen_lock_rotation"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
 				android:ellipsize="end"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:singleLine="true"
 				android:text="@string/lock_screen_rotation"
-				android:textAppearance="?attr/textAppearanceButton"
+				android:textAppearance="?textAppearanceListItem"
 				android:textColor="?colorOnSurfaceVariant"
 				android:visibility="gone"
 				app:drawableStartCompat="@drawable/ic_screen_rotation_lock"
@@ -171,34 +174,34 @@
 			<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
 				android:id="@+id/button_scroll_timer"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/automatic_scroll"
-				android:textAppearance="?attr/textAppearanceButton"
 				app:drawableStartCompat="@drawable/ic_timer" />
 
 			<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
 				android:id="@+id/button_color_filter"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/color_correction"
-				android:textAppearance="?attr/textAppearanceButton"
 				app:drawableStartCompat="@drawable/ic_appearance" />
 
 			<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
 				android:id="@+id/button_settings"
 				android:layout_width="match_parent"
-				android:layout_height="?android:listPreferredItemHeightSmall"
+				android:layout_height="wrap_content"
 				android:drawablePadding="?android:listPreferredItemPaddingStart"
+				android:minHeight="?android:listPreferredItemHeightSmall"
 				android:paddingStart="?android:listPreferredItemPaddingStart"
 				android:paddingEnd="?android:listPreferredItemPaddingEnd"
 				android:text="@string/settings"
-				android:textAppearance="?attr/textAppearanceButton"
 				app:drawableStartCompat="@drawable/ic_settings" />
 
 		</LinearLayout>
diff --git a/app/src/main/res/layout/sheet_scrobbling_selector.xml b/app/src/main/res/layout/sheet_scrobbling_selector.xml
index 96ad52c7c..ff0a5c99a 100644
--- a/app/src/main/res/layout/sheet_scrobbling_selector.xml
+++ b/app/src/main/res/layout/sheet_scrobbling_selector.xml
@@ -36,7 +36,6 @@
 
 			<com.google.android.material.button.MaterialButton
 				android:id="@+id/button_done"
-				style="@style/Widget.Material3.Button.UnelevatedButton"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/view_tip.xml b/app/src/main/res/layout/view_tip.xml
index 86f049d4b..404f23f38 100644
--- a/app/src/main/res/layout/view_tip.xml
+++ b/app/src/main/res/layout/view_tip.xml
@@ -41,7 +41,6 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_primary"
-			style="@style/Widget.Material3.Button.UnelevatedButton"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
@@ -51,7 +50,7 @@
 
 		<Button
 			android:id="@+id/button_secondary"
-			style="@style/Widget.Material3.Button.TonalButton"
+			style="?materialButtonTonalStyle"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
diff --git a/app/src/main/res/layout/view_zoom.xml b/app/src/main/res/layout/view_zoom.xml
index 258f0f16a..b9a948f4b 100644
--- a/app/src/main/res/layout/view_zoom.xml
+++ b/app/src/main/res/layout/view_zoom.xml
@@ -10,7 +10,7 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_zoom_in"
-		style="@style/Widget.Material3.Button.IconButton.Outlined"
+		style="?materialIconButtonOutlinedStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:contentDescription="@string/zoom_in"
@@ -20,7 +20,7 @@
 
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_zoom_out"
-		style="@style/Widget.Material3.Button.IconButton.Outlined"
+		style="?materialIconButtonOutlinedStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:contentDescription="@string/zoom_out"
@@ -28,5 +28,4 @@
 		app:backgroundTint="@color/bg_floating_button"
 		app:icon="@drawable/ic_zoom_out" />
 
-
 </merge>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7993a5f96..b99367dac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -353,7 +353,7 @@
 	<string name="enable_logging_summary">Record some actions for debug purposes. Don\'t turn it on if you\'re not sure what you\'re doing</string>
 	<string name="show_suspicious_content">Show suspicious content</string>
 	<string name="theme_name_dynamic">Dynamic</string>
-	<string name="theme_name_dynamic_v2">Dynamic V2</string>
+	<string name="theme_name_expressive">Expressive (Test)</string>
 	<string name="color_theme">Color scheme</string>
 	<string name="show_in_grid_view">Show in grid view</string>
 	<string name="theme_name_miku">Miku</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 05409eef8..d7f03f610 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,26 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-	<!--Toolbars-->
-
-	<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium">
-		<item name="contentScrim">?attr/colorSurfaceContainer</item>
-	</style>
-
-	<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
-		<item name="android:background">?android:attr/colorBackground</item>
-	</style>
-
-	<!--Navigation Views-->
-
-	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
-		<item name="labelVisibilityMode">labeled</item>
-	</style>
-
-	<style name="Widget.Kotatsu.ActionMode" parent="Base.Widget.Material3.ActionMode">
-		<!--<item name="titleTextStyle">@style/TextAppearance.Kotatsu.ActionBar.Title</item>-->
-		<item name="theme">@style/ThemeOverlay.Kotatsu.ActionMode</item>
-	</style>
-
 	<!--AlertDialog-->
 
 	<style name="ThemeOverlay.Kotatsu.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
@@ -63,23 +42,6 @@
 
 	<!-- Widget styles -->
 
-	<style name="Widget.Kotatsu.CardView.Outlined" parent="@style/Widget.Material3.CardView.Outlined">
-		<item name="strokeColor">?attr/colorSecondary</item>
-		<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
-	</style>
-
-	<style name="Widget.Kotatsu.CardView.Filled" parent="Widget.Material3.CardView.Filled">
-		<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
-	</style>
-
-	<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.Material3.TabLayout">
-		<item name="android:background">@drawable/tabs_background</item>
-		<item name="tabGravity">center</item>
-		<item name="tabInlineLabel">true</item>
-		<item name="tabMinWidth">75dp</item>
-		<item name="tabMode">scrollable</item>
-	</style>
-
 	<style name="Widget.Kotatsu.SearchView" parent="@style/Widget.AppCompat.SearchView">
 		<item name="iconifiedByDefault">false</item>
 		<item name="searchIcon">@null</item>
@@ -181,6 +143,7 @@
 		<item name="android:insetLeft">6dp</item>
 		<item name="android:insetTop">2dp</item>
 		<item name="android:insetBottom">2dp</item>
+		<item name="android:textAppearance">?textAppearanceListItem</item>
 	</style>
 
 	<style name="Widget.Kotatsu.TwoLinesItemView" parent="">
@@ -210,7 +173,6 @@
 		<item name="android:insetTop">2dp</item>
 		<item name="android:insetBottom">2dp</item>
 		<item name="android:gravity">start|center_vertical</item>
-		<item name="android:textAppearance">?textAppearanceButton</item>
 		<item name="backgroundTint">?attr/colorSurfaceContainerHigh</item>
 		<!-- Hack. Removing shadow. For AMOLED -->
 		<item name="android:outlineProvider">none</item>
@@ -262,12 +224,8 @@
 		<item name="android:textColor">?attr/colorOnBackground</item>
 	</style>
 
-	<style name="TextAppearance.Kotatsu.Button" parent="TextAppearance.Material3.TitleSmall" />
-
 	<style name="TextAppearance.Kotatsu.Preference.Secondary" parent="TextAppearance.Material3.BodySmall" />
 
-	<style name="TextAppearance.Kotatsu.Menu" parent="TextAppearance.Material3.BodyLarge" />
-
 	<style name="TextAppearance.Kotatsu.GridTitle" parent="TextAppearance.Material3.TitleSmall" />
 
 	<style name="TextAppearance.Kotatsu.GridTitle.Small" parent="TextAppearance.Material3.TitleSmall">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2fd722cc6..4b4ae3cf3 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,9 +4,6 @@
 	<!-- Base application theme. -->
 	<style name="Base.Theme.Kotatsu" parent="Theme.Material3.DayNight.NoActionBar">
 
-		<!-- Disallow 'Force dark theme' -->
-		<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
 		<!-- Theme Colors -->
 		<item name="colorPrimary">@color/kotatsu_primary</item>
 		<item name="colorPrimaryContainer">@color/kotatsu_primaryContainer</item>
@@ -41,60 +38,42 @@
 		<item name="colorOnErrorContainer">@color/onErrorContainer</item>
 		<item name="colorOutline">@color/kotatsu_outline</item>
 		<item name="colorOutlineVariant">@color/kotatsu_outline</item>
+		<!--<item name="android:divider">@color/kotatsu_outline</item>-->
 
-		<item name="android:divider">@color/kotatsu_outline</item>
+		<!-- Drawables (icons) -->
+		<item name="actionModeCloseDrawable">@drawable/abc_ic_clear_material</item>
+		<item name="actionModeWebSearchDrawable">@drawable/abc_ic_search_api_material</item>
 
-		<!-- Handles RTL text -->
-		<item name="android:textAlignment">gravity</item>
-		<item name="android:textDirection">locale</item>
-
-		<!-- Themes -->
+		<!-- Base attributes -->
 		<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/light_status_bar</item>
 		<item name="android:statusBarColor">@color/dim</item>
 		<item name="android:navigationBarColor">@color/surface_amoled</item>
 		<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
 		<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
 		<item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
-		<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
+		<item name="windowActionModeOverlay">true</item>
+
+		<!-- System components styles -->
 		<item name="alertDialogTheme">@style/ThemeOverlay.Kotatsu.AlertDialog</item>
 		<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item>
 		<item name="sideSheetDialogTheme">@style/ThemeOverlay.Kotatsu.SideSheetDialog</item>
-		<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
-		<item name="android:buttonStyle">?attr/borderlessButtonStyle</item>
-		<item name="android:backgroundDimAmount">0.32</item>
-		<item name="windowActionModeOverlay">true</item>
-		<item name="actionBarPopupTheme">@style/Widget.Material3.PopupMenu.ListPopupWindow</item>
-		<item name="actionModeStyle">@style/Widget.Kotatsu.ActionMode</item>
-		<item name="actionModeCloseDrawable">@drawable/abc_ic_clear_material</item>
-		<item name="actionModeWebSearchDrawable">@drawable/abc_ic_search_api_material</item>
-		<item name="preferenceTheme">@style/PreferenceThemeOverlay.Kotatsu</item>
-		<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
-		<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
-		<item name="appBarLayoutStyle">@style/Widget.Kotatsu.AppBarLayout</item>
-		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
-		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
-		<item name="materialCardViewStyle">@style/Widget.Kotatsu.CardView.Filled</item>
+		<item name="textInputStyle">?textInputOutlinedStyle</item>
+		<!--<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>-->
+		<item name="materialCardViewStyle">?materialCardViewFilledStyle</item>
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
-		<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
-		<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
-		<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
+		<item name="android:dropDownSpinnerStyle">@style/Widget.Kotatsu.Spinner.DropDown</item>
 		<item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.M3</item>
-		<item name="collapsingToolbarLayoutStyle">@style/Widget.Kotatsu.CollapsingToolbar</item>
 		<item name="circularProgressIndicatorStyle">@style/Widget.Kotatsu.CircularProgressIndicator</item>
 		<item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator</item>
 		<item name="bottomSheetDragHandleStyle">@style/Widget.Kotatsu.BottomSheet.DragHandle</item>
-		<item name="android:dropDownSpinnerStyle">@style/Widget.Kotatsu.Spinner.DropDown</item>
+		<item name="preferenceTheme">@style/PreferenceThemeOverlay.Kotatsu</item>
+
+		<!-- Custom views -->
+		<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
+		<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
 		<item name="dotIndicatorStyle">@style/Widget.Kotatsu.DotIndicator</item>
 		<item name="badgeViewStyle">@style/Widget.Kotatsu.BadgeView</item>
 		<item name="coverImageViewStyle">@style/Widget.Kotatsu.ImageView.Cover</item>
-
-		<!-- Text appearance -->
-		<item name="actionMenuTextAppearance">@style/TextAppearance.Kotatsu.Menu</item>
-		<item name="android:textAppearanceListItem">?attr/textAppearanceBodyLarge</item>
-		<item name="android:textAppearanceListItemSecondary">
-			@style/TextAppearance.Kotatsu.Preference.Secondary
-		</item>
-
 	</style>
 
 	<!--== Default Theme ==-->
@@ -106,8 +85,13 @@
 	<!-- Monet theme only support S+ -->
 	<style name="ThemeOverlay.Kotatsu.Monet" parent="ThemeOverlay.Material3.DynamicColors.Light" />
 
-	<!-- Expressive Monet theme (Light variant) -->
-	<style name="ThemeOverlay.Kotatsu.Expressive" parent="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar" />
+	<!-- Expressive Monet theme -->
+	<style name="ThemeOverlay.Kotatsu.Expressive" parent="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar">
+		<item name="windowActionModeOverlay">true</item>
+		<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item>
+		<item name="sideSheetDialogTheme">@style/ThemeOverlay.Kotatsu.SideSheetDialog</item>
+
+	</style>
 
 	<!-- Changes only for night -->
 	<style name="ThemeOverlay.Kotatsu.Amoled" parent="" />