diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt
index 96bb1b1eb..639b6bac3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt
@@ -13,6 +13,7 @@ class UpdatesAdapter(
 
     var readColor = context.getResourceColor(R.attr.colorOnSurface, 0.38f)
     var unreadColor = context.getResourceColor(R.attr.colorOnSurface)
+    val unreadColorSecondary = context.getResourceColor(android.R.attr.textColorSecondary)
     var bookmarkedColor = context.getResourceColor(R.attr.colorAccent)
 
     val coverClickListener: OnCoverClickListener = controller
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt
index e0ed10d5b..76bb24bda 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt
@@ -45,7 +45,9 @@ class UpdatesHolder(private val view: View, private val adapter: UpdatesAdapter)
             binding.mangaTitle.setTextColor(adapter.readColor)
         } else {
             binding.mangaTitle.setTextColor(adapter.unreadColor)
-            binding.chapterTitle.setTextColor(if (item.bookmark) adapter.bookmarkedColor else adapter.unreadColor)
+            binding.chapterTitle.setTextColor(
+                if (item.bookmark) adapter.bookmarkedColor else adapter.unreadColorSecondary
+            )
         }
 
         // Set bookmark status
diff --git a/app/src/main/res/font/ptsans_narrow_bold.ttf b/app/src/main/res/font/ptsans_narrow_bold.ttf
deleted file mode 100644
index 74494e851..000000000
Binary files a/app/src/main/res/font/ptsans_narrow_bold.ttf and /dev/null differ
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 7b992b13a..f74940904 100644
--- a/app/src/main/res/layout-sw720dp/manga_info_header.xml
+++ b/app/src/main/res/layout-sw720dp/manga_info_header.xml
@@ -64,29 +64,31 @@
 
         <TextView
             android:id="@+id/manga_full_title"
-            style="@style/TextAppearance.Medium.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:gravity="center"
             android:text="@string/manga_info_full_title_label"
+            android:textAppearance="?attr/textAppearanceHeadline6"
             android:textIsSelectable="false" />
 
         <TextView
             android:id="@+id/manga_author"
-            style="@style/TextAppearance.Regular.Body1.Secondary.Bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textColor="?android:attr/textColorSecondary"
             android:textAlignment="center"
             android:textIsSelectable="false"
             tools:text="Author" />
 
         <TextView
             android:id="@+id/manga_artist"
-            style="@style/TextAppearance.Regular.Body1.Secondary.Bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textColor="?android:attr/textColorSecondary"
             android:textIsSelectable="false"
             tools:text="Artist" />
 
@@ -106,31 +108,34 @@
 
             <TextView
                 android:id="@+id/manga_status"
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:maxLines="1"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textIsSelectable="false"
                 tools:text="Status" />
 
             <TextView
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
                 android:layout_marginEnd="4dp"
                 android:text="•"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textIsSelectable="false"
                 tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/manga_source"
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textIsSelectable="false"
                 tools:text="Source" />
 
@@ -215,7 +220,6 @@
 
         <TextView
             android:id="@+id/manga_summary_text"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -224,6 +228,8 @@
             android:ellipsize="end"
             android:focusable="true"
             android:maxLines="3"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             android:textIsSelectable="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml
index cade6d105..48e727711 100755
--- a/app/src/main/res/layout/categories_item.xml
+++ b/app/src/main/res/layout/categories_item.xml
@@ -33,7 +33,7 @@
             android:layout_weight="1"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Regular.SubHeading"
+            android:textAppearance="?attr/textAppearanceBody2"
             tools:text="Category Title" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml
index 544e8053c..4011bf039 100644
--- a/app/src/main/res/layout/chapters_item.xml
+++ b/app/src/main/res/layout/chapters_item.xml
@@ -3,8 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:background="@drawable/list_item_selector_background"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingVertical="10dp"
     android:paddingStart="16dp"
     android:paddingEnd="5dp">
 
@@ -12,41 +14,44 @@
         android:id="@+id/bookmark_icon"
         android:layout_width="16dp"
         android:layout_height="0dp"
-        android:layout_marginTop="12dp"
         android:layout_marginEnd="4dp"
+        android:contentDescription="@string/action_filter_bookmarked"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/chapter_title"
         app:layout_constraintEnd_toStartOf="@id/chapter_title"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/chapter_title"
         app:srcCompat="@drawable/ic_bookmark_24dp"
         app:tint="?attr/colorAccent"
         tools:visibility="visible" />
 
     <TextView
         android:id="@+id/chapter_title"
-        style="@style/TextAppearance.Regular.Body1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceBody2"
+        app:layout_constraintBottom_toTopOf="@+id/chapter_description"
         app:layout_constraintEnd_toStartOf="@+id/download"
         app:layout_constraintStart_toEndOf="@+id/bookmark_icon"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
         tools:text="Title" />
 
     <TextView
         android:id="@+id/chapter_description"
-        style="@style/TextAppearance.Regular.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="6dp"
         android:ellipsize="end"
         android:singleLine="true"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/download"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chapter_title"
         tools:text="22/02/2016 • Scanlator • Page: 45" />
 
     <eu.kanade.tachiyomi.ui.manga.chapter.ChapterDownloadView
diff --git a/app/src/main/res/layout/common_dialog_with_checkbox.xml b/app/src/main/res/layout/common_dialog_with_checkbox.xml
index 412fe8562..feef0c7bc 100755
--- a/app/src/main/res/layout/common_dialog_with_checkbox.xml
+++ b/app/src/main/res/layout/common_dialog_with_checkbox.xml
@@ -10,7 +10,7 @@
         android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.Regular.Body1" />
+        android:textAppearance="?attr/textAppearanceBody2" />
 
     <CheckBox
         android:id="@+id/checkbox_option"
diff --git a/app/src/main/res/layout/common_view_empty.xml b/app/src/main/res/layout/common_view_empty.xml
index 02a68037c..fef77d055 100755
--- a/app/src/main/res/layout/common_view_empty.xml
+++ b/app/src/main/res/layout/common_view_empty.xml
@@ -9,20 +9,22 @@
 
     <TextView
         android:id="@+id/text_face"
-        style="@style/TextAppearance.Medium.Body2.Hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
         android:textSize="48sp"
         tools:text="-_-" />
 
     <TextView
         android:id="@+id/text_label"
-        style="@style/TextAppearance.Medium.Body2.Hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:gravity="center"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
         tools:text="Label" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index 61c222e69..d3e5124c0 100755
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -37,7 +37,7 @@
             android:layout_toEndOf="@id/reorder"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Regular.Body1"
+            android:textAppearance="?attr/textAppearanceBody2"
             app:layout_constraintEnd_toStartOf="@+id/download_progress_text"
             app:layout_constraintStart_toEndOf="@+id/reorder"
             app:layout_constraintTop_toTopOf="parent"
@@ -52,7 +52,8 @@
             android:layout_toEndOf="@id/reorder"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Regular.Caption"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textSize="12sp"
             app:layout_constraintEnd_toStartOf="@+id/manga_source"
             app:layout_constraintStart_toStartOf="@+id/manga_full_title"
             app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
@@ -75,7 +76,9 @@
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/manga_full_title"
             android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="@+id/manga_full_title"
             app:layout_constraintEnd_toStartOf="@+id/menu"
             app:layout_constraintTop_toTopOf="@+id/manga_full_title"
@@ -87,7 +90,9 @@
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/chapter_title"
             android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="@+id/chapter_title"
             app:layout_constraintEnd_toStartOf="@+id/menu"
             app:layout_constraintTop_toTopOf="@+id/chapter_title"
diff --git a/app/src/main/res/layout/extension_card_item.xml b/app/src/main/res/layout/extension_card_item.xml
index 2c715dcab..2849efd8a 100644
--- a/app/src/main/res/layout/extension_card_item.xml
+++ b/app/src/main/res/layout/extension_card_item.xml
@@ -22,14 +22,12 @@
 
     <TextView
         android:id="@+id/ext_title"
-        style="@style/TextAppearance.Regular"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading"
-        android:textSize="14sp"
+        android:textAppearance="?attr/textAppearanceBody2"
         app:layout_constraintBottom_toTopOf="@id/lang"
         app:layout_constraintEnd_toStartOf="@id/ext_button"
         app:layout_constraintStart_toEndOf="@id/image"
@@ -39,11 +37,10 @@
 
     <TextView
         android:id="@+id/lang"
-        style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:maxLines="1"
-        android:textSize="12sp"
+        android:textAppearance="?attr/textAppearanceCaption"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/image"
         app:layout_constraintTop_toBottomOf="@+id/ext_title"
@@ -52,25 +49,23 @@
 
     <TextView
         android:id="@+id/version"
-        style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:maxLines="1"
-        android:textSize="12sp"
+        android:textAppearance="?attr/textAppearanceCaption"
         app:layout_constraintStart_toEndOf="@id/lang"
         app:layout_constraintTop_toBottomOf="@+id/ext_title"
         tools:text="Version" />
 
     <TextView
         android:id="@+id/warning"
-        style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceCaption"
         android:textColor="?attr/colorError"
-        android:textSize="12sp"
         app:layout_constraintStart_toEndOf="@id/version"
         app:layout_constraintTop_toBottomOf="@+id/ext_title"
         tools:text="Warning" />
diff --git a/app/src/main/res/layout/extension_detail_header.xml b/app/src/main/res/layout/extension_detail_header.xml
index 2dd068866..2b634881b 100644
--- a/app/src/main/res/layout/extension_detail_header.xml
+++ b/app/src/main/res/layout/extension_detail_header.xml
@@ -36,11 +36,11 @@
 
         <TextView
             android:id="@+id/title"
-            style="@style/TextAppearance.Regular.SubHeading"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:elevation="3dp"
+            android:textAppearance="?attr/textAppearanceSubtitle1"
             app:layout_constraintStart_toEndOf="@id/icon"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="Tachiyomi: Extension" />
@@ -53,6 +53,7 @@
             android:layout_weight="1"
             android:elevation="3dp"
             android:gravity="center"
+            android:textAppearance="?attr/textAppearanceCaption"
             app:layout_constraintStart_toStartOf="@id/title"
             app:layout_constraintTop_toBottomOf="@id/title"
             tools:text="Version: 1.0.0" />
@@ -65,6 +66,7 @@
             android:layout_weight="1"
             android:elevation="3dp"
             android:gravity="center"
+            android:textAppearance="?attr/textAppearanceCaption"
             app:layout_constraintStart_toStartOf="@id/title"
             app:layout_constraintTop_toBottomOf="@id/version"
             tools:text="Language: English" />
@@ -78,6 +80,7 @@
             android:elevation="3dp"
             android:gravity="center"
             android:text="@string/ext_nsfw_warning"
+            android:textAppearance="?attr/textAppearanceCaption"
             android:textColor="?attr/colorError"
             android:visibility="gone"
             app:layout_constraintStart_toStartOf="@id/title"
@@ -91,6 +94,7 @@
             android:elevation="3dp"
             android:ellipsize="middle"
             android:singleLine="true"
+            android:textAppearance="?attr/textAppearanceCaption"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/title"
             app:layout_constraintTop_toBottomOf="@id/nsfw"
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 80dbf051d..1ede433d3 100644
--- a/app/src/main/res/layout/global_search_controller_card.xml
+++ b/app/src/main/res/layout/global_search_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/global_search_controller_card_item.xml b/app/src/main/res/layout/global_search_controller_card_item.xml
index 705da7f6b..177c951cb 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
@@ -46,7 +46,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"
@@ -56,6 +55,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" />
@@ -66,14 +66,13 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/TextAppearance.Regular.Body1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/ptsans_narrow_bold"
-        android:lineSpacingExtra="-4dp"
         android:maxLines="2"
         android:padding="4dp"
+        android:textAppearance="?attr/textAppearanceSubtitle2"
+        android:textSize="12sp"
         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 f56f47f7b..c2dd46f18 100644
--- a/app/src/main/res/layout/history_item.xml
+++ b/app/src/main/res/layout/history_item.xml
@@ -42,14 +42,16 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
-            android:textAppearance="@style/TextAppearance.Medium"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             tools:text="Title" />
 
         <TextView
             android:id="@+id/manga_subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="2dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             tools:text="Subtitle" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/licenses_item.xml b/app/src/main/res/layout/licenses_item.xml
index 3f697f2e6..41b933b0b 100644
--- a/app/src/main/res/layout/licenses_item.xml
+++ b/app/src/main/res/layout/licenses_item.xml
@@ -10,21 +10,25 @@
 
     <TextView
         android:id="@+id/name"
-        style="@style/TextAppearance.Regular.Body1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceSubtitle2"
         tools:text="Library name" />
 
     <TextView
         android:id="@+id/artifact_id"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
         tools:text="artifact:id:1.0" />
 
     <TextView
         android:id="@+id/license"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
         tools:text="Apache Version 2.0" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/manga_chapters_header.xml b/app/src/main/res/layout/manga_chapters_header.xml
index 51ab83f24..a5ea57e17 100644
--- a/app/src/main/res/layout/manga_chapters_header.xml
+++ b/app/src/main/res/layout/manga_chapters_header.xml
@@ -13,12 +13,11 @@
 
     <TextView
         android:id="@+id/chapters_label"
-        style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/chapters"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
         android:textIsSelectable="false"
-        android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btn_chapters_filter"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml
index 85af69b18..c481b1ce0 100644
--- a/app/src/main/res/layout/manga_info_header.xml
+++ b/app/src/main/res/layout/manga_info_header.xml
@@ -70,27 +70,29 @@
 
         <TextView
             android:id="@+id/manga_full_title"
-            style="@style/TextAppearance.Medium.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/manga_info_full_title_label"
+            android:textAppearance="?attr/textAppearanceHeadline6"
             android:textIsSelectable="false" />
 
         <TextView
             android:id="@+id/manga_author"
-            style="@style/TextAppearance.Regular.Body1.Secondary.Bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textColor="?android:attr/textColorSecondary"
             android:textIsSelectable="false"
             tools:text="Author" />
 
         <TextView
             android:id="@+id/manga_artist"
-            style="@style/TextAppearance.Regular.Body1.Secondary.Bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textColor="?android:attr/textColorSecondary"
             android:textIsSelectable="false"
             tools:text="Artist" />
 
@@ -111,31 +113,34 @@
 
             <TextView
                 android:id="@+id/manga_status"
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:maxLines="1"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textIsSelectable="false"
                 tools:text="Status" />
 
             <TextView
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
                 android:layout_marginEnd="4dp"
                 android:text="•"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textIsSelectable="false"
                 tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/manga_source"
-                style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textIsSelectable="false"
                 tools:text="Source" />
 
@@ -226,7 +231,6 @@
 
         <TextView
             android:id="@+id/manga_summary_text"
-            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -235,6 +239,8 @@
             android:ellipsize="end"
             android:focusable="true"
             android:maxLines="3"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
             android:textIsSelectable="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/navigation_view_checkbox.xml b/app/src/main/res/layout/navigation_view_checkbox.xml
index 2c36b7bf4..1fbe7a7b3 100755
--- a/app/src/main/res/layout/navigation_view_checkbox.xml
+++ b/app/src/main/res/layout/navigation_view_checkbox.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
@@ -17,6 +18,7 @@
         android:gravity="center_vertical|start"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        android:textAppearance="?attr/textAppearanceBody2"
+        tools:text="Title" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_checkedtext.xml b/app/src/main/res/layout/navigation_view_checkedtext.xml
index 51243946c..68a8c8b7d 100755
--- a/app/src/main/res/layout/navigation_view_checkedtext.xml
+++ b/app/src/main/res/layout/navigation_view_checkedtext.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
@@ -15,6 +16,7 @@
         android:drawablePadding="16dp"
         android:gravity="center_vertical|start"
         android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        android:textAppearance="?attr/textAppearanceBody2"
+        tools:text="Title" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml
index 8caca0f3d..762232254 100755
--- a/app/src/main/res/layout/navigation_view_group.xml
+++ b/app/src/main/res/layout/navigation_view_group.xml
@@ -17,7 +17,7 @@
         android:layout_weight="1"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+        android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader"
         tools:text="Header" />
 
     <ImageView
diff --git a/app/src/main/res/layout/navigation_view_radio.xml b/app/src/main/res/layout/navigation_view_radio.xml
index 7ac1d6687..a81dbc27d 100755
--- a/app/src/main/res/layout/navigation_view_radio.xml
+++ b/app/src/main/res/layout/navigation_view_radio.xml
@@ -17,6 +17,6 @@
         android:gravity="center_vertical|start"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        android:textAppearance="?attr/textAppearanceBody2" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_spinner.xml b/app/src/main/res/layout/navigation_view_spinner.xml
index 2d3b8a630..75966ee36 100755
--- a/app/src/main/res/layout/navigation_view_spinner.xml
+++ b/app/src/main/res/layout/navigation_view_spinner.xml
@@ -17,6 +17,8 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingEnd="8dp"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
         tools:text="Filter:" />
 
     <Spinner
diff --git a/app/src/main/res/layout/navigation_view_text.xml b/app/src/main/res/layout/navigation_view_text.xml
index 7806ace91..4fe2f2b53 100755
--- a/app/src/main/res/layout/navigation_view_text.xml
+++ b/app/src/main/res/layout/navigation_view_text.xml
@@ -23,7 +23,7 @@
             android:imeOptions="actionDone"
             android:inputType="text"
             android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+            android:textAppearance="?attr/textAppearanceBody2" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index ac88408bb..ce4a49218 100755
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -19,11 +19,11 @@
 
         <eu.kanade.tachiyomi.ui.reader.PageIndicatorTextView
             android:id="@+id/page_number"
-            style="@style/TextAppearance.Regular.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"
             android:padding="4dp"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             android:textDirection="ltr"
             android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/reader_color_filter_settings.xml b/app/src/main/res/layout/reader_color_filter_settings.xml
index 695e85647..553929f1e 100644
--- a/app/src/main/res/layout/reader_color_filter_settings.xml
+++ b/app/src/main/res/layout/reader_color_filter_settings.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:text="@string/color_filter_r_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_red"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_red" />
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="16dp"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_red"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_red"
@@ -70,7 +70,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:text="@string/color_filter_g_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_green"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_green" />
@@ -96,7 +96,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="16dp"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_green"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_green"
@@ -110,7 +110,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:text="@string/color_filter_b_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_blue"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_blue" />
@@ -136,7 +136,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="16dp"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_blue"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_blue"
@@ -150,7 +150,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:text="@string/color_filter_a_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_alpha"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_alpha" />
@@ -176,7 +176,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="16dp"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_alpha"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_color_filter_alpha"
@@ -234,7 +234,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             android:tint="?attr/colorOnBackground"
             app:layout_constraintBottom_toBottomOf="@id/slider_brightness"
             app:layout_constraintStart_toStartOf="parent"
@@ -262,7 +262,7 @@
             android:layout_width="30dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintBottom_toBottomOf="@id/slider_brightness"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/slider_brightness"
diff --git a/app/src/main/res/layout/reader_pager_settings.xml b/app/src/main/res/layout/reader_pager_settings.xml
index 031f6c4ad..b5655bc90 100644
--- a/app/src/main/res/layout/reader_pager_settings.xml
+++ b/app/src/main/res/layout/reader_pager_settings.xml
@@ -13,7 +13,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:text="@string/pager_viewer"
-        android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
+        android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader" />
 
     <eu.kanade.tachiyomi.widget.MaterialSpinnerView
         android:id="@+id/pager_nav"
diff --git a/app/src/main/res/layout/reader_reading_mode_settings.xml b/app/src/main/res/layout/reader_reading_mode_settings.xml
index a258c6370..a1dcf22d7 100644
--- a/app/src/main/res/layout/reader_reading_mode_settings.xml
+++ b/app/src/main/res/layout/reader_reading_mode_settings.xml
@@ -18,7 +18,7 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/pref_category_for_this_series"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
+            android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader" />
 
         <eu.kanade.tachiyomi.widget.MaterialSpinnerView
             android:id="@+id/viewer"
diff --git a/app/src/main/res/layout/reader_webtoon_settings.xml b/app/src/main/res/layout/reader_webtoon_settings.xml
index 176805f4f..fcbf474c0 100644
--- a/app/src/main/res/layout/reader_webtoon_settings.xml
+++ b/app/src/main/res/layout/reader_webtoon_settings.xml
@@ -13,7 +13,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:text="@string/webtoon_viewer"
-        android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
+        android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader" />
 
     <eu.kanade.tachiyomi.widget.MaterialSpinnerView
         android:id="@+id/webtoon_nav"
diff --git a/app/src/main/res/layout/section_header_item.xml b/app/src/main/res/layout/section_header_item.xml
index 45eba41e8..36d2a71dd 100644
--- a/app/src/main/res/layout/section_header_item.xml
+++ b/app/src/main/res/layout/section_header_item.xml
@@ -6,11 +6,11 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/TextAppearance.Medium.SubHeading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingHorizontal="16dp"
         android:paddingVertical="8dp"
+        android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader"
         tools:text="Title" />
 
 </FrameLayout>
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 50dcf119b..6a074fa01 100644
--- a/app/src/main/res/layout/settings_search_controller_card.xml
+++ b/app/src/main/res/layout/settings_search_controller_card.xml
@@ -10,24 +10,27 @@
 
     <TextView
         android:id="@+id/search_result_pref_title"
-        style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItem"
         tools:text="Title" />
 
     <TextView
         android:id="@+id/search_result_pref_summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceListItemSecondary"
+        android:textColor="?android:attr/textColorSecondary"
         tools:text="Summary" />
 
     <TextView
         android:id="@+id/search_result_pref_breadcrumb"
-        style="@style/TextAppearance.Regular.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceCaption"
+        android:textColor="?android:attr/textColorPrimary"
         tools:text="Location" />
 
 </LinearLayout>
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 2ffe1a832..e2cf0542f 100644
--- a/app/src/main/res/layout/source_comfortable_grid_item.xml
+++ b/app/src/main/res/layout/source_comfortable_grid_item.xml
@@ -67,7 +67,6 @@
 
                 <TextView
                     android:id="@+id/local_text"
-                    style="@style/TextAppearance.Regular.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="?attr/colorTertiary"
@@ -77,13 +76,13 @@
                     android:paddingEnd="3dp"
                     android:paddingBottom="1dp"
                     android:text="@string/local_source_badge"
+                    android:textAppearance="?attr/textAppearanceCaption"
                     android:textColor="?attr/colorOnTertiary"
                     android:visibility="gone"
                     tools:visibility="visible" />
 
                 <TextView
                     android:id="@+id/download_text"
-                    style="@style/TextAppearance.Regular.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="?attr/colorTertiary"
@@ -92,6 +91,7 @@
                     android:maxLines="1"
                     android:paddingEnd="3dp"
                     android:paddingBottom="1dp"
+                    android:textAppearance="?attr/textAppearanceCaption"
                     android:textColor="?attr/colorOnTertiary"
                     android:visibility="gone"
                     tools:text="120"
@@ -99,7 +99,6 @@
 
                 <TextView
                     android:id="@+id/unread_text"
-                    style="@style/TextAppearance.Regular.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="?attr/colorSecondary"
@@ -108,6 +107,7 @@
                     android:paddingEnd="3dp"
                     android:maxLines="1"
                     android:paddingBottom="1dp"
+                    android:textAppearance="?attr/textAppearanceCaption"
                     android:textColor="?attr/colorOnSecondary"
                     android:visibility="gone"
                     tools:text="120"
@@ -115,7 +115,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"
@@ -125,6 +124,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" />
@@ -144,14 +144,13 @@
 
         <TextView
             android:id="@+id/title"
-            style="@style/TextAppearance.Regular.Body1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:fontFamily="@font/ptsans_narrow_bold"
-            android:lineSpacingExtra="-4dp"
             android:maxLines="2"
             android:padding="4dp"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textSize="12sp"
             android:textColor="@color/source_comfortable_item_title"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/card"
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 d7bb2e591..38c764bd0 100644
--- a/app/src/main/res/layout/source_compact_grid_item.xml
+++ b/app/src/main/res/layout/source_compact_grid_item.xml
@@ -66,7 +66,6 @@
 
             <TextView
                 android:id="@+id/local_text"
-                style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorTertiary"
@@ -76,13 +75,13 @@
                 android:paddingBottom="1dp"
                 android:maxLines="1"
                 android:text="@string/local_source_badge"
+                android:textAppearance="?attr/textAppearanceCaption"
                 android:textColor="?attr/colorOnTertiary"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/download_text"
-                style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorTertiary"
@@ -91,6 +90,7 @@
                 android:maxLines="1"
                 android:paddingEnd="3dp"
                 android:paddingBottom="1dp"
+                android:textAppearance="?attr/textAppearanceCaption"
                 android:textColor="?attr/colorOnTertiary"
                 android:visibility="gone"
                 tools:text="120"
@@ -98,7 +98,6 @@
 
             <TextView
                 android:id="@+id/unread_text"
-                style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorSecondary"
@@ -107,6 +106,7 @@
                 android:paddingEnd="3dp"
                 android:paddingBottom="1dp"
                 android:maxLines="1"
+                android:textAppearance="?attr/textAppearanceCaption"
                 android:textColor="?attr/colorOnSecondary"
                 android:visibility="gone"
                 tools:text="120"
@@ -114,7 +114,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"
@@ -124,6 +123,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" />
@@ -132,19 +132,18 @@
 
         <TextView
             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"
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="4"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textSize="12sp"
             android:textColor="@color/md_white_1000"
             tools:text="Sample name" />
 
diff --git a/app/src/main/res/layout/source_list_item.xml b/app/src/main/res/layout/source_list_item.xml
index 44c81eaca..0a770dafa 100644
--- a/app/src/main/res/layout/source_list_item.xml
+++ b/app/src/main/res/layout/source_list_item.xml
@@ -23,14 +23,13 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="16sp"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/badges"
         app:layout_constraintHorizontal_bias="0.007"
@@ -51,7 +50,6 @@
 
         <TextView
             android:id="@+id/local_text"
-            style="@style/TextAppearance.Regular.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/colorTertiary"
@@ -61,13 +59,13 @@
             android:paddingEnd="3dp"
             android:paddingBottom="1dp"
             android:text="@string/local_source_badge"
+            android:textAppearance="?attr/textAppearanceCaption"
             android:textColor="?attr/colorOnTertiary"
             android:visibility="gone"
             tools:visibility="visible" />
 
         <TextView
             android:id="@+id/download_text"
-            style="@style/TextAppearance.Regular.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/colorTertiary"
@@ -76,6 +74,7 @@
             android:paddingTop="1dp"
             android:paddingEnd="3dp"
             android:paddingBottom="1dp"
+            android:textAppearance="?attr/textAppearanceCaption"
             android:textColor="?attr/colorOnTertiary"
             android:visibility="gone"
             tools:text="122"
@@ -83,7 +82,6 @@
 
         <TextView
             android:id="@+id/unread_text"
-            style="@style/TextAppearance.Regular.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/colorSecondary"
@@ -92,6 +90,7 @@
             android:paddingTop="1dp"
             android:paddingEnd="3dp"
             android:paddingBottom="1dp"
+            android:textAppearance="?attr/textAppearanceCaption"
             android:textColor="?attr/colorOnSecondary"
             android:visibility="gone"
             tools:text="130"
@@ -99,7 +98,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"
@@ -109,6 +107,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" />
diff --git a/app/src/main/res/layout/source_main_controller_item.xml b/app/src/main/res/layout/source_main_controller_item.xml
index 030ac0cf6..ca0bbe031 100644
--- a/app/src/main/res/layout/source_main_controller_item.xml
+++ b/app/src/main/res/layout/source_main_controller_item.xml
@@ -27,7 +27,7 @@
         android:maxLines="1"
         android:paddingStart="0dp"
         android:paddingEnd="8dp"
-        android:textAppearance="@style/TextAppearance.Regular.SubHeading"
+        android:textAppearance="?attr/textAppearanceBody2"
         app:layout_constraintBottom_toTopOf="@id/subtitle"
         app:layout_constraintEnd_toStartOf="@+id/source_latest"
         app:layout_constraintStart_toEndOf="@+id/image"
@@ -37,11 +37,10 @@
 
     <TextView
         android:id="@+id/subtitle"
-        style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:maxLines="1"
-        android:textSize="12sp"
+        android:textAppearance="?attr/textAppearanceCaption"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/source_latest"
diff --git a/app/src/main/res/layout/updates_item.xml b/app/src/main/res/layout/updates_item.xml
index 23bdf2d9a..0064745b8 100644
--- a/app/src/main/res/layout/updates_item.xml
+++ b/app/src/main/res/layout/updates_item.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="@drawable/list_item_selector_background"
-    android:paddingStart="12dp"
+    android:paddingStart="16dp"
     android:paddingEnd="4dp">
 
     <com.google.android.material.imageview.ShapeableImageView
@@ -29,7 +29,7 @@
         android:layout_marginStart="16dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.Medium.Body2"
+        android:textAppearance="?attr/textAppearanceSubtitle2"
         app:layout_constraintBottom_toTopOf="@+id/chapter_title"
         app:layout_constraintEnd_toStartOf="@+id/download"
         app:layout_constraintStart_toEndOf="@+id/manga_cover"
@@ -58,7 +58,9 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.Regular.Caption"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/download"
         app:layout_constraintStart_toEndOf="@id/bookmark_icon"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0baf0d0c4..dbd82bc1c 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -78,82 +78,26 @@
     <!--===============-->
     <!--Text Appearance-->
     <!--===============-->
-    <style name="TextAppearance" parent="android:TextAppearance">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance.Regular">
-        <item name="android:fontFamily">sans-serif</item>
-    </style>
-
-    <style name="TextAppearance.Regular.Body1">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="TextAppearance.Regular.Body1.Bold">
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.Regular.Body1.Secondary">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="TextAppearance.Regular.Body1.Secondary.Bold">
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.Regular.Caption">
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="TextAppearance.Regular.Caption.Hint">
-        <item name="android:textColor">@color/material_on_surface_emphasis_medium</item>
-    </style>
-
-    <style name="TextAppearance.Regular.SubHeading">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="TextAppearance.Medium">
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="TextAppearance.Medium.Title">
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <style name="TextAppearance.Medium.Body2">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="TextAppearance.Medium.Body2.Hint">
-        <item name="android:textColor">?android:attr/textColorHint</item>
-    </style>
-
-    <style name="TextAppearance.Medium.SubHeading">
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="TextAppearance.Widget.Button" parent="TextAppearance.MaterialComponents.Button">
-        <item name="android:letterSpacing">-0.006</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
+    <style name="TextAppearance.Widget.Button" parent="TextAppearance.MaterialComponents.Subtitle2" />
 
     <style name="TextAppearance.Widget.Menu" parent="TextAppearance.AppCompat.Menu">
         <item name="android:textColor">?attr/colorOnBackground</item>
     </style>
 
-    <style name="TextAppearance.Widget.Tab" parent="TextAppearance.MaterialComponents.Button">
-        <item name="android:textAllCaps">false</item>
-        <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>
 
+    <style name="TextAppearance.Tachiyomi.Preference.Secondary" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="android:textSize">13sp</item>
+    </style>
+
+    <style name="TextAppearance.Tachiyomi.SectionHeader" parent="TextAppearance.MaterialComponents.Subtitle2">
+        <item name="textAllCaps">true</item>
+        <item name="android:letterSpacing">0.0357142857</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
 
     <!--=======-->
     <!--Widgets-->
@@ -203,7 +147,7 @@
         <!-- Smaller text/height -->
         <item name="chipCornerRadius">12dp</item>
         <item name="chipMinHeight">24dp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Regular.Caption</item>
+        <item name="android:textAppearance">?attr/textAppearanceCaption</item>
 
         <!-- Collapse horizontal margin -->
         <item name="chipMinTouchTargetSize">30dp</item>
@@ -345,4 +289,11 @@
         <item name="android:windowExitAnimation">@anim/fade_out_short</item>
     </style>
 
+    <!--==========-->
+    <!--Preference-->
+    <!--==========-->
+    <style name="PreferenceThemeOverlay.Tachiyomi">
+        <item name="preferenceCategoryTitleTextAppearance">?attr/textAppearanceBody2</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0f03a6c84..6e5a1617d 100755
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -53,7 +53,7 @@
         <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="preferenceTheme">@style/PreferenceThemeOverlay.Tachiyomi</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
         <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
         <item name="chipTextColor">?android:attr/textColorPrimary</item>
@@ -72,6 +72,10 @@
 
         <!-- Custom Attributes-->
         <item name="colorFilterActive">@color/filter_light</item>
+
+        <!-- Preference text appearance -->
+        <item name="android:textAppearanceListItem">?attr/textAppearanceSubtitle1</item>
+        <item name="android:textAppearanceListItemSecondary">@style/TextAppearance.Tachiyomi.Preference.Secondary</item>
     </style>
 
     <!--== Default Theme ==-->