diff --git a/app/src/leanback/res/layout/activity_keep.xml b/app/src/leanback/res/layout/activity_keep.xml
index a19cf2496..401f8b8c5 100644
--- a/app/src/leanback/res/layout/activity_keep.xml
+++ b/app/src/leanback/res/layout/activity_keep.xml
@@ -10,6 +10,7 @@
         android:layout_height="match_parent"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:overScrollMode="never"
         android:padding="24dp" />
 
 </com.fongmi.android.tv.ui.custom.ProgressLayout>
diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml
index 548a7b634..b6d409b3a 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -57,6 +57,8 @@
             android:id="@+id/keyboard"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:layout_marginTop="16dp"
             android:overScrollMode="never"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
diff --git a/app/src/leanback/res/layout/dialog_buffer.xml b/app/src/leanback/res/layout/dialog_buffer.xml
index c256c5b83..f8a36338e 100644
--- a/app/src/leanback/res/layout/dialog_buffer.xml
+++ b/app/src/leanback/res/layout/dialog_buffer.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="48dp">
+    android:paddingHorizontal="48dp">
 
     <com.google.android.material.slider.Slider
         android:id="@+id/slider"
diff --git a/app/src/leanback/res/layout/dialog_danmaku.xml b/app/src/leanback/res/layout/dialog_danmaku.xml
index b876d172f..63bf8cd00 100644
--- a/app/src/leanback/res/layout/dialog_danmaku.xml
+++ b/app/src/leanback/res/layout/dialog_danmaku.xml
@@ -9,9 +9,11 @@
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingHorizontal="24dp"
+        android:paddingTop="24dp"
+        android:paddingBottom="16dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
@@ -57,6 +59,7 @@
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:overScrollMode="never"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:paddingBottom="24dp"
diff --git a/app/src/leanback/res/layout/dialog_danmaku_search.xml b/app/src/leanback/res/layout/dialog_danmaku_search.xml
index 75c2dbe59..66da9ba7d 100644
--- a/app/src/leanback/res/layout/dialog_danmaku_search.xml
+++ b/app/src/leanback/res/layout/dialog_danmaku_search.xml
@@ -9,9 +9,10 @@
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingHorizontal="24dp"
+        android:paddingVertical="24dp">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/keyword"
@@ -22,8 +23,8 @@
             android:imeOptions="actionSearch"
             android:inputType="textCapWords|textAutoCorrect|textAutoComplete"
             android:maxLength="255"
-            android:singleLine="true"
             android:nextFocusDown="@id/recycler"
+            android:singleLine="true"
             android:textSize="14sp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -47,6 +48,7 @@
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:overScrollMode="never"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:paddingBottom="24dp"
diff --git a/app/src/leanback/res/layout/dialog_doh.xml b/app/src/leanback/res/layout/dialog_doh.xml
index d363a40c9..58ab6091c 100644
--- a/app/src/leanback/res/layout/dialog_doh.xml
+++ b/app/src/leanback/res/layout/dialog_doh.xml
@@ -5,6 +5,9 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:overScrollMode="never"
     android:padding="24dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="296dp"
diff --git a/app/src/leanback/res/layout/dialog_history.xml b/app/src/leanback/res/layout/dialog_history.xml
index e5779d355..bf6f09728 100644
--- a/app/src/leanback/res/layout/dialog_history.xml
+++ b/app/src/leanback/res/layout/dialog_history.xml
@@ -4,6 +4,9 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:overScrollMode="never"
     android:padding="24dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="352dp" />
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/dialog_live.xml b/app/src/leanback/res/layout/dialog_live.xml
index 7e1ba944a..611ab5d52 100644
--- a/app/src/leanback/res/layout/dialog_live.xml
+++ b/app/src/leanback/res/layout/dialog_live.xml
@@ -5,6 +5,9 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:overScrollMode="never"
     android:padding="24dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="296dp"
diff --git a/app/src/leanback/res/layout/dialog_restore.xml b/app/src/leanback/res/layout/dialog_restore.xml
index e5779d355..bf6f09728 100644
--- a/app/src/leanback/res/layout/dialog_restore.xml
+++ b/app/src/leanback/res/layout/dialog_restore.xml
@@ -4,6 +4,9 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:overScrollMode="never"
     android:padding="24dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="352dp" />
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/dialog_site.xml b/app/src/leanback/res/layout/dialog_site.xml
index 34f4e034b..5018745e1 100644
--- a/app/src/leanback/res/layout/dialog_site.xml
+++ b/app/src/leanback/res/layout/dialog_site.xml
@@ -12,6 +12,9 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:overScrollMode="never"
         app:maxHeight="264dp"
         tools:itemCount="5"
         tools:listitem="@layout/adapter_site" />
diff --git a/app/src/leanback/res/layout/dialog_speed.xml b/app/src/leanback/res/layout/dialog_speed.xml
index 07cdf6333..ffce5cd39 100644
--- a/app/src/leanback/res/layout/dialog_speed.xml
+++ b/app/src/leanback/res/layout/dialog_speed.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="48dp">
+    android:paddingHorizontal="48dp">
 
     <com.google.android.material.slider.Slider
         android:id="@+id/slider"
diff --git a/app/src/leanback/res/layout/dialog_title.xml b/app/src/leanback/res/layout/dialog_title.xml
index 9ca8b7b51..30233cb86 100644
--- a/app/src/leanback/res/layout/dialog_title.xml
+++ b/app/src/leanback/res/layout/dialog_title.xml
@@ -9,9 +9,11 @@
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingHorizontal="24dp"
+        android:paddingTop="24dp"
+        android:paddingBottom="16dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
@@ -30,6 +32,7 @@
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:overScrollMode="never"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:paddingBottom="24dp"
diff --git a/app/src/leanback/res/layout/dialog_track.xml b/app/src/leanback/res/layout/dialog_track.xml
index 2f725c255..5ee5a132b 100644
--- a/app/src/leanback/res/layout/dialog_track.xml
+++ b/app/src/leanback/res/layout/dialog_track.xml
@@ -9,9 +9,11 @@
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingHorizontal="24dp"
+        android:paddingTop="24dp"
+        android:paddingBottom="16dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
@@ -51,6 +53,7 @@
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:overScrollMode="never"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:paddingBottom="24dp"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b4cee1dc8..5e9b577bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,10 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:allowBackup">
 
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="2.5" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
index 7dcca1368..953c4a7b7 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
@@ -37,8 +37,8 @@ import com.fongmi.android.tv.server.Server;
 import com.fongmi.android.tv.service.PlaybackService;
 import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.ui.custom.FragmentStateManager;
-import com.fongmi.android.tv.ui.fragment.SettingFragment;
 import com.fongmi.android.tv.ui.fragment.SettingDanmakuFragment;
+import com.fongmi.android.tv.ui.fragment.SettingFragment;
 import com.fongmi.android.tv.ui.fragment.SettingPlayerFragment;
 import com.fongmi.android.tv.ui.fragment.VodFragment;
 import com.fongmi.android.tv.utils.FileChooser;
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index f2d87a220..fd16ab137 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -40,8 +40,8 @@ import com.bumptech.glide.request.transition.Transition;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Constant;
 import com.fongmi.android.tv.R;
-import com.fongmi.android.tv.api.SiteApi;
 import com.fongmi.android.tv.api.DanmakuApi;
+import com.fongmi.android.tv.api.SiteApi;
 import com.fongmi.android.tv.api.config.VodConfig;
 import com.fongmi.android.tv.bean.CastVideo;
 import com.fongmi.android.tv.bean.Danmaku;
@@ -289,7 +289,6 @@ public class VideoActivity extends PlaybackActivity implements Clock.Callback, C
     protected void initView(Bundle savedInstanceState) {
         super.initView(savedInstanceState);
         ViewCompat.setOnApplyWindowInsetsListener(mBinding.getRoot(), (v, insets) -> setStatusBar(insets));
-        mBinding.swipeLayout.setColorSchemeResources(R.color.accent);
         mKeyDown = CustomKeyDown.create(this, mBinding.exo);
         mFrameParams = mBinding.video.getLayoutParams();
         mBinding.progressLayout.showProgress();
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
index 0d01ef82c..e75d0e021 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
@@ -13,7 +13,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.viewbinding.ViewBinding;
 
 import com.fongmi.android.tv.Product;
-import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.api.config.VodConfig;
 import com.fongmi.android.tv.bean.Result;
 import com.fongmi.android.tv.bean.Site;
@@ -96,7 +95,6 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
 
     @Override
     protected void initView() {
-        mBinding.swipeLayout.setColorSchemeResources(R.color.accent);
         mBinding.progressLayout.showProgress();
         mScroller = new CustomScroller(this);
         mExtends = getExtend();
diff --git a/app/src/mobile/res/color/control.xml b/app/src/mobile/res/color/control.xml
index c3f80226b..0fa454469 100644
--- a/app/src/mobile/res/color/control.xml
+++ b/app/src/mobile/res/color/control.xml
@@ -2,5 +2,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?attr/colorControlActivated" android:state_activated="true" />
     <item android:color="?attr/colorControlNormal" android:state_enabled="false" />
-    <item android:color="?android:attr/textColorPrimary" />
+    <item android:color="?attr/colorOnSurface" />
 </selector>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_config.xml b/app/src/mobile/res/layout/adapter_config.xml
index e0a9e0c17..1846ea706 100644
--- a/app/src/mobile/res/layout/adapter_config.xml
+++ b/app/src/mobile/res/layout/adapter_config.xml
@@ -14,7 +14,7 @@
         android:layout_weight="1"
         android:ellipsize="middle"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="14sp"
         tools:text="https://fongmi.github.io/cat.json" />
 
diff --git a/app/src/mobile/res/layout/adapter_device.xml b/app/src/mobile/res/layout/adapter_device.xml
index 245296e29..5bf57ee1f 100644
--- a/app/src/mobile/res/layout/adapter_device.xml
+++ b/app/src/mobile/res/layout/adapter_device.xml
@@ -25,7 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp"
             tools:text="Google Chrome Cast" />
 
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="12sp"
             tools:text="127.0.0.1" />
 
diff --git a/app/src/mobile/res/layout/adapter_restore.xml b/app/src/mobile/res/layout/adapter_restore.xml
index 1a121730a..199936b9f 100644
--- a/app/src/mobile/res/layout/adapter_restore.xml
+++ b/app/src/mobile/res/layout/adapter_restore.xml
@@ -18,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -26,7 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="12sp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml
index e411a3fe6..955bf14e4 100644
--- a/app/src/mobile/res/layout/dialog_control.xml
+++ b/app/src/mobile/res/layout/dialog_control.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/control_speed"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp" />
 
     <com.google.android.material.slider.Slider
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:text="@string/parse"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp"
         android:visibility="gone"
         tools:visibility="visible" />
@@ -56,7 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:text="@string/control_scale"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp" />
 
     <HorizontalScrollView
@@ -133,7 +133,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="8dp"
         android:text="@string/play"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp" />
 
     <HorizontalScrollView
@@ -208,7 +208,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="8dp"
         android:text="@string/control_track"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp"
         android:visibility="gone"
         tools:visibility="visible" />
@@ -265,7 +265,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="8dp"
         android:text="@string/control_other"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/mobile/res/layout/dialog_danmaku.xml b/app/src/mobile/res/layout/dialog_danmaku.xml
index bcc617a82..10e70397e 100644
--- a/app/src/mobile/res/layout/dialog_danmaku.xml
+++ b/app/src/mobile/res/layout/dialog_danmaku.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/danmaku_select"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp" />
 
         <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/mobile/res/layout/dialog_device.xml b/app/src/mobile/res/layout/dialog_device.xml
index 3bfba6d24..a5df3932c 100644
--- a/app/src/mobile/res/layout/dialog_device.xml
+++ b/app/src/mobile/res/layout/dialog_device.xml
@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/device_select"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp" />
 
         <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/mobile/res/layout/dialog_episode_grid.xml b/app/src/mobile/res/layout/dialog_episode_grid.xml
index a30766504..2a247b4cd 100644
--- a/app/src/mobile/res/layout/dialog_episode_grid.xml
+++ b/app/src/mobile/res/layout/dialog_episode_grid.xml
@@ -12,7 +12,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:text="@string/detail_episode"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp" />
 
     <com.google.android.material.tabs.TabLayout
diff --git a/app/src/mobile/res/layout/dialog_info.xml b/app/src/mobile/res/layout/dialog_info.xml
index 870cd2393..bda372b26 100644
--- a/app/src/mobile/res/layout/dialog_info.xml
+++ b/app/src/mobile/res/layout/dialog_info.xml
@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:linksClickable="false"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="20sp" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -24,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -34,7 +34,7 @@
             android:layout_marginTop="8dp"
             android:autoLink="all"
             android:linksClickable="false"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/mobile/res/layout/dialog_receive.xml b/app/src/mobile/res/layout/dialog_receive.xml
index 17c8d7aad..495093b9a 100644
--- a/app/src/mobile/res/layout/dialog_receive.xml
+++ b/app/src/mobile/res/layout/dialog_receive.xml
@@ -47,7 +47,7 @@
         android:layout_toEndOf="@+id/frame"
         android:ellipsize="end"
         android:maxLines="3"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp"
         tools:text="狂飆" />
 
@@ -59,7 +59,7 @@
         android:layout_alignStart="@+id/name"
         android:layout_marginTop="2dp"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:textSize="14sp"
         tools:text="Xiaomi 13" />
 
diff --git a/app/src/mobile/res/layout/dialog_restore.xml b/app/src/mobile/res/layout/dialog_restore.xml
index 901e9a368..181a6305a 100644
--- a/app/src/mobile/res/layout/dialog_restore.xml
+++ b/app/src/mobile/res/layout/dialog_restore.xml
@@ -17,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/restore_select"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/mobile/res/layout/dialog_timer.xml b/app/src/mobile/res/layout/dialog_timer.xml
index b4c2b15f3..d13c8702b 100644
--- a/app/src/mobile/res/layout/dialog_timer.xml
+++ b/app/src/mobile/res/layout/dialog_timer.xml
@@ -11,7 +11,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:text="@string/play_timer"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
@@ -35,7 +35,7 @@
             android:background="@drawable/shape_accent"
             android:tag="5"
             android:text="@string/timer_5"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -47,7 +47,7 @@
             android:background="@drawable/shape_accent"
             android:tag="15"
             android:text="@string/timer_15"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -59,7 +59,7 @@
             android:background="@drawable/shape_accent"
             android:tag="30"
             android:text="@string/timer_30"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -71,7 +71,7 @@
             android:background="@drawable/shape_accent"
             android:tag="60"
             android:text="@string/timer_60"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -91,7 +91,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginBottom="24dp"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="48sp"
             tools:text="5:00" />
 
@@ -113,7 +113,7 @@
             android:layout_marginBottom="16dp"
             android:singleLine="true"
             android:text="@string/timer_cancel"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="?attr/colorOnSurface" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_title.xml b/app/src/mobile/res/layout/dialog_title.xml
index c64d30818..91dd7b7e7 100644
--- a/app/src/mobile/res/layout/dialog_title.xml
+++ b/app/src/mobile/res/layout/dialog_title.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/dialog_select_title"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/mobile/res/layout/dialog_track.xml b/app/src/mobile/res/layout/dialog_track.xml
index 37e1e9956..5aeb5518d 100644
--- a/app/src/mobile/res/layout/dialog_track.xml
+++ b/app/src/mobile/res/layout/dialog_track.xml
@@ -18,7 +18,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp"
             tools:text="選擇字幕" />
 
diff --git a/app/src/mobile/res/layout/dialog_update.xml b/app/src/mobile/res/layout/dialog_update.xml
index 977ff766b..a4ab5fc55 100644
--- a/app/src/mobile/res/layout/dialog_update.xml
+++ b/app/src/mobile/res/layout/dialog_update.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:letterSpacing="0.02"
             android:lineSpacingExtra="8dp"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp"
             tools:text="1. 新增 ffmpeg 音頻軟解\n2. 詳情頁新增分詞快搜\n3. 修復搜尋閃退問題\n4. 設定支援渲染切換" />
 
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 00fada3b0..9b0a5018b 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -358,27 +358,29 @@ scheme://username:password@host:port
 **範例：**
 
 ```json
-[
-  {
-    "name": "指定域名代理",
-    "hosts": [
-      "googlevideo.com",
-      "raw.githubusercontent.com"
-    ],
-    "urls": [
-      "http://127.0.0.1:7890"
-    ]
-  },
-  {
-    "name": "全域代理",
-    "hosts": [
-      ".*"
-    ],
-    "urls": [
-      "socks5://127.0.0.1:7891"
-    ]
-  }
-]
+{
+  "proxy": [
+    {
+      "name": "指定域名代理",
+      "hosts": [
+        "googlevideo.com",
+        "raw.githubusercontent.com"
+      ],
+      "urls": [
+        "http://127.0.0.1:7890"
+      ]
+    },
+    {
+      "name": "全域代理",
+      "hosts": [
+        ".*"
+      ],
+      "urls": [
+        "socks5://127.0.0.1:7891"
+      ]
+    }
+  ]
+}
 ```
 
 ---
@@ -398,27 +400,29 @@ scheme://username:password@host:port
 **範例：**
 
 ```json
-[
-  {
-    "hosts": [
-      "video.example.com"
-    ],
-    "regex": [
-      "m3u8?token="
-    ],
-    "exclude": [
-      "preview.json"
-    ]
-  },
-  {
-    "hosts": [
-      "ads.example.com"
-    ],
-    "script": [
-      "document.querySelector('.close-btn').click()"
-    ]
-  }
-]
+{
+  "rules": [
+    {
+      "hosts": [
+        "video.example.com"
+      ],
+      "regex": [
+        "m3u8?token="
+      ],
+      "exclude": [
+        "preview.json"
+      ]
+    },
+    {
+      "hosts": [
+        "ads.example.com"
+      ],
+      "script": [
+        "document.querySelector('.close-btn').click()"
+      ]
+    }
+  ]
+}
 ```
 
 ---