diff --git a/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt
index f57542d266..68a3508d0a 100644
--- a/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt
@@ -13,11 +13,13 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentTransaction
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.R
+import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.databinding.DialogPrivacyProtocolNewBinding
 import com.gh.gamecenter.entity.DialogEntity
+import splitties.bundle.put
 
 class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
 
@@ -159,7 +161,7 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
                 }
             }
             privacyDialogFragment.arguments = Bundle().apply {
-                putParcelable(KEY_DATA, privacyPolicyEntity)
+                put(KEY_DATA, privacyPolicyEntity)
             }
             privacyDialogFragment.show(
                 activity.supportFragmentManager,
diff --git a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
index e98b9c93d0..be943a085f 100644
--- a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
+++ b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt
@@ -23,6 +23,7 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.DialogPrivacyProtocolBinding
 import com.gh.gamecenter.entity.DialogEntity
 import com.lightgame.utils.AppManager
+import splitties.bundle.put
 
 class PrivacyPolicyDialogFragment : BaseDialogFragment() {
 
@@ -183,7 +184,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
                 }
             }
             privacyDialogFragment.arguments = Bundle().apply {
-                putParcelable(KEY_DATA, privacyPolicyEntity)
+                put(KEY_DATA, privacyPolicyEntity)
             }
             privacyDialogFragment.show(
                 activity.supportFragmentManager,
diff --git a/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt b/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt
index 5349dde226..6eb6782b61 100644
--- a/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt
@@ -33,6 +33,7 @@ import com.gh.gamecenter.entity.VersionVoteEntity
 import com.gh.gamecenter.game.upload.GameUploadFragment
 import com.gh.gamecenter.suggest.SuggestSelectGameAdapter
 import com.lightgame.utils.Utils
+import splitties.collections.forEachWithIndex
 
 class VoteAdapter(
     context: Context,
@@ -238,7 +239,7 @@ class VoteAdapter(
     }
 
     fun updateHighLightView(versionVoteEntity: VersionVoteEntity, position: Int) {
-        mEntityList.forEachIndexed { index, entity ->
+        mEntityList.forEachWithIndex { index, entity ->
             if (entity.isHighLight) {
                 entity.isHighLight = false
                 notifyItemChanged(index)
diff --git a/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt b/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt
index 69ffe91c14..478c010041 100644
--- a/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt
+++ b/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt
@@ -41,6 +41,8 @@ import com.lightgame.download.DownloadConfig
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus.*
 import com.lightgame.utils.AppManager
+import splitties.bundle.put
+
 class VSpaceDialogFragment : BaseDraggableDialogFragment() {
 
     private var mAppEntity: AppEntity? = null
@@ -243,9 +245,9 @@ class VSpaceDialogFragment : BaseDraggableDialogFragment() {
 
             val downloadDialog = VSpaceDialogFragment().apply {
                 arguments = Bundle().apply {
-                    putParcelable(KEY_ENTITY, appEntity)
-                    putBoolean(KEY_AUTO_DOWNLOAD, autoDownload)
-                    putBoolean(KEY_IS_UPDATE, isUpdate)
+                    put(KEY_ENTITY, appEntity)
+                    put(KEY_AUTO_DOWNLOAD, autoDownload)
+                    put(KEY_IS_UPDATE, isUpdate)
                 }
             }
             downloadDialog.show(
diff --git a/module_common/build.gradle b/module_common/build.gradle
index a7336abee4..281a5a7bb1 100644
--- a/module_common/build.gradle
+++ b/module_common/build.gradle
@@ -66,8 +66,7 @@ dependencies {
 
     api "androidx.constraintlayout:constraintlayout:${constraintLayout}"
     kapt "com.alibaba:arouter-compiler:$arouterVersion"
-    api "com.louiscad.splitties:splitties-views-dsl:${splitties}"
-    api "com.louiscad.splitties:splitties-views-dsl-constraintlayout:${splitties}"
+    api "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl:${splitties}"
     api "com.github.nichbar:AndroidRomChecker:${romChecker}"
     api "androidx.cardview:cardview:${cardView}"
     api "com.google.android.material:material:${material}"
diff --git a/module_common/src/main/res/values-night/themes.xml b/module_common/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000000..757059b8ed
--- /dev/null
+++ b/module_common/src/main/res/values-night/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Assistantandroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/module_common/src/main/res/values/themes.xml b/module_common/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..a3032f82eb
--- /dev/null
+++ b/module_common/src/main/res/values/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Assistantandroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/module_core/src/main/res/values/themes.xml b/module_core/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..a3032f82eb
--- /dev/null
+++ b/module_core/src/main/res/values/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Assistantandroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file