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 b2ccd0bec..9e938d9e0 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -519,7 +519,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
mTip.setCompoundDrawables(null, drawable, null, null);
mTip.setOnClickListener(this);
- boolean isDarkTheme = !AttrResources.getAttrBoolean(context, R.attr.isLightTheme);
mHeader = ViewUtils.$$(mainView, R.id.header);
mColorBg = ViewUtils.$$(mHeader, R.id.color_bg);
mThumb = (LoadImageView) ViewUtils.$$(mHeader, R.id.thumb);
diff --git a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
index 005cbaaf3..5a22bf742 100644
--- a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
+++ b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
@@ -140,7 +140,7 @@ public class LockPatternView extends View {
mPathPaint.setAntiAlias(true);
mPathPaint.setDither(true);
- mRegularColor = getResources().getColor(AttrResources.getAttrBoolean(context, R.attr.isLightTheme) ? R.color.lock_pattern_view_regular_color_light : R.color.lock_pattern_view_regular_color_dark);
+ mRegularColor = getResources().getColor(R.color.lock_pattern_view_regular_color);
mErrorColor = getResources().getColor(R.color.lock_pattern_view_error_color);
mSuccessColor = getResources().getColor(R.color.lock_pattern_view_success_color);
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index fb91402a8..fb24d9e5a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -120,10 +120,17 @@
#38000000
+
+ @color/grey_900
+
#1f000000
#e5009688
+
+ #8affffff
+ @color/colorPrimary
+ @color/red_500
#F5F5F5
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1acc4b2b1..22c8ce11d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -152,16 +152,14 @@
#38000000
- @color/grey_800
- @color/grey_900
+ @color/grey_100
#1f000000
#e5009688
- #8a000000
- #8affffff
+ #8a000000
@color/colorPrimary
@color/red_500
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a8a5c9988..6b509bbe9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -136,7 +136,7 @@