diff --git a/app/src/main/res/layout/dialog_rate.xml b/app/src/main/res/layout/dialog_rate.xml
index 2653aa65b..59aaf723b 100644
--- a/app/src/main/res/layout/dialog_rate.xml
+++ b/app/src/main/res/layout/dialog_rate.xml
@@ -29,7 +29,7 @@
         android:layout_marginBottom="16dp"
         android:gravity="center_horizontal"
         android:textSize="@dimen/text_little_small"
-        android:textColor="@color/primary_text_light"/>
+        android:textColor="?android:attr/textColorPrimary"/>
 
     <com.hippo.ehviewer.widget.GalleryRatingBar
         android:id="@+id/rating_view"
diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml
index deb57019a..e28120cf8 100644
--- a/app/src/main/res/layout/gallery_detail_actions.xml
+++ b/app/src/main/res/layout/gallery_detail_actions.xml
@@ -53,7 +53,7 @@
                     android:gravity="center_horizontal"
                     android:text="@string/favorited"
                     android:drawablePadding="8dp"
-                    android:textColor="@color/primary_text_light"/>
+                    android:textColor="?android:attr/textColorPrimary"/>
 
                 <TextView
                     android:id="@+id/heart_outline"
@@ -62,7 +62,7 @@
                     android:gravity="center_horizontal"
                     android:text="@string/not_favorited"
                     android:drawablePadding="8dp"
-                    android:textColor="@color/primary_text_light"/>
+                    android:textColor="?android:attr/textColorPrimary"/>
 
             </FrameLayout>
 
@@ -73,7 +73,7 @@
                 android:gravity="center_horizontal"
                 android:text="@string/rate"
                 android:drawablePadding="8dp"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/share"
@@ -82,7 +82,7 @@
                 android:gravity="center_horizontal"
                 android:text="@string/share"
                 android:drawablePadding="8dp"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/torrent"
@@ -90,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:drawablePadding="8dp"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/archive"
@@ -99,7 +99,7 @@
                 android:text="@string/archive"
                 android:gravity="center_horizontal"
                 android:drawablePadding="8dp"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/similar"
@@ -108,7 +108,7 @@
                 android:gravity="center_horizontal"
                 android:text="@string/similar_gallery"
                 android:drawablePadding="8dp"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/search_cover"
@@ -117,7 +117,7 @@
                 android:gravity="center_horizontal"
                 android:text="@string/search_cover"
                 android:drawablePadding="8dp"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
         </LinearLayout>
     </HorizontalScrollView>
@@ -135,6 +135,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:textColor="@color/primary_text_light"/>
+        android:textColor="?android:attr/textColorPrimary"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_info.xml b/app/src/main/res/layout/gallery_detail_info.xml
index 1524d9d71..cac14e08f 100644
--- a/app/src/main/res/layout/gallery_detail_info.xml
+++ b/app/src/main/res/layout/gallery_detail_info.xml
@@ -37,7 +37,7 @@
                 android:layout_weight="1"
                 android:gravity="left"
                 android:singleLine="true"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/pages"
@@ -45,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:singleLine="true"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/size"
@@ -54,7 +54,7 @@
                 android:layout_weight="1"
                 android:gravity="right"
                 android:singleLine="true"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
         </TableRow>
 
@@ -68,7 +68,7 @@
                 android:layout_weight="1"
                 android:gravity="left"
                 android:singleLine="true"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/posted"
@@ -77,7 +77,7 @@
                 android:layout_weight="1"
                 android:gravity="right"
                 android:singleLine="true"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
         </TableRow>
     </TableLayout>
diff --git a/app/src/main/res/layout/item_excluded_languages.xml b/app/src/main/res/layout/item_excluded_languages.xml
index b17c492eb..918c11d96 100644
--- a/app/src/main/res/layout/item_excluded_languages.xml
+++ b/app/src/main/res/layout/item_excluded_languages.xml
@@ -25,7 +25,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:textColor="@color/primary_text_light"/>
+        android:textColor="?android:attr/textColorPrimary"/>
 
     <com.hippo.widget.SensitiveCheckBox
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
index d0b149180..cfac8ad92 100644
--- a/app/src/main/res/layout/item_filter.xml
+++ b/app/src/main/res/layout/item_filter.xml
@@ -49,7 +49,7 @@
                 android:singleLine="true"
                 android:ellipsize="end"
                 android:textSize="@dimen/text_little_small"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_filter_header.xml b/app/src/main/res/layout/item_filter_header.xml
index 2701463e4..888f921ea 100644
--- a/app/src/main/res/layout/item_filter_header.xml
+++ b/app/src/main/res/layout/item_filter_header.xml
@@ -22,5 +22,5 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textAppearance="@style/TextAppearance.AppCompat.Title"
-    android:textColor="@color/primary_text_light"
+    android:textColor="?android:attr/textColorPrimary"
     android:padding="8dp"/>
diff --git a/app/src/main/res/layout/item_gallery_comment.xml b/app/src/main/res/layout/item_gallery_comment.xml
index 83b9e3a57..288b65583 100644
--- a/app/src/main/res/layout/item_gallery_comment.xml
+++ b/app/src/main/res/layout/item_gallery_comment.xml
@@ -43,6 +43,6 @@
         android:layout_below="@id/user"
         android:layout_marginTop="8.0dp"
         android:ellipsize="end"
-        android:textColor="@color/primary_text_light"/>
+        android:textColor="?android:attr/textColorPrimary"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_hosts.xml b/app/src/main/res/layout/item_hosts.xml
index 98047bdff..f48e93707 100644
--- a/app/src/main/res/layout/item_hosts.xml
+++ b/app/src/main/res/layout/item_hosts.xml
@@ -29,7 +29,7 @@
     android:id="@+id/host"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:textColor="@color/primary_text_light"/>
+    android:textColor="?android:attr/textColorPrimary"/>
 
   <TextView
     android:id="@+id/ip"
diff --git a/app/src/main/res/layout/item_label_list.xml b/app/src/main/res/layout/item_label_list.xml
index b3de285c6..0724a1c0b 100644
--- a/app/src/main/res/layout/item_label_list.xml
+++ b/app/src/main/res/layout/item_label_list.xml
@@ -71,7 +71,7 @@
                 android:singleLine="true"
                 android:ellipsize="end"
                 android:textSize="@dimen/text_little_small"
-                android:textColor="@color/primary_text_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <ImageView
                 xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/item_preference_header.xml b/app/src/main/res/layout/item_preference_header.xml
index 10442e5a5..33b45c24a 100644
--- a/app/src/main/res/layout/item_preference_header.xml
+++ b/app/src/main/res/layout/item_preference_header.xml
@@ -52,7 +52,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
-                android:textColor="@color/preference_header_title_light"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@android:id/summary"