diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java
index ed36896875..ba498b216e 100644
--- a/app/src/main/java/com/gh/base/BaseActivity.java
+++ b/app/src/main/java/com/gh/base/BaseActivity.java
@@ -91,6 +91,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
     protected String mEntrance;
 
     private boolean mIsExistLogoutDialog;
+    private boolean mNightMode;
     public long startPageTime = 0;
 
     protected final Handler mBaseHandler = new BaseHandler(this);
@@ -162,12 +163,18 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
                 }
             }
         }
+
+        mNightMode = NightModeUtils.INSTANCE.isNightMode(this);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
         startPageTime = System.currentTimeMillis();
+
+        if (!NightModeUtils.INSTANCE.getSystemMode() && mNightMode != NightModeUtils.INSTANCE.isNightMode(this)) {
+            onNightModeChange();
+        }
     }
 
     @SuppressWarnings("ConstantConditions")
@@ -520,6 +527,11 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        onNightModeChange();
+    }
+
+    protected void onNightModeChange() {
+        mNightMode = NightModeUtils.INSTANCE.isNightMode(this);
         TextView tv = findViewById(ID_NIGHT_INDICATOR);
         if (tv != null) {
             tv.setText(NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式");
diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment.java b/app/src/main/java/com/gh/base/fragment/BaseFragment.java
index 9da1e0eb48..8d9b326dfa 100644
--- a/app/src/main/java/com/gh/base/fragment/BaseFragment.java
+++ b/app/src/main/java/com/gh/base/fragment/BaseFragment.java
@@ -1,6 +1,7 @@
 package com.gh.base.fragment;
 
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -8,6 +9,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
@@ -23,6 +25,7 @@ import com.gh.common.constant.Constants;
 import com.gh.common.syncpage.ISyncAdapterHandler;
 import com.gh.common.syncpage.SyncDataEntity;
 import com.gh.common.syncpage.SyncPageRepository;
+import com.gh.common.util.NightModeUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.eventbus.EBMiPush;
@@ -58,6 +61,8 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
 
     protected boolean isEverPause;
 
+    protected boolean mNightMode;
+
     @NonNull
     protected String mEntrance = "";
 
@@ -158,6 +163,8 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         if (addSyncPageObserver()) {
             initSyncPageObserver();
         }
+
+        mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
     }
 
     private void initSyncPageObserver() {
@@ -230,6 +237,10 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         super.onResume();
         isEverPause = false;
         startPageTime = System.currentTimeMillis();
+
+        if (!NightModeUtils.INSTANCE.getSystemMode() && mNightMode != NightModeUtils.INSTANCE.isNightMode(requireContext())) {
+            onNightModeChange();
+        }
     }
 
     @Override
@@ -331,4 +342,14 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     protected boolean addSyncPageObserver() {
         return false;
     }
+
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        onNightModeChange();
+    }
+
+    protected void onNightModeChange() {
+        mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
+    }
 }
diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index dbace54706..d6336149fa 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -846,7 +846,7 @@ public class DialogUtils {
 
         LinearLayout container = new LinearLayout(context);
         container.setOrientation(LinearLayout.VERTICAL);
-        container.setBackgroundColor(Color.WHITE);
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.background_white));
         container.setPadding(0, DisplayUtils.dip2px(context, 12f), 0, DisplayUtils.dip2px(context, 12f));
 
         for (String option : options) {
diff --git a/app/src/main/java/com/gh/common/util/DisplayUtils.java b/app/src/main/java/com/gh/common/util/DisplayUtils.java
index 88920bcae3..972aebdd2b 100644
--- a/app/src/main/java/com/gh/common/util/DisplayUtils.java
+++ b/app/src/main/java/com/gh/common/util/DisplayUtils.java
@@ -162,7 +162,7 @@ public class DisplayUtils {
     }
 
     public static void setLightStatusBar(Activity activity, boolean lightStatusBar) {
-        setLightStatusBar(activity, !NightModeUtils.INSTANCE.isNightMode(activity) && lightStatusBar, true);
+        setLightStatusBar(activity, lightStatusBar, true);
     }
 
     private static void setMIUIStatusBarStyle(Activity activity, boolean lightStatusBar, boolean isKeepLowVersionMiui) {
diff --git a/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt b/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt
index 2d35ee6deb..105b16ab99 100644
--- a/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt
+++ b/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt
@@ -15,7 +15,7 @@ object OptionDialogHelper {
         val dialog = Dialog(context)
         val container = LinearLayout(context)
         container.orientation = LinearLayout.VERTICAL
-        container.setBackgroundColor(Color.WHITE)
+        container.setBackgroundColor(R.color.background_white.toColor(context))
         container.setPadding(0, DisplayUtils.dip2px(context, 12f), 0, DisplayUtils.dip2px(context, 12f))
 
         for (type in typeList) {
diff --git a/app/src/main/java/com/gh/common/view/FilterView.kt b/app/src/main/java/com/gh/common/view/FilterView.kt
index d7fca4d950..60f5756d25 100644
--- a/app/src/main/java/com/gh/common/view/FilterView.kt
+++ b/app/src/main/java/com/gh/common/view/FilterView.kt
@@ -183,7 +183,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
                 holder.binding.titleTv.setBackgroundResource(R.drawable.bg_tag_text)
                 holder.binding.titleTv.setTextColor(R.color.white.toColor())
             } else {
-                holder.binding.titleTv.setBackgroundColor(Color.WHITE)
+                holder.binding.titleTv.setBackgroundColor(R.color.background_white.toColor(holder.binding.root.context))
                 holder.binding.titleTv.setTextColor(R.color.text_777777.toColor())
             }
 
diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt
index f60964f3bb..686d9c8903 100644
--- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModelProviders
 import com.ethanhua.skeleton.Skeleton
 import com.gh.common.constant.Constants
 import com.gh.common.util.EntranceUtils
+import com.gh.common.util.toColor
 import com.gh.common.view.VerticalItemDecoration
 import com.gh.gamecenter.R
 import com.gh.gamecenter.baselist.LazyListFragment
@@ -67,7 +68,7 @@ class CategoryDirectoryFragment : LazyListFragment<CategoryEntity, CategoryDirec
     override fun getItemDecoration() = VerticalItemDecoration(context, 0F, false)
 
     override fun onLoadRefresh() {
-        mCachedView?.setBackgroundColor(Color.WHITE)
+        mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         super.onLoadRefresh()
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt
index df338d45cb..f7eb57096d 100644
--- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt
@@ -11,6 +11,7 @@ import com.ethanhua.skeleton.ViewSkeletonScreen
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.DownloadItemUtils
 import com.gh.common.util.isSimulatorGame
+import com.gh.common.util.toColor
 import com.gh.common.view.FixLinearLayoutManager
 import com.gh.common.view.VerticalItemDecoration
 import com.gh.download.DownloadManager
@@ -112,15 +113,15 @@ class NewInstalledGameFragment : NormalFragment() {
 
         mPackageViewModel =
             ViewModelProvider(this, PackageViewModel.Factory()).get(PackageViewModel::class.java)
-        mPackageViewModel?.getGameInstalledLiveData()?.observe(this,
-            { gameInstalls ->
-                mInstallGameViewModel.initData(
-                    PackagesManager.filterSameApk(
-                        PackagesManager.filterDownloadBlackPackage(gameInstalls as MutableList<GameInstall>?)
-                    )
+        mPackageViewModel?.getGameInstalledLiveData()?.observe(this
+        ) { gameInstalls ->
+            mInstallGameViewModel.initData(
+                PackagesManager.filterSameApk(
+                    PackagesManager.filterDownloadBlackPackage(gameInstalls as MutableList<GameInstall>?)
                 )
-            })
-        mInstallGameViewModel.gameListLiveData.observe(this, {
+            )
+        }
+        mInstallGameViewModel.gameListLiveData.observe(this) {
             mSkeleton?.hide()
             if (!it.isNullOrEmpty()) {
                 mBinding.fmInstallRvShow.visibility = View.VISIBLE
@@ -129,9 +130,9 @@ class NewInstalledGameFragment : NormalFragment() {
             } else {
                 mBinding.fmInstallRvShow.visibility = View.GONE
                 mBinding.reuseNodataSkip.reuseNodataSkip.visibility = View.VISIBLE
-                mBinding.reuseNodataSkip.reuseNodataSkip.setBackgroundColor(Color.WHITE)
+                mBinding.reuseNodataSkip.reuseNodataSkip.setBackgroundColor(R.color.background_white.toColor(requireContext()))
             }
-        })
+        }
     }
 
     override fun getLayoutId(): Int = 0
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
index fc5e00d6e9..41db778967 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
@@ -1,6 +1,6 @@
 package com.gh.gamecenter.fragment
 
-import android.content.res.Configuration
+import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -121,7 +121,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
     override fun onFragmentResume() {
         super.onFragmentResume()
 
-        DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent)
+        DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent && !mNightMode)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -161,11 +161,18 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
                 },
                 onPageScrolled = { position, positionOffset, _ ->
                     if (position + 1 != mTabTitleList.size) {
-                        val currentAppBarColor =
+                        var currentAppBarColor =
                             tabList.safelyGetInRelease(position)?.primaryColor ?: R.color.background_white.toColor(requireContext())
-                        val incomingAppBarColor =
+                        var incomingAppBarColor =
                             tabList.safelyGetInRelease(position + 1)?.primaryColor ?: R.color.background_white.toColor(requireContext())
 
+                        if (mNightMode && currentAppBarColor == Color.WHITE) {
+                            currentAppBarColor = R.color.background_white.toColor(requireContext())
+                        }
+                        if (mNightMode && incomingAppBarColor == Color.WHITE) {
+                            incomingAppBarColor = R.color.background_white.toColor(requireContext())
+                        }
+
                         val proximatelySelectedPosition =
                             if (positionOffset < 0.5) position else position + 1
 
@@ -186,7 +193,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
 
                         if (isContentStyleChanged) {
                             updateIndicatorDrawable()
-                            DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent)
+                            DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent && !mNightMode)
                         }
 
                         mTabTitleList[position].run {
@@ -211,14 +218,17 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
                         mCurrentAppBarColor = appBarColorInBetween
                         updateAppBarStyle(appBarColorInBetween, mIsDisplayingLightContent)
                     } else {
-                        val currentAppBarColor = tabList.safelyGetInRelease(position)?.primaryColor ?: R.color.background_white.toColor(requireContext())
+                        var currentAppBarColor = tabList.safelyGetInRelease(position)?.primaryColor ?: R.color.background_white.toColor(requireContext())
+                        if (mNightMode && currentAppBarColor == Color.WHITE) {
+                            currentAppBarColor = R.color.background_white.toColor(requireContext())
+                        }
                         mIsDisplayingLightContent = tabList.safelyGetInRelease(position)?.useLightStyle == true
                         mTabSelectedColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_SELECTED_COLOR.toColor(requireContext())
                         mTabDefaultColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_DEFAULT_COLOR.toColor(requireContext())
 
                         updateAppBarStyle(currentAppBarColor, mIsDisplayingLightContent)
                         updateIndicatorDrawable()
-                        DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent)
+                        DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent && !mNightMode)
                     }
 
                     updateTabTextStyle(position, positionOffset)
@@ -283,7 +293,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
             currentTab.useLightStyle = false
             mIsDisplayingLightContent = false
             updateAppBarColorWhenScrollChanged(R.color.background_white.toColor(requireContext()))
-            DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent)
+            DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent && !mNightMode)
             mTabSelectedColor = TAB_SELECTED_COLOR.toColor(requireContext())
             mTabDefaultColor = TAB_DEFAULT_COLOR.toColor(requireContext())
             mBinding?.indicatorView?.updateIndicatorDrawable(R.drawable.ic_commodity_selected.toDrawable())
@@ -475,7 +485,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
         mBinding?.statusBar?.setBackgroundColor(color)
         mBinding?.tabContainer?.setBackgroundColor(color)
 
-        mSearchToolbarFragment.updateStyle(useLightStyle)
+        mSearchToolbarFragment.updateStyle(if (NightModeUtils.isNightMode(requireContext())) true else useLightStyle)
     }
 
     private fun generateTabView(title: String): TabItemMainBinding {
@@ -501,9 +511,18 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
         return super.onBackPressed()
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
+    private fun updateTabPrimaryColor() {
+        mViewModel?.tabs?.value?.forEach {
+            if (it.type != "top_game_comment") {
+                it.primaryColor = R.color.background_white.toColor(requireContext())
+            }
+        }
+    }
+
+    override fun onNightModeChange() {
+        super.onNightModeChange()
         getCurrentTab()?.isTopViewShow = true
+        updateTabPrimaryColor()
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
index 3edbd8dbf8..595affdd57 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
@@ -549,8 +549,8 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem
     }
 
     @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
+    protected void onNightModeChange() {
+        super.onNightModeChange();
         changeColor(mViewPager.getCurrentItem());
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java
index 67efd311b1..2a37d68a1d 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java
@@ -1,15 +1,16 @@
 package com.gh.gamecenter.fragment;
 
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import com.gh.base.fragment.LazyFragment;
 import com.gh.common.constant.Config;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.EntranceUtils;
+import com.gh.common.util.NightModeUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.game.GameFragment;
@@ -60,7 +61,11 @@ public class SearchToolWrapperFragment extends LazyFragment {
                 .replace(R.id.wrapper_main_content, Objects.requireNonNull(mContentFragment)).commitAllowingStateLoss();
 
         // 游戏库更新搜索栏底色
-        mCachedView.post(() -> mSearchToolbarFragment.updateSearchToolbarColor(Color.WHITE));
+        mCachedView.post(() -> {
+            mSearchToolbarFragment.updateStyle(NightModeUtils.INSTANCE.isNightMode(requireContext()));
+            mSearchToolbarFragment.updateSearchToolbarColor(ContextCompat.getColor(requireContext(), R.color.background_white));
+        });
+
     }
 
     @Override
@@ -90,6 +95,6 @@ public class SearchToolWrapperFragment extends LazyFragment {
     public void onFragmentResume() {
         super.onFragmentResume();
 
-        DisplayUtils.setLightStatusBar(requireActivity(), true);
+        DisplayUtils.setLightStatusBar(requireActivity(), !mNightMode);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
index e0c2eafc23..1aee5c8627 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
@@ -77,7 +77,7 @@ class GameFragment : LazyFragment() {
                     mBinding.root.setBackgroundColor(Color.TRANSPARENT)
                     mSkeleton.hide()
                 } else {
-                    mBinding.root.setBackgroundColor(Color.WHITE)
+                    mBinding.root.setBackgroundColor(R.color.background_white.toColor(requireContext()))
                     mSkeleton.show()
                     mViewModel.resetOffset()
                 }
diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt
index 80d41de861..3ade59542e 100644
--- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt
@@ -9,6 +9,7 @@ import com.gh.common.constant.Constants
 import com.gh.common.util.EntranceUtils
 import com.gh.common.util.dip2px
 import com.gh.common.util.observeNonNull
+import com.gh.common.util.toColor
 import com.gh.common.view.GridSpacingItemDecoration
 import com.gh.gamecenter.R
 import com.gh.gamecenter.baselist.LazyListFragment
@@ -38,7 +39,7 @@ class ColumnCollectionDetailFragment : LazyListFragment<LinkEntity, ColumnCollec
         mListViewModel.columnCollection.observeNonNull(this) {
             setNavigationTitle(it.name)
 
-            mCachedView?.setBackgroundColor(Color.WHITE)
+            mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
             // 非排行榜显示为 gridLayout，排行榜(多专题)直接覆盖此 recyclerView
             if (it.style != "top") {
                 val skeletonLayoutId =
diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt
index be452d4b4d..718f78cfbb 100644
--- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt
@@ -57,7 +57,7 @@ class CommonCollectionDetailFragment : LazyListFragment<LinkEntity, CommonCollec
     override fun initRealView() {
         super.initRealView()
         mCachedView.setPadding(16f.dip2px(), 0, 16f.dip2px(), 0)
-        mCachedView.setBackgroundColor(R.color.white.toColor())
+        mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mReuseNoData?.findViewById<TextView>(R.id.reuse_tv_none_data)?.text = "内容不见了"
         mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton)
             .shimmer(true)
@@ -121,7 +121,7 @@ class CommonCollectionDetailFragment : LazyListFragment<LinkEntity, CommonCollec
         return if (mCollectionStyle == "1-2") {
             GridSpacingItemDecoration(2, 8f.dip2px(), false, 16F.dip2px())
         } else {
-            VerticalItemDecoration(requireContext(), 16f, true, R.color.white)
+            VerticalItemDecoration(requireContext(), 16f, true, R.color.background_white)
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
index 5a061b7f69..37d3c0521f 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
@@ -136,7 +136,7 @@ class GameCollectionSquareFragment : LazyListFragment<GamesCollectionEntity, Gam
         return mViewModel
     }
 
-    override fun getItemDecoration() = VerticalItemDecoration(context, 16F, false, R.color.white)
+    override fun getItemDecoration() = VerticalItemDecoration(context, 16F, false, R.color.background_white)
 
     override fun provideListAdapter(): ListAdapter<*> {
         if (mAdapter == null) {
diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt
index adf83c2e16..51b6fb70c8 100644
--- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt
@@ -31,6 +31,7 @@ import com.gh.gamecenter.home.slide.HomeSlideListAdapter
 import com.gh.gamecenter.home.video.ScrollCalculatorHelper
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
+import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -317,8 +318,8 @@ class HomeFragment : LazyFragment() {
         }
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
+    override fun onNightModeChange() {
+        super.onNightModeChange()
         mBinding.gameList.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mBinding.gameList.recycledViewPool.clear()
         mListAdapter.notifyItemRangeChanged(0, mListAdapter.itemCount)
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt
index 4abd15e178..d99cb4e299 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt
@@ -55,7 +55,7 @@ class PersonalFunctionGroupAdapter(val context: Context) : BaseRecyclerAdapter<R
             layoutManager = GridLayoutManager(context, 4)
             isNestedScrollingEnabled = false
             if (itemDecorationCount == 0) {
-                addItemDecoration(GridSpacingItemColorDecoration(context, 0, 32, R.color.white))
+                addItemDecoration(GridSpacingItemColorDecoration(context, 0, 32, R.color.background_white))
             }
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt
index f06f99e25d..622514422c 100644
--- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt
@@ -110,7 +110,7 @@ class GameServersContentFragment : BaseFragment<Any?>() {
             mAdapter?.loadChange(it)
         })
 
-        mBinding?.root?.setBackgroundColor(Color.WHITE)
+        mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mSkeleton = Skeleton.bind(mBinding?.skeleton)
             .shimmer(true)
             .angle(Constants.SHIMMER_ANGLE)
@@ -332,7 +332,7 @@ class GameServersContentFragment : BaseFragment<Any?>() {
     private fun onRefreshPage() {
         mIsRefresh = true
         mAdapter?.resetStatus()
-        mBinding?.root?.setBackgroundColor(Color.WHITE)
+        mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mSkeleton?.show()
         mBinding?.loadingContainer?.reuseLlLoading?.visibility = View.VISIBLE
         mBinding?.noConnectionContainer?.reuseNoConnection?.visibility = View.GONE
diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt
index 882c09acd0..f3242b48b2 100644
--- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt
@@ -128,7 +128,7 @@ class GameServersTestFragment : LazyFragment() {
 
         mSubBinding = mBinding?.layoutFragmentContent
 
-        mSubBinding?.root?.setBackgroundColor(Color.WHITE)
+        mSubBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mSkeleton = Skeleton.bind(mSubBinding?.skeleton)
             .shimmer(true)
             .angle(Constants.SHIMMER_ANGLE)
@@ -412,7 +412,7 @@ class GameServersTestFragment : LazyFragment() {
         mSubBinding?.reuseNoneData?.visibility = View.GONE
         mSubBinding?.noConnectionContainer?.root?.visibility = View.VISIBLE
         mSubBinding?.noConnectionContainer?.root?.setOnClickListener {
-            mSubBinding?.root?.setBackgroundColor(Color.WHITE)
+            mSubBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
             mSkeleton?.show()
             resetFilter()
         }
@@ -425,7 +425,7 @@ class GameServersTestFragment : LazyFragment() {
         mSubBinding?.recyclerView?.visibility = View.GONE
         mSubBinding?.reuseNoneData?.visibility = View.VISIBLE
         mSubBinding?.reuseNoneData?.setOnClickListener {
-            mSubBinding?.root?.setBackgroundColor(Color.WHITE)
+            mSubBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
             mSkeleton?.show()
             resetFilter()
         }
diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt
index 1c03ffaa68..b25479bab5 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt
@@ -7,10 +7,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.ethanhua.skeleton.Skeleton
 import com.gh.common.constant.Constants
 import com.gh.common.exposure.ExposureListener
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.DisplayUtils
-import com.gh.common.util.EntranceUtils
-import com.gh.common.util.viewModelProviderFromParent
+import com.gh.common.util.*
 import com.gh.common.view.SpacingItemDecoration
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
@@ -92,7 +89,7 @@ class SubjectListFragment : LazyListFragment<GameEntity, SubjectListViewModel>()
         super.onFragmentFirstVisible()
         (mListViewModel as SubjectListViewModel).lastPageDataMap = arguments?.get(SubjectFragment.LAST_PAGE_DATA) as? HashMap<String, String>
 
-        mCachedView?.setBackgroundColor(Color.WHITE)
+        mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         val skeletonLayoutId = when (arguments?.getString(EntranceUtils.KEY_SUBJECT_TYPE) ?: "") {
             "detail" -> R.layout.fragment_subject_detail_skeleton
             "tab" -> R.layout.fragment_subject_tab_skeleton
diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt
index c271802f62..4305dec216 100644
--- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt
@@ -10,6 +10,7 @@ import com.gh.common.exposure.ExposureListener
 import com.gh.common.exposure.ExposureSource
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.observeNonNull
+import com.gh.common.util.toColor
 import com.gh.common.util.viewModelProvider
 import com.gh.common.view.ConfigFilterView
 import com.gh.common.xapk.XapkInstaller
@@ -60,7 +61,7 @@ class TagsListFragment : ListFragment<GameEntity, TagsListViewModel>() {
 
         setNavigationTitle("标签详情")
 
-        mCachedView?.setBackgroundColor(Color.WHITE)
+        mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton)
             .shimmer(true)
             .angle(Constants.SHIMMER_ANGLE)
@@ -160,7 +161,7 @@ class TagsListFragment : ListFragment<GameEntity, TagsListViewModel>() {
             mBaseHandler.postDelayed({ mListViewModel.load(LoadType.REFRESH) }, 200)
         }
 
-        mCachedView?.setBackgroundColor(Color.WHITE)
+        mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mSkeletonScreen?.show()
         mReuseNoConn?.visibility = View.GONE
         mReuseNoData?.visibility = View.GONE
diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_bar_back.webp b/app/src/main/res/drawable-night-xxxhdpi/ic_bar_back.webp
new file mode 100644
index 0000000000..b4877b7cfc
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/ic_bar_back.webp differ
diff --git a/app/src/main/res/drawable-night/bg_login_edit.xml b/app/src/main/res/drawable-night/bg_login_edit.xml
new file mode 100644
index 0000000000..90a7a1be91
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_login_edit.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/background" />
+
+    <corners android:radius="999dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/reuse_listview_item_style.xml b/app/src/main/res/drawable-night/reuse_listview_item_style.xml
deleted file mode 100644
index 98ea051055..0000000000
--- a/app/src/main/res/drawable-night/reuse_listview_item_style.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android = "http://schemas.android.com/apk/res/android" >
-
-    <item android:drawable = "@color/select" android:state_pressed = "true" />
-    <item android:drawable = "@color/select" android:state_focused = "true" />
-    <item android:drawable = "@color/transparent" android:state_focused = "false" />
-
-</selector >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white.xml b/app/src/main/res/drawable/background_shape_white.xml
index f1e295c631..2a32712f06 100644
--- a/app/src/main/res/drawable/background_shape_white.xml
+++ b/app/src/main/res/drawable/background_shape_white.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_12_top_only.xml b/app/src/main/res/drawable/background_shape_white_radius_12_top_only.xml
index 753d8fee8c..53abe4100b 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_12_top_only.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_12_top_only.xml
@@ -6,5 +6,5 @@
         android:bottomRightRadius="0dp"
         android:topLeftRadius="12dp"
         android:topRightRadius="12dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_16_top_only.xml b/app/src/main/res/drawable/background_shape_white_radius_16_top_only.xml
index 462d439f2f..6f62a94609 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_16_top_only.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_16_top_only.xml
@@ -6,5 +6,5 @@
         android:bottomRightRadius="0dp"
         android:topLeftRadius="16dp"
         android:topRightRadius="16dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_4.xml b/app/src/main/res/drawable/background_shape_white_radius_4.xml
index 02abad050c..fe1bc22a6d 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_4.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_4.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="4dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_5.xml b/app/src/main/res/drawable/background_shape_white_radius_5.xml
index db7a5dc71d..36f51ec035 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_5.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_5.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="5dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_5_bottm_only.xml b/app/src/main/res/drawable/background_shape_white_radius_5_bottm_only.xml
index 2eaac7e147..c5253e2d46 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_5_bottm_only.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_5_bottm_only.xml
@@ -6,5 +6,5 @@
         android:bottomRightRadius="5dp"
         android:topLeftRadius="0dp"
         android:topRightRadius="0dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_5_top_only.xml b/app/src/main/res/drawable/background_shape_white_radius_5_top_only.xml
index 796df21e7c..3604c9a3b8 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_5_top_only.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_5_top_only.xml
@@ -6,5 +6,5 @@
         android:bottomRightRadius="0dp"
         android:topLeftRadius="5dp"
         android:topRightRadius="5dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_6.xml b/app/src/main/res/drawable/background_shape_white_radius_6.xml
index 2cb991c5eb..28413c91b8 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_6.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_6.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="6dp"/>
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_8.xml b/app/src/main/res/drawable/background_shape_white_radius_8.xml
index 5dd381c08d..540e10500b 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_8.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_8.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="8dp"/>
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_8_bottom_only.xml b/app/src/main/res/drawable/background_shape_white_radius_8_bottom_only.xml
index 45df2ba3af..e37a5cd9b3 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_8_bottom_only.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_8_bottom_only.xml
@@ -6,5 +6,5 @@
         android:bottomRightRadius="8dp"
         android:topLeftRadius="0dp"
         android:topRightRadius="0dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_shape_white_radius_8_top_only.xml b/app/src/main/res/drawable/background_shape_white_radius_8_top_only.xml
index 73c266b5c2..c6ea22d0b1 100644
--- a/app/src/main/res/drawable/background_shape_white_radius_8_top_only.xml
+++ b/app/src/main/res/drawable/background_shape_white_radius_8_top_only.xml
@@ -6,5 +6,5 @@
         android:bottomRightRadius="0dp"
         android:topLeftRadius="8dp"
         android:topRightRadius="8dp" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_personal_card.xml b/app/src/main/res/drawable/bg_personal_card.xml
index 0c611efa66..ec4acfd538 100644
--- a/app/src/main/res/drawable/bg_personal_card.xml
+++ b/app/src/main/res/drawable/bg_personal_card.xml
@@ -47,7 +47,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="#FFFFFF" />
+            <solid android:color="@color/background_white" />
             <corners android:radius="10dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/community_edit_window_bg.xml b/app/src/main/res/drawable/community_edit_window_bg.xml
index 14634e361e..d46ff22e0c 100644
--- a/app/src/main/res/drawable/community_edit_window_bg.xml
+++ b/app/src/main/res/drawable/community_edit_window_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/background_white" />
 
     <corners
         android:topLeftRadius="10dp"
diff --git a/app/src/main/res/drawable/reuse_listview_item_style.xml b/app/src/main/res/drawable/reuse_listview_item_style.xml
index fda4d6f965..cf865e1c7d 100644
--- a/app/src/main/res/drawable/reuse_listview_item_style.xml
+++ b/app/src/main/res/drawable/reuse_listview_item_style.xml
@@ -3,6 +3,6 @@
 
     <item android:drawable = "@color/select" android:state_pressed = "true" />
     <item android:drawable = "@color/select" android:state_focused = "true" />
-    <item android:drawable = "@color/white" android:state_focused = "false" />
+    <item android:drawable = "@color/background_white" android:state_focused = "false" />
 
 </selector >
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_ask_search.xml b/app/src/main/res/layout/activity_ask_search.xml
index 881b1c2399..3770a436db 100644
--- a/app/src/main/res/layout/activity_ask_search.xml
+++ b/app/src/main/res/layout/activity_ask_search.xml
@@ -15,7 +15,7 @@
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
             android:layout_alignParentBottom = "true"
-            android:background = "@android:color/white"
+            android:background = "@color/white"
             android:visibility = "gone" >
 
             <TextView
diff --git a/app/src/main/res/layout/activity_asktab_order.xml b/app/src/main/res/layout/activity_asktab_order.xml
index 54610e203b..83892bef3f 100644
--- a/app/src/main/res/layout/activity_asktab_order.xml
+++ b/app/src/main/res/layout/activity_asktab_order.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "match_parent"
     android:layout_height = "match_parent"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical" >
 
     <TextView
diff --git a/app/src/main/res/layout/activity_libaodetail_skeleton.xml b/app/src/main/res/layout/activity_libaodetail_skeleton.xml
index 5cf6d18e19..dbf613440a 100644
--- a/app/src/main/res/layout/activity_libaodetail_skeleton.xml
+++ b/app/src/main/res/layout/activity_libaodetail_skeleton.xml
@@ -8,7 +8,7 @@
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
         android:layout_marginTop = "8dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:gravity = "center_vertical"
         android:orientation = "horizontal"
         android:padding = "20dp" >
@@ -68,7 +68,7 @@
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
         android:layout_marginTop = "8dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:orientation = "vertical"
         android:paddingLeft = "18dp"
         android:paddingTop = "12dp"
@@ -104,7 +104,7 @@
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
         android:layout_marginTop = "8dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:orientation = "vertical"
         android:paddingLeft = "18dp"
         android:paddingTop = "12dp"
@@ -154,7 +154,7 @@
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
         android:layout_marginTop = "8dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:orientation = "vertical"
         android:paddingLeft = "18dp"
         android:paddingTop = "12dp"
diff --git a/app/src/main/res/layout/activity_share_gh.xml b/app/src/main/res/layout/activity_share_gh.xml
index 19e3e9cd7a..dea079b26e 100644
--- a/app/src/main/res/layout/activity_share_gh.xml
+++ b/app/src/main/res/layout/activity_share_gh.xml
@@ -9,7 +9,7 @@
     <ScrollView
         android:layout_width = "match_parent"
         android:layout_height = "match_parent"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:scrollbars = "none" >
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_sharecard.xml b/app/src/main/res/layout/activity_sharecard.xml
index 992c37b257..c0cdbd456b 100644
--- a/app/src/main/res/layout/activity_sharecard.xml
+++ b/app/src/main/res/layout/activity_sharecard.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "match_parent"
     android:layout_height = "match_parent"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical" >
 
     <include layout = "@layout/reuse_toolbar" />
@@ -21,7 +21,7 @@
                 android:id = "@+id/sharecard_screenshot"
                 android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:orientation = "vertical" >
 
                 <RelativeLayout
@@ -122,7 +122,7 @@
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
             android:layout_alignParentBottom = "true"
-            android:background = "@android:color/white"
+            android:background = "@color/white"
             android:orientation = "vertical" />
 
     </RelativeLayout >
diff --git a/app/src/main/res/layout/activity_sharecard_pic.xml b/app/src/main/res/layout/activity_sharecard_pic.xml
index f26c9f9318..200320b12b 100644
--- a/app/src/main/res/layout/activity_sharecard_pic.xml
+++ b/app/src/main/res/layout/activity_sharecard_pic.xml
@@ -28,13 +28,13 @@
                     android:id = "@+id/sharecard_game_content_img"
                     android:layout_width = "match_parent"
                     android:layout_height = "wrap_content"
-                    android:background = "@android:color/white"
+                    android:background = "@color/white"
                     fresco:placeholderImage = "@drawable/occupy2" />
 
                 <LinearLayout
                     android:layout_width = "match_parent"
                     android:layout_height = "wrap_content"
-                    android:background = "@android:color/white"
+                    android:background = "@color/white"
                     android:orientation = "vertical"
                     android:padding = "20dp" >
 
diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml
index 013307107b..33a2280cd2 100644
--- a/app/src/main/res/layout/activity_suggest.xml
+++ b/app/src/main/res/layout/activity_suggest.xml
@@ -31,7 +31,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "50dp"
                 android:layout_centerInParent = "true"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:gravity = "center_vertical"
                 android:paddingRight = "20dp"
                 android:visibility = "visible" >
@@ -78,7 +78,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "50dp"
                 android:layout_marginTop = "1dp"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:gravity = "center_vertical"
                 android:visibility = "gone" >
 
@@ -115,7 +115,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:layout_marginTop = "8dp"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:orientation = "vertical"
                 android:paddingBottom = "15dp"
                 android:visibility = "visible" >
@@ -292,7 +292,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:layout_marginTop = "8dp"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:orientation = "vertical" >
 
                 <EditText
@@ -329,7 +329,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "40dp"
                 android:layout_marginTop = "8dp"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:gravity = "center_vertical"
                 android:visibility = "gone" >
 
@@ -364,7 +364,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "40dp"
                 android:layout_marginTop = "8dp"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:gravity = "center_vertical" >
 
                 <TextView
@@ -710,7 +710,7 @@
         android:id = "@+id/suggest_post_ll"
         android:layout_width = "match_parent"
         android:layout_height = "60dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:orientation = "horizontal"
         android:padding = "10dp" >
 
diff --git a/app/src/main/res/layout/activity_tablayout_viewpager.xml b/app/src/main/res/layout/activity_tablayout_viewpager.xml
index 6631e0a185..76ae7633ab 100644
--- a/app/src/main/res/layout/activity_tablayout_viewpager.xml
+++ b/app/src/main/res/layout/activity_tablayout_viewpager.xml
@@ -11,7 +11,7 @@
         android:id = "@+id/activity_tab_container"
         android:layout_width = "match_parent"
         android:layout_height = "@dimen/tab_layout_height"
-        android:background = "@android:color/white" >
+        android:background = "@color/white" >
 
         <com.gh.common.view.TabIndicatorView
             android:id = "@+id/activity_tab_indicator"
diff --git a/app/src/main/res/layout/ask_order_tab_item.xml b/app/src/main/res/layout/ask_order_tab_item.xml
index 6d3702feab..07f2997160 100644
--- a/app/src/main/res/layout/ask_order_tab_item.xml
+++ b/app/src/main/res/layout/ask_order_tab_item.xml
@@ -9,7 +9,7 @@
         android:id = "@+id/tab_item"
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:gravity = "center"
         android:paddingBottom = "15dp"
         android:paddingTop = "15dp" >
diff --git a/app/src/main/res/layout/ask_search_actionbar.xml b/app/src/main/res/layout/ask_search_actionbar.xml
index 6485fe01d5..752e853d7b 100644
--- a/app/src/main/res/layout/ask_search_actionbar.xml
+++ b/app/src/main/res/layout/ask_search_actionbar.xml
@@ -3,7 +3,7 @@
     android:id = "@+id/search_actionbar"
     android:layout_width = "match_parent"
     android:layout_height = "@dimen/appbar_height"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "horizontal" >
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/comment_head_item.xml b/app/src/main/res/layout/comment_head_item.xml
index cc145b7a0b..46e7339647 100644
--- a/app/src/main/res/layout/comment_head_item.xml
+++ b/app/src/main/res/layout/comment_head_item.xml
@@ -3,7 +3,7 @@
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
     android:layout_marginTop = "8dp"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical"
     android:paddingLeft = "16dp"
     android:paddingRight = "16dp" >
diff --git a/app/src/main/res/layout/common_hintdialog.xml b/app/src/main/res/layout/common_hintdialog.xml
index 00b7e53d79..934b37d86d 100644
--- a/app/src/main/res/layout/common_hintdialog.xml
+++ b/app/src/main/res/layout/common_hintdialog.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "wrap_content"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical" >
 
     <TextView
diff --git a/app/src/main/res/layout/dialog_alert.xml b/app/src/main/res/layout/dialog_alert.xml
index 6d5d7817b2..8151adcdea 100644
--- a/app/src/main/res/layout/dialog_alert.xml
+++ b/app/src/main/res/layout/dialog_alert.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical"
     android:paddingBottom = "15dp"
     android:paddingLeft = "25dp"
diff --git a/app/src/main/res/layout/dialog_font_size.xml b/app/src/main/res/layout/dialog_font_size.xml
index b3d6c8b731..2a1f053ede 100644
--- a/app/src/main/res/layout/dialog_font_size.xml
+++ b/app/src/main/res/layout/dialog_font_size.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "wrap_content"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical"
     android:paddingLeft="7dp">
 
diff --git a/app/src/main/res/layout/dialog_install_hint.xml b/app/src/main/res/layout/dialog_install_hint.xml
index 3e72cbea69..fbea8c4817 100644
--- a/app/src/main/res/layout/dialog_install_hint.xml
+++ b/app/src/main/res/layout/dialog_install_hint.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "wrap_content"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical" >
 
     <TextView
diff --git a/app/src/main/res/layout/dialog_modify_nickname.xml b/app/src/main/res/layout/dialog_modify_nickname.xml
index a2374021da..6cfabacbbd 100644
--- a/app/src/main/res/layout/dialog_modify_nickname.xml
+++ b/app/src/main/res/layout/dialog_modify_nickname.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "match_parent"
     android:layout_height = "match_parent"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical" >
 
     <TextView
diff --git a/app/src/main/res/layout/dialog_sign.xml b/app/src/main/res/layout/dialog_sign.xml
index 34d993c8da..fe11e1b4f3 100644
--- a/app/src/main/res/layout/dialog_sign.xml
+++ b/app/src/main/res/layout/dialog_sign.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "wrap_content"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical" >
 
     <ImageView
diff --git a/app/src/main/res/layout/dialog_strategy_select_game.xml b/app/src/main/res/layout/dialog_strategy_select_game.xml
index f0aeccd6af..5b8967f244 100644
--- a/app/src/main/res/layout/dialog_strategy_select_game.xml
+++ b/app/src/main/res/layout/dialog_strategy_select_game.xml
@@ -8,7 +8,7 @@
         android:id = "@+id/dialog_strategy_select_game_rl"
         android:layout_width = "match_parent"
         android:layout_height = "50dp"
-        android:background = "@android:color/white" >
+        android:background = "@color/white" >
 
         <TextView
             android:layout_width = "wrap_content"
@@ -42,6 +42,6 @@
         android:id = "@+id/dialog_strategy_select_game_rv"
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
-        android:background = "@android:color/white" />
+        android:background = "@color/white" />
 
 </LinearLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_suggest_game.xml b/app/src/main/res/layout/dialog_suggest_game.xml
index b6b63b2cd0..2aee601b52 100644
--- a/app/src/main/res/layout/dialog_suggest_game.xml
+++ b/app/src/main/res/layout/dialog_suggest_game.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "wrap_content"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:gravity = "center_horizontal"
     android:orientation = "vertical"
     android:paddingBottom = "20dp" >
diff --git a/app/src/main/res/layout/dialog_suggest_voting.xml b/app/src/main/res/layout/dialog_suggest_voting.xml
index 2a42951ee5..ada8df68af 100644
--- a/app/src/main/res/layout/dialog_suggest_voting.xml
+++ b/app/src/main/res/layout/dialog_suggest_voting.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "wrap_content"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:gravity = "center_horizontal"
     android:orientation = "vertical"
     android:paddingBottom = "20dp" >
diff --git a/app/src/main/res/layout/fragment_answer_comment_conversation.xml b/app/src/main/res/layout/fragment_answer_comment_conversation.xml
index eff7c36c66..e231f46493 100644
--- a/app/src/main/res/layout/fragment_answer_comment_conversation.xml
+++ b/app/src/main/res/layout/fragment_answer_comment_conversation.xml
@@ -19,7 +19,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "40dp"
                 android:layout_marginTop = "8dp"
-                android:background = "@android:color/white"
+                android:background = "@color/white"
                 android:drawableLeft = "@drawable/article_link"
                 android:drawablePadding = "12dp"
                 android:gravity = "center_vertical"
diff --git a/app/src/main/res/layout/fragment_apk_cleaner.xml b/app/src/main/res/layout/fragment_apk_cleaner.xml
index 05be5e1f08..e617dec53d 100644
--- a/app/src/main/res/layout/fragment_apk_cleaner.xml
+++ b/app/src/main/res/layout/fragment_apk_cleaner.xml
@@ -7,7 +7,7 @@
         android:id = "@+id/select_game_installed_ll"
         android:layout_width = "match_parent"
         android:layout_height = "40dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:paddingLeft = "20dp" >
 
         <ProgressBar
@@ -69,7 +69,7 @@
         <LinearLayout
             android:layout_width = "match_parent"
             android:layout_height = "60dp"
-            android:background = "@android:color/white"
+            android:background = "@color/white"
             android:orientation = "horizontal"
             android:padding = "10dp" >
 
diff --git a/app/src/main/res/layout/fragment_ask_questions.xml b/app/src/main/res/layout/fragment_ask_questions.xml
index ce876d5b37..3edecb260a 100644
--- a/app/src/main/res/layout/fragment_ask_questions.xml
+++ b/app/src/main/res/layout/fragment_ask_questions.xml
@@ -8,7 +8,7 @@
         android:id = "@+id/ask_appbar"
         android:layout_width = "match_parent"
         android:layout_height = "76dp"
-        android:background = "@android:color/white" >
+        android:background = "@color/white" >
 
         <com.gh.common.view.TabIndicatorView
             android:id = "@+id/ask_questions_tabindicator"
diff --git a/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml b/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml
index b5d3d91992..23bf8323e1 100644
--- a/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml
+++ b/app/src/main/res/layout/fragment_ask_recommends_wrapper.xml
@@ -23,7 +23,7 @@
             android:id = "@+id/recommend_subject_bar"
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
-            android:background = "@android:color/white"
+            android:background = "@color/white"
             android:gravity = "center"
             app:layout_behavior = "com.gh.common.view.FixAppBarLayoutBehavior" >
 
diff --git a/app/src/main/res/layout/fragment_ask_search_history.xml b/app/src/main/res/layout/fragment_ask_search_history.xml
index f3e8988cb6..f4a1ec1d2b 100644
--- a/app/src/main/res/layout/fragment_ask_search_history.xml
+++ b/app/src/main/res/layout/fragment_ask_search_history.xml
@@ -16,7 +16,7 @@
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
             android:layout_marginTop = "8dp"
-            android:background = "@android:color/white"
+            android:background = "@color/white"
             android:paddingLeft = "15dp"
             android:paddingTop = "12dp"
             android:paddingRight = "15dp"
@@ -30,7 +30,7 @@
             android:id = "@+id/search_hot_rv"
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
-            android:background = "@android:color/white"
+            android:background = "@color/white"
             android:paddingBottom = "8dp" />
 
     </LinearLayout >
@@ -40,7 +40,7 @@
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
         android:layout_marginTop = "8dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:orientation = "vertical" >
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_comment_detail.xml b/app/src/main/res/layout/fragment_comment_detail.xml
index 8fe19e7e81..db9965bea2 100644
--- a/app/src/main/res/layout/fragment_comment_detail.xml
+++ b/app/src/main/res/layout/fragment_comment_detail.xml
@@ -9,7 +9,7 @@
         android:layout_height = "40dp"
         android:layout_marginBottom = "7dp"
         android:layout_marginTop = "8dp"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:drawableLeft = "@drawable/article_link"
         android:drawablePadding = "12dp"
         android:gravity = "center_vertical"
@@ -64,7 +64,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "50dp"
                 android:layout_below = "@id/comment_line"
-                android:background = "@android:color/white" >
+                android:background = "@color/white" >
 
 
                 <EditText
diff --git a/app/src/main/res/layout/fragment_game.xml b/app/src/main/res/layout/fragment_game.xml
index dd2cd5e494..f87c6b5d19 100644
--- a/app/src/main/res/layout/fragment_game.xml
+++ b/app/src/main/res/layout/fragment_game.xml
@@ -14,7 +14,7 @@
             android:id="@+id/game_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:background="@color/background_white"
             android:clipToPadding="false" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_game_collection_square.xml b/app/src/main/res/layout/fragment_game_collection_square.xml
index 31db5c2f68..39ab322952 100644
--- a/app/src/main/res/layout/fragment_game_collection_square.xml
+++ b/app/src/main/res/layout/fragment_game_collection_square.xml
@@ -8,14 +8,14 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@color/background_white"
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:background="@color/background_white"
             android:fitsSystemWindows="true"
             app:elevation="0dp"
             app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior">
@@ -25,7 +25,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:fitsSystemWindows="true"
-                app:contentScrim="@color/white"
+                app:contentScrim="@color/background_white"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed"
                 app:scrimAnimationDuration="0">
 
diff --git a/app/src/main/res/layout/fragment_game_collection_square_al.xml b/app/src/main/res/layout/fragment_game_collection_square_al.xml
index abb01235d5..7d4fd07e8d 100644
--- a/app/src/main/res/layout/fragment_game_collection_square_al.xml
+++ b/app/src/main/res/layout/fragment_game_collection_square_al.xml
@@ -12,7 +12,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white">
+            android:background="@color/background_white">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list_rv"
diff --git a/app/src/main/res/layout/fragment_game_collection_square_al_skeleton.xml b/app/src/main/res/layout/fragment_game_collection_square_al_skeleton.xml
index 30c5598f0a..8c24c2a5e2 100644
--- a/app/src/main/res/layout/fragment_game_collection_square_al_skeleton.xml
+++ b/app/src/main/res/layout/fragment_game_collection_square_al_skeleton.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
     android:orientation="vertical"
     android:paddingStart="16dp"
     android:paddingEnd="16dp">
diff --git a/app/src/main/res/layout/fragment_game_servers.xml b/app/src/main/res/layout/fragment_game_servers.xml
index 4cb3903dac..8af8981e98 100644
--- a/app/src/main/res/layout/fragment_game_servers.xml
+++ b/app/src/main/res/layout/fragment_game_servers.xml
@@ -18,7 +18,7 @@
             android:id="@+id/server_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:background="@color/background_white"
             android:drawableRight="@drawable/server_popup_button_style"
             android:drawablePadding="8dp"
             android:includeFontPadding="false"
@@ -36,7 +36,7 @@
             android:id="@+id/background_block"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="@color/white"
+            android:background="@color/background_white"
             app:layout_constraintBottom_toBottomOf="@id/server_time"
             app:layout_constraintLeft_toRightOf="@id/server_time"
             app:layout_constraintRight_toLeftOf="@+id/server_status"
@@ -46,7 +46,7 @@
             android:id="@+id/server_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:background="@color/background_white"
             android:drawableRight="@drawable/server_popup_button_style"
             android:drawablePadding="8dp"
             android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/fragment_game_servers_publish.xml b/app/src/main/res/layout/fragment_game_servers_publish.xml
index b6f59f1007..e8b98652f9 100644
--- a/app/src/main/res/layout/fragment_game_servers_publish.xml
+++ b/app/src/main/res/layout/fragment_game_servers_publish.xml
@@ -13,7 +13,7 @@
             android:id="@+id/server_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:background="@color/background_white"
             android:drawableRight="@drawable/server_popup_button_style"
             android:drawablePadding="8dp"
             android:includeFontPadding="false"
@@ -31,7 +31,7 @@
             android:id="@+id/background_block"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="@color/white"
+            android:background="@color/background_white"
             app:layout_constraintBottom_toBottomOf="@id/server_time"
             app:layout_constraintLeft_toRightOf="@id/server_time"
             app:layout_constraintRight_toLeftOf="@+id/server_status"
@@ -41,7 +41,7 @@
             android:id="@+id/server_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:background="@color/background_white"
             android:drawableRight="@drawable/server_popup_button_style"
             android:drawablePadding="8dp"
             android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index c41f09308b..0e5caefd3a 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -32,7 +32,7 @@
                     android:id="@+id/contentContainer"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/white">
+                    android:background="@color/background_white">
 
                     <RelativeLayout
                         android:id="@+id/user_background_container"
@@ -694,7 +694,7 @@
                     android:id="@+id/tabContainer"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/white">
+                    android:background="@color/background_white">
 
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tabLayout"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index bffd705583..cb9e7bbf70 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:consumeWindowInsets="true"
-    android:background="@color/white">
+    android:background="@color/background_white">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/do_not_delete_this_empty_layout"
diff --git a/app/src/main/res/layout/fragment_subject_tab.xml b/app/src/main/res/layout/fragment_subject_tab.xml
index 9f095a5d09..0f3d37ad89 100644
--- a/app/src/main/res/layout/fragment_subject_tab.xml
+++ b/app/src/main/res/layout/fragment_subject_tab.xml
@@ -9,7 +9,7 @@
         android:id="@+id/subject_tab_container"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_layout_height"
-        android:background="@color/white"
+        android:background="@color/background_white"
         android:visibility="gone">
 
 <!--        <View-->
diff --git a/app/src/main/res/layout/fragment_web.xml b/app/src/main/res/layout/fragment_web.xml
index 89b3784fc4..e095c2a687 100644
--- a/app/src/main/res/layout/fragment_web.xml
+++ b/app/src/main/res/layout/fragment_web.xml
@@ -31,7 +31,7 @@
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
         android:layout_alignParentBottom = "true"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:gravity = "center"
         android:paddingBottom = "11dp"
         android:paddingTop = "11dp"
diff --git a/app/src/main/res/layout/fragment_wrapper_toolbar.xml b/app/src/main/res/layout/fragment_wrapper_toolbar.xml
index d0b6d4a61b..07270c7dc7 100644
--- a/app/src/main/res/layout/fragment_wrapper_toolbar.xml
+++ b/app/src/main/res/layout/fragment_wrapper_toolbar.xml
@@ -9,7 +9,7 @@
     <com.gh.common.view.StatusBarView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white" />
+        android:background="@color/background_white" />
 
     <FrameLayout
         android:id="@+id/wrapper_toolbar"
diff --git a/app/src/main/res/layout/game_collection_square_amway_item.xml b/app/src/main/res/layout/game_collection_square_amway_item.xml
index d762ad7f88..6b0fd02eca 100644
--- a/app/src/main/res/layout/game_collection_square_amway_item.xml
+++ b/app/src/main/res/layout/game_collection_square_amway_item.xml
@@ -11,7 +11,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="2dp"
-        app:cardBackgroundColor="@color/theme"
+        app:cardBackgroundColor="#2496FF"
         app:cardCornerRadius="8dp"
         app:cardElevation="0dp">
 
diff --git a/app/src/main/res/layout/gamedetail_item_news.xml b/app/src/main/res/layout/gamedetail_item_news.xml
index 900c663afc..ae06c55b51 100644
--- a/app/src/main/res/layout/gamedetail_item_news.xml
+++ b/app/src/main/res/layout/gamedetail_item_news.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical"
     android:paddingBottom = "3dp"
     android:paddingTop = "12dp" >
diff --git a/app/src/main/res/layout/item_test_server_text.xml b/app/src/main/res/layout/item_test_server_text.xml
index 23119b72df..d69c05d8c2 100644
--- a/app/src/main/res/layout/item_test_server_text.xml
+++ b/app/src/main/res/layout/item_test_server_text.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white">
+    android:background="@color/background_white">
 
     <TextView
         android:id="@+id/contentTv"
diff --git a/app/src/main/res/layout/kaifu_add_item_title.xml b/app/src/main/res/layout/kaifu_add_item_title.xml
index 174cfc75a4..faa99f693d 100644
--- a/app/src/main/res/layout/kaifu_add_item_title.xml
+++ b/app/src/main/res/layout/kaifu_add_item_title.xml
@@ -13,7 +13,7 @@
         android:layout_height = "30dp"
         android:layout_marginRight = "1dp"
         android:layout_weight = "15"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:gravity = "center"
         android:maxLines = "2"
         android:text = "时间"
@@ -25,7 +25,7 @@
         android:layout_height = "match_parent"
         android:layout_marginRight = "1dp"
         android:layout_weight = "29"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:gravity = "center"
         android:maxLines = "2"
         android:text = "名字"
@@ -36,7 +36,7 @@
         android:layout_width = "0dp"
         android:layout_height = "match_parent"
         android:layout_weight = "15"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:gravity = "center"
         android:maxLines = "2"
         android:text = "备注"
diff --git a/app/src/main/res/layout/kaifu_item_time.xml b/app/src/main/res/layout/kaifu_item_time.xml
index 1a4f75c88c..0c68243930 100644
--- a/app/src/main/res/layout/kaifu_item_time.xml
+++ b/app/src/main/res/layout/kaifu_item_time.xml
@@ -3,7 +3,7 @@
     android:id="@+id/kaifu_item_time"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="@color/background_white"
     android:orientation="vertical">
 
     <View
diff --git a/app/src/main/res/layout/layout_filter.xml b/app/src/main/res/layout/layout_filter.xml
index dc6df5f47f..973239d205 100644
--- a/app/src/main/res/layout/layout_filter.xml
+++ b/app/src/main/res/layout/layout_filter.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:background="@color/white">
+    android:background="@color/background_white">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/filterRecyclerView"
diff --git a/app/src/main/res/layout/news_detail_comment.xml b/app/src/main/res/layout/news_detail_comment.xml
index 1ed451bca0..b69afe2eaf 100644
--- a/app/src/main/res/layout/news_detail_comment.xml
+++ b/app/src/main/res/layout/news_detail_comment.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical"
     android:paddingBottom = "3dp" >
 
diff --git a/app/src/main/res/layout/newsdetail_item_content.xml b/app/src/main/res/layout/newsdetail_item_content.xml
index 001ea52b74..444bdb96de 100644
--- a/app/src/main/res/layout/newsdetail_item_content.xml
+++ b/app/src/main/res/layout/newsdetail_item_content.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:orientation = "vertical" >
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/newsdetail_item_game.xml b/app/src/main/res/layout/newsdetail_item_game.xml
index 219427c463..841bf82b5a 100644
--- a/app/src/main/res/layout/newsdetail_item_game.xml
+++ b/app/src/main/res/layout/newsdetail_item_game.xml
@@ -4,7 +4,7 @@
     xmlns:tools = "http://schemas.android.com/tools"
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
-    android:background = "@android:color/white"
+    android:background = "@color/white"
     android:gravity = "center_vertical"
     android:orientation = "horizontal"
     android:paddingLeft = "18dp"
diff --git a/app/src/main/res/layout/piece_setting_divider.xml b/app/src/main/res/layout/piece_setting_divider.xml
index 71821fda4d..b519aeff22 100644
--- a/app/src/main/res/layout/piece_setting_divider.xml
+++ b/app/src/main/res/layout/piece_setting_divider.xml
@@ -5,7 +5,7 @@
     android:layout_height="1px"
     android:paddingLeft="20dp"
     android:paddingRight="20dp"
-    android:background="@color/white">
+    android:background="@color/background_white">
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/share_popup_layout.xml b/app/src/main/res/layout/share_popup_layout.xml
index 1e8df2cd0e..4b60ed7e99 100644
--- a/app/src/main/res/layout/share_popup_layout.xml
+++ b/app/src/main/res/layout/share_popup_layout.xml
@@ -12,6 +12,6 @@
         android:layout_alignParentBottom = "true"
         android:layout_alignParentLeft = "true"
         android:layout_alignParentStart = "true"
-        android:background = "@android:color/white" />
+        android:background = "@color/white" />
 
 </RelativeLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/vote_item.xml b/app/src/main/res/layout/vote_item.xml
index 414fe88e96..697113b16a 100644
--- a/app/src/main/res/layout/vote_item.xml
+++ b/app/src/main/res/layout/vote_item.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
-        android:background = "@android:color/white"
+        android:background = "@color/white"
         android:orientation = "vertical"
         android:paddingBottom = "15dp"
         android:paddingLeft = "30dp"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 853c310b84..bed5515ee5 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,17 +2,17 @@
 <resources>
 
     <!-- 主题颜色 -->
-    <color name="theme">#2496FF</color>
-    <color name="theme_alpha_20">#332496FF</color>
+    <color name="theme">#2888E0</color>
+    <color name="theme_alpha_20">#332888E0</color>
     <!-- 辅助-黄 -->
-    <color name="theme_yellow">#FFA142</color>
+    <color name="theme_yellow">#EB9238</color>
     <!-- 辅助-红 -->
-    <color name="theme_red">#FF4147</color>
+    <color name="theme_red">#E0393E</color>
     <!-- 辅助-绿 -->
-    <color name="theme_green">#06CEA8</color>
+    <color name="theme_green">#07A385</color>
 
     <!-- 主题颜色（字体和描边） -->
-    <color name="theme_font">#1383EB</color>
+    <color name="theme_font">#2888E0</color>
     <color name="theme_font_alpha_60">#991383EB</color>
 
     <!--以下颜色分别为
@@ -21,17 +21,17 @@
     文本三级
     暗文文本
     -->
-    <color name="text_title">#CCCCCC</color>
-    <color name="text_subtitle">#999999</color>
-    <color name="text_subtitleDesc">#666666</color>
-    <color name="text_body">#333333</color>
+    <color name="text_title">#E0FFFFFF</color>
+    <color name="text_subtitle">#A3FFFFFF</color>
+    <color name="text_subtitleDesc">#7AFFFFFF</color>
+    <color name="text_body">#3DFFFFFF</color>
     <color name="text_white">#FFFFFF</color>
 
     <!-- 通用背景 -->
-    <color name="background">#2B2B2B</color>
+    <color name="background">#121212</color>
     <color name="background_white">#000000</color>
     <!-- 分隔线 -->
-    <color name="divider">#111111</color>
+    <color name="divider">#333333</color>
     <!-- 资源边框 -->
     <color name="border">#1A000000</color>
     <!-- 背景遮罩深色 -->
@@ -42,24 +42,24 @@
     <!-- 系统沉浸色 -->
     <color name="system_bar">@color/white</color>
     <!-- 标题颜色 -->
-    <color name="title">@color/text_5d5d5d</color>
+    <color name="title">@color/text_title</color>
     <!-- 内容颜色 -->
-    <color name="content">@color/text_9a9a9a</color>
+    <color name="content">@color/text_subtitleDesc</color>
     <!-- 提示颜色 -->
     <color name="hint">#B3B3B3</color>
     <!--<color name="background">#ECF4F4</color>-->
     <!-- 分割线颜色 -->
-    <color name="cutting_line">#121212</color>
+    <color name="cutting_line">@color/divider</color>
     <!-- item点击颜色 -->
     <!--<color name="select">#E7E7E7</color>-->
-    <color name="select">#0DFFFFFF</color>
+    <color name="select">#0D000000</color>
 
-    <color name="skeleton_child_view">#E1E1E1</color>
+    <color name="skeleton_child_view">#14FFFFFF</color>
 
     <color name="unread">#d1e5f7</color>
 
     <!-- 骨架图动画颜色 -->
-    <color name="skeleton_shimmer_color">@color/background</color>
+    <color name="skeleton_shimmer_color">#08FFFFFF</color>
 
     <!-- 按钮颜色 -->
     <color name="btn_download">@color/theme</color>
@@ -112,7 +112,7 @@
     <!--游戏详情福利相关颜色-->
     <color name="fuli_detail">#FFB048</color>
     <!--默认搜索栏背景颜色-->
-    <color name="search_bar_default">#1E1E1E</color>
+    <color name="search_bar_default">#F7F7F7</color>
     <!--默认搜索栏背景颜色-->
     <color name="search_bar_light">@color/white_alpha_20</color>
     <!--搜索栏文字颜色-->
@@ -123,7 +123,7 @@
     <!-- 消息反馈背景 -->
     <color name="message_suggestion">#ecfaff</color>
 
-    <color name="black">#000000</color>
+    <color name="black">@android:color/black</color>
     <color name="black_alpha_3">#08000000</color>
     <color name="black_alpha_5">#0D000000</color>
     <color name="black_alpha_10">#1A000000</color>
@@ -196,8 +196,8 @@
     <color name="bg_F2F7FC">#F2F7FC</color>
     <color name="bg_EBFAF7">#EBFAF7</color>
     <color name="text_b2b2b2">#b2b2b2</color>
-    <color name="text_9a9a9a">#9a9a9a</color>
-    <color name="text_3a3a3a">#3a3a3a</color>
+    <color name="text_9a9a9a">@color/text_subtitleDesc</color>
+    <color name="text_3a3a3a">@color/text_title</color>
     <color name="text_3A3A3A">#3A3A3A</color>
     <color name="text_5d5d5d">#5d5d5d</color>
     <color name="text_5D5D5D">#5D5D5D</color>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 79d8b9456f..c1137f56bf 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -105,7 +105,7 @@
         <item name="android:layout_height">@dimen/appbar_height</item>
         <item name="android:layout_width">match_parent</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="android:background">@android:color/white</item>
+        <item name="android:background">@color/background_white</item>
         <item name="android:theme">@style/Base_ToolbarTheme</item>
         <item name="titleTextAppearance">@style/CustomTitleTextAppearance</item>
         <item name="subtitleTextAppearance">@style/CustomSubTitleTextAppearance</item>
@@ -128,7 +128,7 @@
     <style name="CustomTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <!--<item name="android:fontFamily">@string/ff_roboto_condensed</item>-->
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/text_title</item>
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -375,7 +375,7 @@
     <style name="toolbar_title">
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">@color/black</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:textSize">@dimen/secondary_title_text_size</item>
         <item name="android:textStyle">bold</item>
         <item name="android:ellipsize">end</item>