diff --git a/app/src/main/res/drawable/ic_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml
index da0e84b4..f49d47ee 100644
--- a/app/src/main/res/drawable/ic_lock_24dp.xml
+++ b/app/src/main/res/drawable/ic_lock_24dp.xml
@@ -1,11 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-
+    android:viewportHeight="24"
+    android:viewportWidth="24">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M742.4,409.6L716.8,409.6L716.8,332.8C716.8,205.8 613.4,102.4 486.4,102.4S256,205.8 256,332.8L256,409.6h-25.6C188.1,409.6 153.6,444.1 153.6,486.4v409.6c0,42.3 34.5,76.8 76.8,76.8h512c42.3,0 76.8,-34.5 76.8,-76.8v-409.6c0,-42.3 -34.5,-76.8 -76.8,-76.8zM307.2,332.8C307.2,234 387.6,153.6 486.4,153.6S665.6,234 665.6,332.8L665.6,409.6L307.2,409.6L307.2,332.8zM768,896a25.6,25.6 0,0 1,-25.6 25.6h-512a25.6,25.6 0,0 1,-25.6 -25.6v-409.6a25.6,25.6 0,0 1,25.6 -25.6h512a25.6,25.6 0,0 1,25.6 25.6v409.6z" />
-
+        android:fillColor="#ff000000"
+        android:pathData="M12,17C10.89,17 10,16.1 10,15C10,13.89 10.89,13 12,13A2,2 0,0 1,14 15A2,2 0,0 1,12 17M18,20V10H6V20H18M18,8A2,2 0,0 1,20 10V20A2,2 0,0 1,18 22H6C4.89,22 4,21.1 4,20V10C4,8.89 4.89,8 6,8H7V6A5,5 0,0 1,12 1A5,5 0,0 1,17 6V8H18M12,3A3,3 0,0 0,9 6V8H15V6A3,3 0,0 0,12 3Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_routing_edit.xml b/app/src/main/res/layout/activity_routing_edit.xml
index b7bd7607..5e02db56 100644
--- a/app/src/main/res/layout/activity_routing_edit.xml
+++ b/app/src/main/res/layout/activity_routing_edit.xml
@@ -276,11 +276,23 @@
                         android:layout_marginStart="16.0dip"
                         android:layout_marginEnd="16.0dip">
                         <LinearLayout
-                            android:orientation="vertical"
+                            android:orientation="horizontal"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="16.0dip"
                             android:layout_marginBottom="8.0dip">
+                            <com.google.android.material.materialswitch.MaterialSwitch
+                                android:id="@+id/chk_locked"
+                                android:text="@string/routing_settings_locked"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8.0dip"
+                            android:layout_marginBottom="8.0dip">
                             <com.google.android.material.textfield.TextInputLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -295,18 +307,6 @@
                                     android:inputType="text" />
                             </com.google.android.material.textfield.TextInputLayout>
                         </LinearLayout>
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.materialswitch.MaterialSwitch
-                                android:id="@+id/chk_locked"
-                                android:text="@string/routing_settings_locked"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-                        </LinearLayout>
                         <LinearLayout
                             android:orientation="vertical"
                             android:layout_width="match_parent"
@@ -334,9 +334,8 @@
                             android:layout_marginTop="8.0dip"
                             android:layout_marginBottom="8.0dip">
                             <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="200.0dip"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginRight="10.0dip"
                                 android:hint="@string/routing_settings_ip"
                                 app:expandedHintEnabled="false"
                                 style="@style/Outline_TextInputLayout">
@@ -347,6 +346,13 @@
                                     android:hint="@string/routing_settings_tips"
                                     android:inputType="textMultiLine" />
                             </com.google.android.material.textfield.TextInputLayout>
+                        </LinearLayout>
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8.0dip"
+                            android:layout_marginBottom="8.0dip">
                             <com.google.android.material.textfield.TextInputLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_recycler_routing_setting.xml b/app/src/main/res/layout/item_recycler_routing_setting.xml
index c74ca01d..ed2a3002 100644
--- a/app/src/main/res/layout/item_recycler_routing_setting.xml
+++ b/app/src/main/res/layout/item_recycler_routing_setting.xml
@@ -1,112 +1,164 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout
     android:gravity="center_vertical"
     android:id="@+id/item_bg"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginLeft="16.0dip"
-    android:layout_marginTop="4.0dip"
+    android:layout_marginTop="8.0dip"
     android:layout_marginRight="16.0dip"
-    android:layout_marginBottom="4.0dip">
+    android:layout_marginBottom="8.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.cardview.widget.CardView
-        android:orientation="horizontal"
         android:id="@+id/item_cardview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/cardview_margin"
         app:cardBackgroundColor="@color/uwu_bg_card"
         app:cardCornerRadius="24.0dip"
         app:cardElevation="0.0dip">
         <LinearLayout
-            android:gravity="center"
-            android:layout_gravity="center"
             android:orientation="horizontal"
             android:id="@+id/info_container"
-            android:background="?attr/selectableItemBackground"
             android:focusable="true"
-            android:nextFocusRight="@+id/layout_edit"
             android:clickable="true"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:foreground="?android:selectableItemBackground">
             <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="0.0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:paddingStart="@dimen/padding_start">
+                android:orientation="horizontal"
+                android:id="@+id/layout_indicator"
+                android:background="@color/uwu_transparent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10.0dip"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:id="@+id/remarks"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-                    <ImageView
-                        android:id="@+id/img_locked"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="@dimen/padding_start"
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        app:srcCompat="@drawable/ic_lock_24dp" />
-                </LinearLayout>
-                <TextView
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:id="@+id/domainIp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10.0dip"
-                    android:lines="1" />
-                <TextView
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:id="@+id/outboundTag"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10.0dip"
-                    android:layout_marginBottom="10.0dip"
-                    android:lines="1" />
-            </LinearLayout>
-            <LinearLayout
-                android:gravity="center"
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/sub_height"
-                android:paddingStart="@dimen/padding_start"
-                android:paddingEnd="@dimen/padding_end">
-                <LinearLayout
-                    android:gravity="center"
                     android:orientation="vertical"
-                    android:id="@+id/layout_edit"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:padding="@dimen/layout_margin_spacing"
-                    android:focusable="true"
-                    android:nextFocusLeft="@+id/info_container"
-                    android:clickable="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-                    <ImageView
-                        android:layout_width="@dimen/png_height"
-                        android:layout_height="@dimen/png_height"
-                        app:srcCompat="@drawable/ic_edit_24dp"
-                        app:tint="?android:textColorPrimary" />
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/padding_start">
-                    <com.neko.switchbutton.SwitchButton
-                        android:gravity="center"
-                        android:layout_gravity="center"
-                        android:id="@+id/chk_enable"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:kswAnimationDuration="300"
-                        app:kswBackDrawable="@drawable/uwu_switch_track"
-                        app:kswThumbDrawable="@drawable/uwu_switch_thumb" />
+                    android:nextFocusRight="@+id/layout_edit"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:id="@+id/container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <LinearLayout
+                            android:gravity="center_vertical"
+                            android:layout_gravity="center_vertical"
+                            android:paddingLeft="12.0dip"
+                            android:paddingTop="8.0dip"
+                            android:paddingRight="0.0dip"
+                            android:paddingBottom="4.0dip"
+                            android:layout_width="0.0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.0">
+                            <TextView
+                                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                                android:textSize="17.0sp"
+                                android:textColor="?android:textColorPrimary"
+                                android:id="@+id/remarks"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:maxLines="2"
+                                android:minLines="1" />
+                            <ImageView
+                                android:id="@+id/img_locked"
+                                android:paddingLeft="12.0dip"
+                                android:layout_width="28.0dip"
+                                android:layout_height="28.0dip"
+                                android:src="@drawable/ic_lock_24dp"
+                                app:tint="?android:textColorSecondary" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:id="@+id/layout_edit"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:paddingLeft="0.0dip"
+                            android:paddingTop="8.0dip"
+                            android:paddingRight="12.0dip"
+                            android:paddingBottom="4.0dip"
+                            android:focusable="true"
+                            android:clickable="true"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                            <ImageView
+                                android:layout_width="@dimen/png_height"
+                                android:layout_height="@dimen/png_height"
+                                android:src="@drawable/ic_edit_24dp"
+                                app:tint="?android:textColorPrimary" />
+                        </LinearLayout>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:id="@+id/contener"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <LinearLayout
+                            android:gravity="center_vertical"
+                            android:layout_gravity="center_vertical"
+                            android:paddingLeft="12.0dip"
+                            android:paddingTop="4.0dip"
+                            android:paddingRight="0.0dip"
+                            android:paddingBottom="4.0dip"
+                            android:layout_width="0.0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.0">
+                            <TextView
+                                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                                android:textSize="14.0sp"
+                                android:textColor="?android:textColorSecondary"
+                                android:id="@+id/domainIp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:maxLines="1"
+                                android:minLines="1" />
+                        </LinearLayout>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:id="@+id/contleler"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <LinearLayout
+                            android:gravity="center_vertical"
+                            android:layout_gravity="center_vertical"
+                            android:paddingLeft="12.0dip"
+                            android:paddingTop="4.0dip"
+                            android:paddingRight="0.0dip"
+                            android:paddingBottom="8.0dip"
+                            android:layout_width="0.0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.0">
+                            <TextView
+                                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                                android:textSize="14.0sp"
+                                android:textColor="?attr/colorThemeUwu"
+                                android:id="@+id/outboundTag"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:maxLines="1"
+                                android:minLines="1" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:paddingLeft="0.0dip"
+                            android:paddingTop="4.0dip"
+                            android:paddingRight="12.0dip"
+                            android:paddingBottom="8.0dip"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                            <com.neko.switchbutton.SwitchButton
+                                android:gravity="center"
+                                android:layout_gravity="center"
+                                android:id="@+id/chk_enable"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:kswAnimationDuration="300"
+                                app:kswBackDrawable="@drawable/uwu_switch_track"
+                                app:kswThumbDrawable="@drawable/uwu_switch_thumb" />
+                        </LinearLayout>
+                    </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_recycler_sub_setting.xml b/app/src/main/res/layout/item_recycler_sub_setting.xml
index 9e66ea0f..a54c8a74 100644
--- a/app/src/main/res/layout/item_recycler_sub_setting.xml
+++ b/app/src/main/res/layout/item_recycler_sub_setting.xml
@@ -43,9 +43,9 @@
                         <LinearLayout
                             android:gravity="center_vertical"
                             android:layout_gravity="center_vertical"
-                            android:paddingLeft="16.0dip"
+                            android:paddingLeft="12.0dip"
                             android:paddingTop="8.0dip"
-                            android:paddingBottom="8.0dip"
+                            android:paddingBottom="4.0dip"
                             android:layout_width="0.0dip"
                             android:layout_height="wrap_content"
                             android:layout_weight="1.0">
@@ -63,8 +63,8 @@
                             android:gravity="center"
                             android:orientation="vertical"
                             android:id="@+id/layout_edit"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:padding="16.0dip"
+                            android:background="?selectableItemBackgroundBorderless"
+                            android:padding="12.0dip"
                             android:focusable="true"
                             android:clickable="true"
                             android:layout_width="wrap_content"
@@ -79,8 +79,8 @@
                             android:gravity="center"
                             android:orientation="vertical"
                             android:id="@+id/layout_share"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:padding="16.0dip"
+                            android:background="?selectableItemBackgroundBorderless"
+                            android:padding="12.0dip"
                             android:focusable="true"
                             android:clickable="true"
                             android:layout_width="wrap_content"
@@ -100,8 +100,8 @@
                         <LinearLayout
                             android:gravity="center_vertical"
                             android:layout_gravity="center_vertical"
-                            android:paddingLeft="16.0dip"
-                            android:paddingTop="8.0dip"
+                            android:paddingLeft="12.0dip"
+                            android:paddingTop="4.0dip"
                             android:paddingBottom="8.0dip"
                             android:layout_width="0.0dip"
                             android:layout_height="wrap_content"
@@ -119,7 +119,7 @@
                         <LinearLayout
                             android:gravity="center"
                             android:orientation="vertical"
-                            android:padding="16.0dip"
+                            android:padding="12.0dip"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
                             <com.neko.switchbutton.SwitchButton
diff --git a/app/src/main/res/layout/uwu_banner_settings.xml b/app/src/main/res/layout/uwu_banner_settings.xml
index 7c073b1c..977ec20d 100644
--- a/app/src/main/res/layout/uwu_banner_settings.xml
+++ b/app/src/main/res/layout/uwu_banner_settings.xml
@@ -134,7 +134,7 @@
                             android:layout_height="wrap_content">
                             <TextView
                                 android:textSize="17.0sp"
-                                android:textColor="@color/black"
+                                android:textColor="?attr/colorText"
                                 android:ellipsize="marquee"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/uwu_menu_expandableview.xml b/app/src/main/res/layout/uwu_menu_expandableview.xml
index a335448d..e9eb177f 100644
--- a/app/src/main/res/layout/uwu_menu_expandableview.xml
+++ b/app/src/main/res/layout/uwu_menu_expandableview.xml
@@ -50,7 +50,7 @@
                     android:layout_height="wrap_content">
                     <TextView
                         android:textSize="17.0sp"
-                        android:textColor="@color/black"
+                        android:textColor="?attr/colorText"
                         android:ellipsize="marquee"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c0a02246..23dcdc06 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,7 +19,7 @@
     <color name="colorText">#000000</color>
     <color name="colorMainTestBg">#F0F1F6</color>
 
-    <color name="colorText_ActionBar">@color/black_80</color>
+    <color name="colorText_ActionBar">@color/white</color>
     <color name="fab_orange_bright">@android:color/transparent</color>
     <color name="fab_orange_dark">@android:color/transparent</color>
     <color name="fab_orange_light">@android:color/transparent</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b9dcc08..ad4af37f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,15 +11,15 @@
         <item name="android:statusBarColor">?attr/colorThemeUwu</item>
         <item name="android:navigationBarColor">?attr/colorSurfaceVariant</item>
         <item name="android:colorEdgeEffect">@null</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">true</item>
         <item name="alertDialogTheme">@style/Theme.Base.AlertDialog</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Uwu.Material3.BottomSheetDialog</item>
         <item name="colorAccent">?attr/colorPrimary</item>
         <item name="colorBackgroundFloating">@color/uwu_bg_card</item>
-        <item name="colorIcon">@color/black</item>
+        <item name="colorIcon">@color/white</item>
         <item name="colorMainText">@color/colorText</item>
-        <item name="colorThemeUwu">?attr/colorPrimaryInverse</item>
+        <item name="colorThemeUwu">?attr/colorPrimary</item>
         <item name="colorPrimaryDark">?attr/colorPrimary</item>
         <item name="colorText">@color/colorText_ActionBar</item>
         <item name="colorBg">?attr/colorSurfaceVariant</item>
diff --git a/library/src/main/kotlin/com/neko/themeengine/Themes.kt b/library/src/main/kotlin/com/neko/themeengine/Themes.kt
index 21da8633..600eb382 100644
--- a/library/src/main/kotlin/com/neko/themeengine/Themes.kt
+++ b/library/src/main/kotlin/com/neko/themeengine/Themes.kt
@@ -6,24 +6,24 @@ import androidx.annotation.StyleRes
 import com.neko.R
 
 enum class Theme(@StyleRes val themeId: Int, @ColorRes val primaryColor: Int) {
-    Amber(R.style.Theme_ThemeEngine_Amber, R.color.amber_primaryInverse),
-    Orange(R.style.Theme_ThemeEngine_Orange, R.color.orange_primaryInverse),
-    BlueVariant(R.style.Theme_ThemeEngine_BlueVariant, R.color.blue_variant_primaryInverse),
-    Brown(R.style.Theme_ThemeEngine_Brown, R.color.brown_primaryInverse),
-    Cyan(R.style.Theme_ThemeEngine_Cyan, R.color.cyan_primaryInverse),
-    DeepOrange(R.style.Theme_ThemeEngine_DeepOrange, R.color.deep_orange_primaryInverse),
-    DeepPurple(R.style.Theme_ThemeEngine_DeepPurple, R.color.deep_purple_primaryInverse),
-    Green(R.style.Theme_ThemeEngine_Green, R.color.green_primaryInverse),
-    Indigo(R.style.Theme_ThemeEngine_Indigo, R.color.indigo_primaryInverse),
-    LightBlue(R.style.Theme_ThemeEngine_LightBlue, R.color.light_blue_primaryInverse),
-    LightGreen(R.style.Theme_ThemeEngine_LightGreen, R.color.light_green_primaryInverse),
-    Lime(R.style.Theme_ThemeEngine_Lime, R.color.lime_primaryInverse),
-    Blue(R.style.Theme_ThemeEngine_Blue, R.color.blue_primaryInverse),
-    Pink(R.style.Theme_ThemeEngine_Pink, R.color.pink_primaryInverse),
-    Purple(R.style.Theme_ThemeEngine_Purple, R.color.purple_primaryInverse),
-    Red(R.style.Theme_ThemeEngine_Red, R.color.red_primaryInverse),
-    Teal(R.style.Theme_ThemeEngine_Teal, R.color.teal_primaryInverse),
-    Violet(R.style.Theme_ThemeEngine_Violet, R.color.violet_primaryInverse),
-    Yellow(R.style.Theme_ThemeEngine_Yellow, R.color.yellow_primaryInverse),
-    Nekocok(R.style.Theme_ThemeEngine_Nekocok, R.color.nekocok_primaryInverse)
+    Amber(R.style.Theme_ThemeEngine_Amber, R.color.amber_primary),
+    Blue(R.style.Theme_ThemeEngine_Blue, R.color.blue_primary),
+    BlueVariant(R.style.Theme_ThemeEngine_BlueVariant, R.color.blue_variant_primary),
+    Brown(R.style.Theme_ThemeEngine_Brown, R.color.brown_primary),
+    Cyan(R.style.Theme_ThemeEngine_Cyan, R.color.cyan_primary),
+    DeepOrange(R.style.Theme_ThemeEngine_DeepOrange, R.color.deep_orange_primary),
+    DeepPurple(R.style.Theme_ThemeEngine_DeepPurple, R.color.deep_purple_primary),
+    Green(R.style.Theme_ThemeEngine_Green, R.color.green_primary),
+    Indigo(R.style.Theme_ThemeEngine_Indigo, R.color.indigo_primary),
+    LightBlue(R.style.Theme_ThemeEngine_LightBlue, R.color.light_blue_primary),
+    LightGreen(R.style.Theme_ThemeEngine_LightGreen, R.color.light_green_primary),
+    Lime(R.style.Theme_ThemeEngine_Lime, R.color.lime_primary),
+    Orange(R.style.Theme_ThemeEngine_Orange, R.color.orange_primary),
+    Pink(R.style.Theme_ThemeEngine_Pink, R.color.pink_primary),
+    Purple(R.style.Theme_ThemeEngine_Purple, R.color.purple_primary),
+    Red(R.style.Theme_ThemeEngine_Red, R.color.red_primary),
+    Teal(R.style.Theme_ThemeEngine_Teal, R.color.teal_primary),
+    Violet(R.style.Theme_ThemeEngine_Violet, R.color.violet_primary),
+    Yellow(R.style.Theme_ThemeEngine_Yellow, R.color.yellow_primary),
+    Nekocok(R.style.Theme_ThemeEngine_Nekocok, R.color.nekocok_primary)
 }
\ No newline at end of file
diff --git a/library/src/main/res/values-night/colors_theme.xml b/library/src/main/res/values-night/colors_theme.xml
index 88ec8f74..d3b1f062 100644
--- a/library/src/main/res/values-night/colors_theme.xml
+++ b/library/src/main/res/values-night/colors_theme.xml
@@ -2,7 +2,7 @@
 
 <resources>
 
-    <color name="amber_primary">#FABD00</color>
+    <color name="amber_primary">#FFD54F</color>
     <color name="amber_onPrimary">#402D00</color>
     <color name="amber_primaryContainer">#5C4300</color>
     <color name="amber_onPrimaryContainer">#FFDF99</color>
@@ -29,7 +29,7 @@
     <color name="amber_inverseSurface">#E9E1D8</color>
     <color name="amber_primaryInverse">@color/amber_primary</color>
 
-    <color name="blue_primary">#ACC6FF</color>
+    <color name="blue_primary">#90CAF9</color>
     <color name="blue_onPrimary">#002D6E</color>
     <color name="blue_primaryContainer">#004299</color>
     <color name="blue_onPrimaryContainer">#D7E2FF</color>
@@ -83,7 +83,7 @@
     <color name="blue_variant_inverseSurface">#E2E2E6</color>
     <color name="blue_variant_primaryInverse">@color/blue_variant_primary</color>
 
-    <color name="brown_primary">#FFB598</color>
+    <color name="brown_primary">#BCAAA4</color>
     <color name="brown_onPrimary">#5C1A00</color>
     <color name="brown_primaryContainer">#7B2E0D</color>
     <color name="brown_onPrimaryContainer">#FFDBCD</color>
@@ -110,7 +110,7 @@
     <color name="brown_inverseSurface">#EDE0DC</color>
     <color name="brown_primaryInverse">@color/brown_primary</color>
 
-    <color name="cyan_primary">#44D8F1</color>
+    <color name="cyan_primary">#80DEEA</color>
     <color name="cyan_onPrimary">#00363F</color>
     <color name="cyan_primaryContainer">#004E5A</color>
     <color name="cyan_onPrimaryContainer">#9CEFFF</color>
@@ -137,7 +137,7 @@
     <color name="cyan_inverseSurface">#E1E3E3</color>
     <color name="cyan_primaryInverse">@color/cyan_primary</color>
 
-    <color name="deep_orange_primary">#FFB49D</color>
+    <color name="deep_orange_primary">#FFAB91</color>
     <color name="deep_orange_onPrimary">#601400</color>
     <color name="deep_orange_primaryContainer">#882000</color>
     <color name="deep_orange_onPrimaryContainer">#FFDACF</color>
@@ -164,7 +164,7 @@
     <color name="deep_orange_inverseSurface">#EDE0DD</color>
     <color name="deep_orange_primaryInverse">@color/deep_orange_primary</color>
 
-    <color name="deep_purple_primary">#D4BAFF</color>
+    <color name="deep_purple_primary">#B39DDB</color>
     <color name="deep_purple_onPrimary">#3E008E</color>
     <color name="deep_purple_primaryContainer">#5727A7</color>
     <color name="deep_purple_onPrimaryContainer">#ECDCFF</color>
@@ -191,7 +191,7 @@
     <color name="deep_purple_inverseSurface">#E6E1E5</color>
     <color name="deep_purple_primaryInverse">@color/deep_purple_primary</color>
 
-    <color name="green_primary">#78DC77</color>
+    <color name="green_primary">#00E676</color>
     <color name="green_onPrimary">#003907</color>
     <color name="green_primaryContainer">#00530F</color>
     <color name="green_onPrimaryContainer">#93F990</color>
@@ -245,7 +245,7 @@
     <color name="indigo_inverseSurface">#E4E1E6</color>
     <color name="indigo_primaryInverse">@color/indigo_primary</color>
 
-    <color name="light_blue_primary">#8BCEFF</color>
+    <color name="light_blue_primary">#81D4FA</color>
     <color name="light_blue_onPrimary">#003450</color>
     <color name="light_blue_primaryContainer">#004B71</color>
     <color name="light_blue_onPrimaryContainer">#C8E6FF</color>
@@ -272,7 +272,7 @@
     <color name="light_blue_inverseSurface">#E2E2E5</color>
     <color name="light_blue_primaryInverse">@color/light_blue_primary</color>
 
-    <color name="light_green_primary">#9ED75C</color>
+    <color name="light_green_primary">#C5E1A5</color>
     <color name="light_green_onPrimary">#1C3700</color>
     <color name="light_green_primaryContainer">#2C5000</color>
     <color name="light_green_onPrimaryContainer">#B9F475</color>
@@ -299,7 +299,7 @@
     <color name="light_green_inverseSurface">#E3E3DB</color>
     <color name="light_green_primaryInverse">@color/light_green_primary</color>
 
-    <color name="lime_primary">#C1D02C</color>
+    <color name="lime_primary">#E6EE9C</color>
     <color name="lime_onPrimary">#2E3400</color>
     <color name="lime_primaryContainer">#434B00</color>
     <color name="lime_onPrimaryContainer">#DEED49</color>
@@ -326,7 +326,7 @@
     <color name="lime_inverseSurface">#E5E2DA</color>
     <color name="lime_primaryInverse">@color/lime_primary</color>
 
-    <color name="orange_primary">#FFB86D</color>
+    <color name="orange_primary">#FFCC80</color>
     <color name="orange_onPrimary">#4B2800</color>
     <color name="orange_primaryContainer">#6A3B00</color>
     <color name="orange_onPrimaryContainer">#FFDCBB</color>
@@ -353,7 +353,7 @@
     <color name="orange_inverseSurface">#EBE0D9</color>
     <color name="orange_primaryInverse">@color/orange_primary</color>
 
-    <color name="pink_primary">#FFB2C0</color>
+    <color name="pink_primary">#F48FB1</color>
     <color name="pink_onPrimary">#670024</color>
     <color name="pink_primaryContainer">#900036</color>
     <color name="pink_onPrimaryContainer">#FFD9DF</color>
@@ -380,7 +380,7 @@
     <color name="pink_inverseSurface">#ECE0E0</color>
     <color name="pink_primaryInverse">@color/pink_primary</color>
 
-    <color name="purple_primary">#D2BCFF</color>
+    <color name="purple_primary">#CE93D8</color>
     <color name="purple_onPrimary">#391E72</color>
     <color name="purple_primaryContainer">#50378A</color>
     <color name="purple_onPrimaryContainer">#EADCFF</color>
@@ -407,7 +407,7 @@
     <color name="purple_inverseSurface">#E5E1E5</color>
     <color name="purple_primaryInverse">@color/purple_primary</color>
 
-    <color name="red_primary">#FFB3A9</color>
+    <color name="red_primary">#EF9A9A</color>
     <color name="red_onPrimary">#690005</color>
     <color name="red_primaryContainer">#93000A</color>
     <color name="red_onPrimaryContainer">#FFDAD4</color>
@@ -434,7 +434,7 @@
     <color name="red_inverseSurface">#EDE0DE</color>
     <color name="red_primaryInverse">@color/red_primary</color>
 
-    <color name="teal_primary">#53DBC9</color>
+    <color name="teal_primary">#80CBC4</color>
     <color name="teal_onPrimary">#003730</color>
     <color name="teal_primaryContainer">#005047</color>
     <color name="teal_onPrimaryContainer">#74F7E5</color>
@@ -488,7 +488,7 @@
     <color name="violet_inverseSurface">#E4E1E6</color>
     <color name="violet_primaryInverse">@color/violet_primary</color>
 
-    <color name="yellow_primary">#DBC808</color>
+    <color name="yellow_primary">#FFF59D</color>
     <color name="yellow_onPrimary">#373100</color>
     <color name="yellow_primaryContainer">#504700</color>
     <color name="yellow_onPrimaryContainer">#F9E534</color>
@@ -515,7 +515,7 @@
     <color name="yellow_inverseSurface">#E7E2D9</color>
     <color name="yellow_primaryInverse">@color/yellow_primary</color>
 
-    <color name="nekocok_primary">#E0E0E0</color>
+    <color name="nekocok_primary">#B0BEC5</color>
     <color name="nekocok_onPrimary">#424242</color>
     <color name="nekocok_primaryContainer">#444444</color>
     <color name="nekocok_onPrimaryContainer">#9E9E9F</color>
diff --git a/library/src/main/res/values/colors_theme.xml b/library/src/main/res/values/colors_theme.xml
index 401ecd83..1a700b7f 100644
--- a/library/src/main/res/values/colors_theme.xml
+++ b/library/src/main/res/values/colors_theme.xml
@@ -2,7 +2,7 @@
 
 <resources>
 
-    <color name="amber_primary">#FFA000</color>
+    <color name="amber_primary">#FFC107</color>
     <color name="amber_onPrimary">#FFFFFF</color>
     <color name="amber_primaryContainer">#FFDF99</color>
     <color name="amber_onPrimaryContainer">#261A00</color>
@@ -29,7 +29,7 @@
     <color name="amber_inverseSurface">#34302A</color>
     <color name="amber_primaryInverse">#ffe57f</color>
 
-    <color name="blue_primary">#235BB6</color>
+    <color name="blue_primary">#2196F3</color>
     <color name="blue_onPrimary">#FFFFFF</color>
     <color name="blue_primaryContainer">#D7E2FF</color>
     <color name="blue_onPrimaryContainer">#001944</color>
@@ -83,7 +83,7 @@
     <color name="blue_variant_inverseSurface">#2F3033</color>
     <color name="blue_variant_primaryInverse">#9CCAFF</color>
 
-    <color name="brown_primary">#9A4523</color>
+    <color name="brown_primary">#795548</color>
     <color name="brown_onPrimary">#FFFFFF</color>
     <color name="brown_primaryContainer">#FFDBCD</color>
     <color name="brown_onPrimaryContainer">#380C00</color>
@@ -110,7 +110,7 @@
     <color name="brown_inverseSurface">#362F2D</color>
     <color name="brown_primaryInverse">#a1887f</color>
 
-    <color name="cyan_primary">#006877</color>
+    <color name="cyan_primary">#00BCD4</color>
     <color name="cyan_onPrimary">#FFFFFF</color>
     <color name="cyan_primaryContainer">#9CEFFF</color>
     <color name="cyan_onPrimaryContainer">#001F25</color>
@@ -137,7 +137,7 @@
     <color name="cyan_inverseSurface">#2D3132</color>
     <color name="cyan_primaryInverse">#84ffff</color>
 
-    <color name="deep_orange_primary">#B22D00</color>
+    <color name="deep_orange_primary">#FF5722</color>
     <color name="deep_orange_onPrimary">#FFFFFF</color>
     <color name="deep_orange_primaryContainer">#FFDACF</color>
     <color name="deep_orange_onPrimaryContainer">#3C0800</color>
@@ -164,7 +164,7 @@
     <color name="deep_orange_inverseSurface">#362F2D</color>
     <color name="deep_orange_primaryInverse">#ff9e80</color>
 
-    <color name="deep_purple_primary">#6F43BF</color>
+    <color name="deep_purple_primary">#673AB7</color>
     <color name="deep_purple_onPrimary">#FFFFFF</color>
     <color name="deep_purple_primaryContainer">#ECDCFF</color>
     <color name="deep_purple_onPrimaryContainer">#25005A</color>
@@ -191,7 +191,7 @@
     <color name="deep_purple_inverseSurface">#323033</color>
     <color name="deep_purple_primaryInverse">#b388ff</color>
 
-    <color name="green_primary">#388E3C</color>
+    <color name="green_primary">#4CAF50</color>
     <color name="green_onPrimary">#FFFFFF</color>
     <color name="green_primaryContainer">#93F990</color>
     <color name="green_onPrimaryContainer">#002203</color>
@@ -218,7 +218,7 @@
     <color name="green_inverseSurface">#2F312D</color>
     <color name="green_primaryInverse">#69f0ae</color>
 
-    <color name="indigo_primary">#4355B9</color>
+    <color name="indigo_primary">#3F51B5</color>
     <color name="indigo_onPrimary">#FFFFFF</color>
     <color name="indigo_primaryContainer">#DDE0FF</color>
     <color name="indigo_onPrimaryContainer">#000D61</color>
@@ -245,7 +245,7 @@
     <color name="indigo_inverseSurface">#303034</color>
     <color name="indigo_primaryInverse">#8c9eff</color>
 
-    <color name="light_blue_primary">#006494</color>
+    <color name="light_blue_primary">#03A9F4</color>
     <color name="light_blue_onPrimary">#FFFFFF</color>
     <color name="light_blue_primaryContainer">#C8E6FF</color>
     <color name="light_blue_onPrimaryContainer">#001E31</color>
@@ -272,7 +272,7 @@
     <color name="light_blue_inverseSurface">#2F3032</color>
     <color name="light_blue_primaryInverse">#82b1ff</color>
 
-    <color name="light_green_primary">#3C6A00</color>
+    <color name="light_green_primary">#8BC34A</color>
     <color name="light_green_onPrimary">#FFFFFF</color>
     <color name="light_green_primaryContainer">#B9F475</color>
     <color name="light_green_onPrimaryContainer">#0E2000</color>
@@ -299,7 +299,7 @@
     <color name="light_green_inverseSurface">#30312D</color>
     <color name="light_green_primaryInverse">#ccff90</color>
 
-    <color name="lime_primary">#AFB42B</color>
+    <color name="lime_primary">#CDDC39</color>
     <color name="lime_onPrimary">#FFFFFF</color>
     <color name="lime_primaryContainer">#DEED49</color>
     <color name="lime_onPrimaryContainer">#1A1E00</color>
@@ -326,7 +326,7 @@
     <color name="lime_inverseSurface">#31312B</color>
     <color name="lime_primaryInverse">#eeff41</color>
 
-    <color name="orange_primary">#F57C00</color>
+    <color name="orange_primary">#FF9800</color>
     <color name="orange_onPrimary">#FFFFFF</color>
     <color name="orange_primaryContainer">#FFDCBB</color>
     <color name="orange_onPrimaryContainer">#2D1600</color>
@@ -353,7 +353,7 @@
     <color name="orange_inverseSurface">#352F2A</color>
     <color name="orange_primaryInverse">#ffd180</color>
 
-    <color name="pink_primary">#BC0049</color>
+    <color name="pink_primary">#E91E63</color>
     <color name="pink_onPrimary">#FFFFFF</color>
     <color name="pink_primaryContainer">#FFD9DF</color>
     <color name="pink_onPrimaryContainer">#400013</color>
@@ -380,7 +380,7 @@
     <color name="pink_inverseSurface">#362F30</color>
     <color name="pink_primaryInverse">#ff80ab</color>
 
-    <color name="purple_primary">#684FA4</color>
+    <color name="purple_primary">#9C27B0</color>
     <color name="purple_onPrimary">#FFFFFF</color>
     <color name="purple_primaryContainer">#EADCFF</color>
     <color name="purple_onPrimaryContainer">#23005D</color>
@@ -407,7 +407,7 @@
     <color name="purple_inverseSurface">#313033</color>
     <color name="purple_primaryInverse">#ea80fc</color>
 
-    <color name="red_primary">#BA171C</color>
+    <color name="red_primary">#F44336</color>
     <color name="red_onPrimary">#FFFFFF</color>
     <color name="red_primaryContainer">#FFDAD4</color>
     <color name="red_onPrimaryContainer">#410002</color>
@@ -434,7 +434,7 @@
     <color name="red_inverseSurface">#362F2E</color>
     <color name="red_primaryInverse">#ff8a80</color>
 
-    <color name="teal_primary">#006A5F</color>
+    <color name="teal_primary">#009688</color>
     <color name="teal_onPrimary">#FFFFFF</color>
     <color name="teal_primaryContainer">#74F7E5</color>
     <color name="teal_onPrimaryContainer">#00201C</color>
@@ -488,7 +488,7 @@
     <color name="violet_inverseSurface">#303034</color>
     <color name="violet_primaryInverse">#B9C3FF</color>
 
-    <color name="yellow_primary">#FBC02D</color>
+    <color name="yellow_primary">#FFEB3B</color>
     <color name="yellow_onPrimary">#FFFFFF</color>
     <color name="yellow_primaryContainer">#F9E534</color>
     <color name="yellow_onPrimaryContainer">#201C00</color>
@@ -532,7 +532,7 @@
     <color name="nekocok_onTertiary">#ffffffff</color>
     <color name="nekocok_onTertiaryContainer">#ff2c1700</color>
     <color name="nekocok_outline">#ff847375</color>
-    <color name="nekocok_primary">#ff777777</color>
+    <color name="nekocok_primary">#607D8B</color>
     <color name="nekocok_primaryContainer">#ffbdbdbd</color>
     <color name="nekocok_primaryInverse">#ff9e9e9e</color>
     <color name="nekocok_secondary">#ff76565b</color>