diff --git a/app/src/main/res/layout/changelog_header_layout.xml b/app/src/main/res/layout/changelog_header_layout.xml
index 92942f1bc..f81c55338 100755
--- a/app/src/main/res/layout/changelog_header_layout.xml
+++ b/app/src/main/res/layout/changelog_header_layout.xml
@@ -19,7 +19,7 @@
         android:paddingTop="@dimen/chglib_material_keyline1"
         android:paddingBottom="@dimen/chglib_material_keyline1"
         android:textAllCaps="false"
-        android:textAppearance="@style/TextAppearance.Medium.Body2"
+        android:textAppearance="?attr/textAppearanceSubtitle2"
         android:textColor="?attr/colorAccent" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/changelog_row_layout.xml b/app/src/main/res/layout/changelog_row_layout.xml
index 589fd1eb9..79d290999 100755
--- a/app/src/main/res/layout/changelog_row_layout.xml
+++ b/app/src/main/res/layout/changelog_row_layout.xml
@@ -16,7 +16,7 @@
         android:paddingStart="@dimen/chglib_material_keyline1"
         android:paddingEnd="0dp"
         android:text="@string/changelog_row_bulletpoint"
-        android:textAppearance="@style/TextAppearance.Medium.Title" />
+        android:textAppearance="?attr/textAppearanceHeadline6" />
 
     <!-- ChangeLog Row [Text] You have to use the id="chg_text" -->
     <TextView
@@ -29,7 +29,7 @@
         android:paddingTop="8dp"
         android:paddingEnd="@dimen/chglib_material_keyline1"
         android:paddingBottom="8dp"
-        android:textAppearance="@style/TextAppearance.Regular.Body1"
+        android:textAppearance="?attr/textAppearanceCaption"
         tools:text="Use DashClock with Android 4.2's Daydream feature; great for use with desktop docks!" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/description_adapter_8m.xml b/app/src/main/res/layout/description_adapter_8m.xml
index 7d92e1ccc..a1f86258e 100644
--- a/app/src/main/res/layout/description_adapter_8m.xml
+++ b/app/src/main/res/layout/description_adapter_8m.xml
@@ -11,10 +11,11 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/description_adapter_eh.xml b/app/src/main/res/layout/description_adapter_eh.xml
index 5007a67f3..402e95c39 100644
--- a/app/src/main/res/layout/description_adapter_eh.xml
+++ b/app/src/main/res/layout/description_adapter_eh.xml
@@ -21,22 +21,23 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/genre"
-                style="@style/TextAppearance.Regular.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="8dp"
                 android:paddingTop="4dp"
                 android:paddingEnd="8dp"
-                android:paddingBottom="4dp" />
+                android:paddingBottom="4dp"
+                android:textAppearance="?attr/textAppearanceBody2" />
 
         </androidx.cardview.widget.CardView>
 
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -83,11 +84,11 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/rating"
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginStart="8dp"
+                android:textAppearance="?attr/textAppearanceCaption"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
@@ -96,30 +97,33 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/language"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rating_layout" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/size"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="@+id/rating_layout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/rating_layout" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/favorites"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="@+id/language"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/language" />
@@ -127,20 +131,22 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/visible"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/language" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/uploader"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="@+id/visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/visible" />
diff --git a/app/src/main/res/layout/description_adapter_hb.xml b/app/src/main/res/layout/description_adapter_hb.xml
index ade0be5e0..3058f7cb3 100644
--- a/app/src/main/res/layout/description_adapter_hb.xml
+++ b/app/src/main/res/layout/description_adapter_hb.xml
@@ -6,10 +6,11 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/pages"
-        style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/description_adapter_hi.xml b/app/src/main/res/layout/description_adapter_hi.xml
index 38c429687..56e89113f 100644
--- a/app/src/main/res/layout/description_adapter_hi.xml
+++ b/app/src/main/res/layout/description_adapter_hi.xml
@@ -21,13 +21,13 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/genre"
-                style="@style/TextAppearance.Regular.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="8dp"
                 android:paddingTop="4dp"
                 android:paddingEnd="8dp"
-                android:paddingBottom="4dp" />
+                android:paddingBottom="4dp"
+                android:textAppearance="?attr/textAppearanceBody2" />
 
         </androidx.cardview.widget.CardView>
 
@@ -49,19 +49,21 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/language"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/when_posted"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="@+id/language"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/language" />
diff --git a/app/src/main/res/layout/description_adapter_md.xml b/app/src/main/res/layout/description_adapter_md.xml
index 48fc058a9..d84407b0b 100644
--- a/app/src/main/res/layout/description_adapter_md.xml
+++ b/app/src/main/res/layout/description_adapter_md.xml
@@ -6,10 +6,11 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/rating"
-        style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/rating_bar"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/description_adapter_nh.xml b/app/src/main/res/layout/description_adapter_nh.xml
index 566bbf8d6..40cfed64a 100644
--- a/app/src/main/res/layout/description_adapter_nh.xml
+++ b/app/src/main/res/layout/description_adapter_nh.xml
@@ -21,22 +21,23 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/genre"
-                style="@style/TextAppearance.Regular.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="8dp"
                 android:paddingTop="4dp"
                 android:paddingEnd="8dp"
-                android:paddingBottom="4dp" />
+                android:paddingBottom="4dp"
+                android:textAppearance="?attr/textAppearanceBody2" />
 
         </androidx.cardview.widget.CardView>
 
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -61,19 +62,21 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/id"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/favorites"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -81,10 +84,11 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/when_posted"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/description_adapter_pe.xml b/app/src/main/res/layout/description_adapter_pe.xml
index 9b1626062..2f6d6e541 100644
--- a/app/src/main/res/layout/description_adapter_pe.xml
+++ b/app/src/main/res/layout/description_adapter_pe.xml
@@ -22,13 +22,13 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/genre"
-                style="@style/TextAppearance.Regular.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="8dp"
                 android:paddingTop="4dp"
                 android:paddingEnd="8dp"
-                android:paddingBottom="4dp" />
+                android:paddingBottom="4dp"
+                android:textAppearance="?attr/textAppearanceBody2" />
 
         </androidx.cardview.widget.CardView>
 
@@ -44,13 +44,13 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/language"
-            style="@style/TextAppearance.Regular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:textAppearance="?attr/textAppearanceBody2"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -70,10 +70,11 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/rating"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"/>
+            android:layout_marginStart="8dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/description_adapter_pu.xml b/app/src/main/res/layout/description_adapter_pu.xml
index 76f280782..91f5afa75 100644
--- a/app/src/main/res/layout/description_adapter_pu.xml
+++ b/app/src/main/res/layout/description_adapter_pu.xml
@@ -21,26 +21,27 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/genre"
-                style="@style/TextAppearance.Regular.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="8dp"
                 android:paddingTop="4dp"
                 android:paddingEnd="8dp"
-                android:paddingBottom="4dp" />
+                android:paddingBottom="4dp"
+                android:textAppearance="?attr/textAppearanceBody2" />
 
         </androidx.cardview.widget.CardView>
 
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
 
         <Button
@@ -61,23 +62,25 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/uploader"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             app:layout_constraintBottom_toBottomOf="@+id/size"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/size" />
+            app:layout_constraintTop_toTopOf="@+id/size"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/size"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
 
         <LinearLayout
@@ -99,11 +102,12 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/rating"
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginStart="8dp" />
+                android:layout_marginStart="8dp"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary" />
         </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/description_adapter_ts.xml b/app/src/main/res/layout/description_adapter_ts.xml
index dea996c41..defccf3bd 100644
--- a/app/src/main/res/layout/description_adapter_ts.xml
+++ b/app/src/main/res/layout/description_adapter_ts.xml
@@ -21,26 +21,27 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/genre"
-                style="@style/TextAppearance.Regular.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="8dp"
                 android:paddingTop="4dp"
                 android:paddingEnd="8dp"
-                android:paddingBottom="4dp" />
+                android:paddingBottom="4dp"
+                android:textAppearance="?attr/textAppearanceBody2" />
 
         </androidx.cardview.widget.CardView>
 
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
 
         <Button
@@ -61,34 +62,37 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/favorites"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="@+id/uploader"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/uploader" />
+            app:layout_constraintTop_toTopOf="@+id/uploader"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/when_posted"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             app:layout_constraintBottom_toBottomOf="@+id/uploader"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/uploader" />
+            app:layout_constraintTop_toTopOf="@+id/uploader"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/uploader"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginStart="16dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -109,11 +113,12 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/rating"
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginStart="8dp" />
+                android:layout_marginStart="8dp"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary" />
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/edit_merged_settings_item.xml b/app/src/main/res/layout/edit_merged_settings_item.xml
index 3fffc6ca0..2694284ef 100644
--- a/app/src/main/res/layout/edit_merged_settings_item.xml
+++ b/app/src/main/res/layout/edit_merged_settings_item.xml
@@ -66,7 +66,7 @@
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="2"
-                    android:textAppearance="@style/TextAppearance.Medium"
+                    android:textAppearance="?attr/textAppearanceSubtitle2"
                     tools:text="Title" />
 
                 <TextView
diff --git a/app/src/main/res/layout/eh_activity_intercept.xml b/app/src/main/res/layout/eh_activity_intercept.xml
index cf14ad34e..d640b7bc8 100755
--- a/app/src/main/res/layout/eh_activity_intercept.xml
+++ b/app/src/main/res/layout/eh_activity_intercept.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
                 android:text="@string/loading_manga"
-                android:textAppearance="@style/TextAppearance.Medium.Title" />
+                android:textAppearance="?attr/textAppearanceHeadline6" />
 
             <com.google.android.material.progressindicator.CircularProgressIndicator
                 android:id="@+id/intercept_progress"
diff --git a/app/src/main/res/layout/eh_fragment_batch_add.xml b/app/src/main/res/layout/eh_fragment_batch_add.xml
index fe9382a80..599c3d4d5 100755
--- a/app/src/main/res/layout/eh_fragment_batch_add.xml
+++ b/app/src/main/res/layout/eh_fragment_batch_add.xml
@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/eh_batch_add_title"
-                android:textAppearance="@style/TextAppearance.Medium.Title"
+                android:textAppearance="?attr/textAppearanceHeadline6"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
@@ -60,7 +60,7 @@
                 android:layout_marginEnd="16dp"
                 android:layout_marginRight="0dp"
                 android:text="@string/eh_batch_add_adding_galleries"
-                android:textAppearance="@style/TextAppearance.Medium.Title"
+                android:textAppearance="?attr/textAppearanceHeadline6"
                 android:visibility="gone"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
@@ -122,7 +122,7 @@
                     android:id="@+id/progress_log"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/TextAppearance.Regular.Body1"
+                    android:textAppearance="?attr/textAppearanceBody2"
                     android:visibility="visible" />
             </ScrollView>
 
diff --git a/app/src/main/res/layout/eh_smart_search.xml b/app/src/main/res/layout/eh_smart_search.xml
index 68ff6cc5e..a119b1944 100644
--- a/app/src/main/res/layout/eh_smart_search.xml
+++ b/app/src/main/res/layout/eh_smart_search.xml
@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
                 android:text="@string/searching_source"
-                android:textAppearance="@style/TextAppearance.Medium.Title" />
+                android:textAppearance="?attr/textAppearanceHeadline6" />
 
             <com.google.android.material.progressindicator.CircularProgressIndicator
                 android:id="@+id/intercept_progress"
diff --git a/app/src/main/res/layout/index_controller.xml b/app/src/main/res/layout/index_controller.xml
index 1baaa60cd..dc6dfc72b 100644
--- a/app/src/main/res/layout/index_controller.xml
+++ b/app/src/main/res/layout/index_controller.xml
@@ -19,11 +19,11 @@
 
             <TextView
                 android:id="@+id/latest"
-                style="@style/TextAppearance.Regular.SubHeading"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:padding="16dp"
                 android:text="@string/latest"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/latest_bar_more_icon"
                 app:layout_constraintStart_toStartOf="parent"
@@ -84,11 +84,11 @@
 
             <TextView
                 android:id="@+id/browse"
-                style="@style/TextAppearance.Regular.SubHeading"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:padding="16dp"
                 android:text="@string/browse"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/browse_bar_more_icon"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/latest_controller_card.xml b/app/src/main/res/layout/latest_controller_card.xml
index ac2ea47da..e409ac043 100644
--- a/app/src/main/res/layout/latest_controller_card.xml
+++ b/app/src/main/res/layout/latest_controller_card.xml
@@ -14,10 +14,10 @@
 
         <TextView
             android:id="@+id/title"
-            style="@style/TextAppearance.Regular.SubHeading"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toTopOf="@+id/subtitle"
             app:layout_constraintEnd_toStartOf="@+id/title_more_icon"
             app:layout_constraintStart_toStartOf="parent"
@@ -27,11 +27,11 @@
 
         <TextView
             android:id="@+id/subtitle"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:maxLines="1"
+            android:textAppearance="?attr/textAppearanceBody2"
             android:textSize="12sp"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/metadata_view_item.xml b/app/src/main/res/layout/metadata_view_item.xml
index 1db3a7dab..ace77acf5 100644
--- a/app/src/main/res/layout/metadata_view_item.xml
+++ b/app/src/main/res/layout/metadata_view_item.xml
@@ -9,7 +9,7 @@
         android:layout_width="140dp"
         android:layout_height="match_parent"
         android:layout_marginStart="8dp"
-        style="@style/TextAppearance.Regular.Body1" />
+        android:textAppearance="?attr/textAppearanceBody2" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/info_text"
@@ -17,6 +17,7 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:layout_marginStart="8dp"
-        style="@style/TextAppearance.Regular.Body1.Secondary" />
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/migration_bottom_sheet.xml b/app/src/main/res/layout/migration_bottom_sheet.xml
index 57030635a..f270efd92 100644
--- a/app/src/main/res/layout/migration_bottom_sheet.xml
+++ b/app/src/main/res/layout/migration_bottom_sheet.xml
@@ -27,7 +27,7 @@
             android:layout_marginStart="6dp"
             android:layout_marginTop="8dp"
             android:text="@string/data_to_include_in_migration"
-            android:textAppearance="@style/TextAppearance.Medium.Body2"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -87,7 +87,7 @@
             android:layout_marginStart="6dp"
             android:layout_marginTop="8dp"
             android:text="@string/action_settings"
-            android:textAppearance="@style/TextAppearance.Medium.Body2"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintStart_toStartOf="@+id/migration_data_scrollView"
             app:layout_constraintTop_toBottomOf="@+id/migration_data_scrollView" />
 
diff --git a/app/src/main/res/layout/migration_manga_card.xml b/app/src/main/res/layout/migration_manga_card.xml
index 0f2711e81..e392c7002 100644
--- a/app/src/main/res/layout/migration_manga_card.xml
+++ b/app/src/main/res/layout/migration_manga_card.xml
@@ -51,7 +51,6 @@
 
             <TextView
                 android:id="@+id/manga_chapters"
-                style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorSecondary"
@@ -59,21 +58,20 @@
                 android:paddingTop="1dp"
                 android:paddingEnd="3dp"
                 android:paddingBottom="1dp"
-                android:text="101"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textSize="12sp"
                 android:textColor="?attr/colorOnSecondary"
                 android:visibility="gone"
-                tools:visibility="visible" />
+                tools:visibility="visible"
+                tools:text="101" />
         </LinearLayout>
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
-            style="@style/TextAppearance.Regular.Body1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:ellipsize="end"
-            android:fontFamily="@font/ptsans_narrow_bold"
-            android:lineSpacingExtra="-4dp"
             android:maxLines="2"
             android:padding="8dp"
             android:shadowColor="@color/md_black_1000"
@@ -81,6 +79,8 @@
             android:shadowDy="0"
             android:shadowRadius="4"
             android:textColor="@color/md_white_1000"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textSize="12sp"
             tools:text="Sample name" />
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
@@ -110,7 +110,6 @@
 
         <TextView
             android:id="@+id/manga_source_label"
-            style="@style/TextAppearance.Medium.Body2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
@@ -118,15 +117,17 @@
             app:layout_constraintLeft_toLeftOf="parent"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             tools:layout_editor_absoluteY="57dp" />
 
         <TextView
             android:id="@+id/manga_last_chapter_label"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
-            android:textIsSelectable="false" />
+            android:textIsSelectable="false"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/migration_source_item.xml b/app/src/main/res/layout/migration_source_item.xml
index 17b88e296..553f43a23 100644
--- a/app/src/main/res/layout/migration_source_item.xml
+++ b/app/src/main/res/layout/migration_source_item.xml
@@ -24,7 +24,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:layout_gravity="center_vertical"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading"
+        android:textAppearance="?attr/textAppearanceSubtitle2"
         tools:text="Title"/>
 
     <ImageView
diff --git a/app/src/main/res/layout/reader_webtoon_settings.xml b/app/src/main/res/layout/reader_webtoon_settings.xml
index fcbf474c0..964aeb59f 100644
--- a/app/src/main/res/layout/reader_webtoon_settings.xml
+++ b/app/src/main/res/layout/reader_webtoon_settings.xml
@@ -91,7 +91,7 @@
         android:text="@string/vertical_plus_viewer"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
+        android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/crop_borders_continuous_vertical"
diff --git a/app/src/main/res/layout/source_enhanced_ehentai_list_item.xml b/app/src/main/res/layout/source_enhanced_ehentai_list_item.xml
index ef6b9009a..dfe3d5aaf 100644
--- a/app/src/main/res/layout/source_enhanced_ehentai_list_item.xml
+++ b/app/src/main/res/layout/source_enhanced_ehentai_list_item.xml
@@ -35,7 +35,6 @@
 
             <TextView
                 android:id="@+id/favorite_text"
-                style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorSecondary"
@@ -45,6 +44,7 @@
                 android:paddingEnd="3dp"
                 android:paddingBottom="1dp"
                 android:text="@string/in_library"
+                android:textAppearance="?attr/textAppearanceCaption"
                 android:textColor="?attr/colorOnSecondary"
                 android:visibility="gone"
                 tools:visibility="visible" />
@@ -63,13 +63,13 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
-        style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="?attr/textAppearanceSubtitle2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/card"
         app:layout_constraintTop_toTopOf="parent"
@@ -99,14 +99,14 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/genre"
-            style="@style/TextAppearance.Regular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxLines="1"
             android:paddingStart="8dp"
             android:paddingTop="4dp"
             android:paddingEnd="8dp"
-            android:paddingBottom="4dp" />
+            android:paddingBottom="4dp"
+            android:textAppearance="?attr/textAppearanceBody2" />
 
     </com.google.android.material.card.MaterialCardView>