diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 634480f7b..3fe69284b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -723,7 +723,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         }
 
         if ((oldState == STATE_INIT || oldState == STATE_FAILED || oldState == STATE_REFRESH) &&
-                (state == STATE_NORMAL || state == STATE_REFRESH_HEADER)) {
+                (state == STATE_NORMAL || state == STATE_REFRESH_HEADER) && AttrResources.getAttrBoolean(getContext2(), R.attr.isLightTheme)) {
             if (!createCircularReveal()) {
                 SimpleHandler.getInstance().post(new Runnable() {
                     @Override
@@ -834,8 +834,8 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
             mNoTags.setVisibility(View.GONE);
         }
 
-        int colorTag = resources.getColor(R.color.colorPrimary);
-        int colorName = resources.getColor(R.color.purple_a400);
+        int colorTag = AttrResources.getAttrColor(context, R.attr.contentColorThemePrimary);//resources.getColor(R.color.colorPrimary);
+        int colorName = AttrResources.getAttrColor(context, R.attr.contentColorThemeAccent);//resources.getColor(R.color.purple_a400);
         for (GalleryTagGroup tg : tagGroups) {
             LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.gallery_tag_group, mTags, false);
             ll.setOrientation(LinearLayout.HORIZONTAL);
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 7064e1a89..7cdf5d681 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -31,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="?attr/colorPrimary"/>
+            android:background="?attr/contentColorThemePrimary"/>
 
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a8f74c24d..59ba0c71b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -33,6 +33,10 @@
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
         <attr name="drawableColorThemePrimary" format="color"/>
+        <!-- Color of card background -->
+        <attr name="contentColorPrimary" format="color"/>
+        <attr name="contentColorThemePrimary" format="color"/>
+        <attr name="contentColorThemeAccent" format="color"/>
         <attr name="toolbarPopupTheme" format="reference"/>
     </declare-styleable>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a61715c6f..0068f9d8c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -51,9 +51,12 @@
     <color name="light_green_600">#ff7cb342</color>
     <color name="yellow_800">#fff9a825</color>
     <color name="deep_orange_400">#ffff7043</color>
+    <color name="grey_800">#ff424242</color>
+    <color name="grey_700">#ff616161</color>
     <color name="grey_500">#ff9e9e9e</color>
     <color name="grey_300">#ffe0e0e0</color>
     <color name="grey_200">#ffeeeeee</color>
+    <color name="grey_100">#fff5f5f5</color>
     <color name="brown_500">#ff795548</color>
 
     <color name="colorPrimary">@color/teal_500</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 09b54b637..b9832531c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -144,6 +144,7 @@
         <item name="cardElevation">4dp</item>
         <item name="cardMaxElevation">4dp</item>
         <item name="cardPreventCornerOverlap">true</item>
+        <item name="cardBackgroundColor">?attr/contentColorPrimary</item>
         <item name="contentPadding">0dp</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ff823c73e..14de76138 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -32,7 +32,9 @@
         <item name="drawableColorPrimary">@color/primary_drawable_light</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_light</item>
         <item name="drawableColorThemePrimary">@color/colorPrimary</item>
-
+        <item name="contentColorPrimary">@color/grey_100</item>
+        <item name="contentColorThemePrimary">@color/colorPrimary</item>
+        <item name="contentColorThemeAccent">@color/colorAccent</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
@@ -58,6 +60,9 @@
         <item name="drawableColorPrimary">@color/primary_drawable_dark</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_dark</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable_dark</item>
+        <item name="contentColorPrimary">@color/grey_800</item>
+        <item name="contentColorThemePrimary">?attr/contentColorPrimary</item>
+        <item name="contentColorThemeAccent">?attr/contentColorPrimary</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
@@ -87,6 +92,9 @@
         <item name="drawableColorPrimary">@color/primary_drawable_dark</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_dark</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable_dark</item>
+        <item name="contentColorPrimary">@color/grey_800</item>
+        <item name="contentColorThemePrimary">?attr/contentColorPrimary</item>
+        <item name="contentColorThemeAccent">?attr/contentColorPrimary</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>