diff --git a/app/src/main/res/drawable-night/preference_card_bottom.xml b/app/src/main/res/drawable-night/preference_card_bottom.xml
deleted file mode 100644
index 904b923..0000000
--- a/app/src/main/res/drawable-night/preference_card_bottom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorControlHighlight">
-    <item>
-        <shape>
-            <corners
-                android:bottomLeftRadius="18dp"
-                android:bottomRightRadius="18dp"
-                android:topLeftRadius="8dp"
-                android:topRightRadius="8dp" />
-            <solid android:color="?colorSurfaceContainer" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/preference_card_center.xml b/app/src/main/res/drawable-night/preference_card_center.xml
deleted file mode 100644
index 021021e..0000000
--- a/app/src/main/res/drawable-night/preference_card_center.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorControlHighlight">
-    <item>
-        <shape>
-            <corners
-                android:bottomLeftRadius="8dp"
-                android:bottomRightRadius="8dp"
-                android:topLeftRadius="8dp"
-                android:topRightRadius="8dp" />
-            <solid android:color="?colorSurfaceContainer" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/preference_card_top.xml b/app/src/main/res/drawable-night/preference_card_top.xml
deleted file mode 100644
index aa3e76d..0000000
--- a/app/src/main/res/drawable-night/preference_card_top.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorControlHighlight">
-    <item>
-        <shape>
-            <corners
-                android:bottomLeftRadius="8dp"
-                android:bottomRightRadius="8dp"
-                android:topLeftRadius="18dp"
-                android:topRightRadius="18dp" />
-            <solid android:color="?colorSurfaceContainer" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preference_card_bottom.xml b/app/src/main/res/drawable/preference_card_bottom.xml
index 560cd2e..0f38887 100644
--- a/app/src/main/res/drawable/preference_card_bottom.xml
+++ b/app/src/main/res/drawable/preference_card_bottom.xml
@@ -4,11 +4,11 @@
     <item>
         <shape>
             <corners
-                android:bottomLeftRadius="18dp"
-                android:bottomRightRadius="18dp"
+                android:bottomLeftRadius="16dp"
+                android:bottomRightRadius="16dp"
                 android:topLeftRadius="8dp"
                 android:topRightRadius="8dp" />
-            <solid android:color="?colorSurface" />
+            <solid android:color="?colorSurfaceContainerLow" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preference_card_center.xml b/app/src/main/res/drawable/preference_card_center.xml
index ac66d1c..9ee107c 100644
--- a/app/src/main/res/drawable/preference_card_center.xml
+++ b/app/src/main/res/drawable/preference_card_center.xml
@@ -8,7 +8,7 @@
                 android:bottomRightRadius="8dp"
                 android:topLeftRadius="8dp"
                 android:topRightRadius="8dp" />
-            <solid android:color="?colorSurface" />
+            <solid android:color="?colorSurfaceContainerLow" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preference_card_top.xml b/app/src/main/res/drawable/preference_card_top.xml
index bea1627..eeb8291 100644
--- a/app/src/main/res/drawable/preference_card_top.xml
+++ b/app/src/main/res/drawable/preference_card_top.xml
@@ -6,9 +6,9 @@
             <corners
                 android:bottomLeftRadius="8dp"
                 android:bottomRightRadius="8dp"
-                android:topLeftRadius="18dp"
-                android:topRightRadius="18dp" />
-            <solid android:color="?colorSurface" />
+                android:topLeftRadius="16dp"
+                android:topRightRadius="16dp" />
+            <solid android:color="?colorSurfaceContainerLow" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index c9b6c7f..9291ea6 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -16,8 +16,9 @@
             style="?attr/collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
-            android:background="?android:colorBackground"
-            app:contentScrim="?android:attr/colorBackground"
+            app:collapsedTitleGravity="center"
+            app:expandedTitleMarginEnd="22dp"
+            app:expandedTitleMarginStart="22dp"
             app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineMedium"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
diff --git a/app/src/main/res/layout/preference_material_bottom.xml b/app/src/main/res/layout/preference_material_bottom.xml
index 4838c9c..cf3b3b1 100644
--- a/app/src/main/res/layout/preference_material_bottom.xml
+++ b/app/src/main/res/layout/preference_material_bottom.xml
@@ -21,14 +21,15 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="20dp"
         android:importantForAccessibility="no"
-        app:tint="?attr/colorOnSurface" />
+        app:tint="?android:textColorPrimary" />
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="14dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -36,15 +37,15 @@
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurface"
-            android:textSize="16sp" />
+            android:maxLines="2"
+            android:textAppearance="?android:textAppearanceListItem" />
 
         <TextView
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:textSize="14sp" />
+            android:ellipsize="marquee"
+            android:maxLines="8" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/preference_material_category.xml b/app/src/main/res/layout/preference_material_category.xml
new file mode 100644
index 0000000..38ee042
--- /dev/null
+++ b/app/src/main/res/layout/preference_material_category.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="24dp"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="12dp"
+    android:baselineAligned="false"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAllCaps="true"
+        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+        android:textColor="?attr/colorOnSurfaceVariant"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_material_center.xml b/app/src/main/res/layout/preference_material_middle.xml
similarity index 85%
rename from app/src/main/res/layout/preference_material_center.xml
rename to app/src/main/res/layout/preference_material_middle.xml
index 74224db..f1f218a 100644
--- a/app/src/main/res/layout/preference_material_center.xml
+++ b/app/src/main/res/layout/preference_material_middle.xml
@@ -23,14 +23,15 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="20dp"
         android:importantForAccessibility="no"
-        app:tint="?attr/colorOnSurface" />
+        app:tint="?android:textColorPrimary" />
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="14dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -38,15 +39,14 @@
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurface"
-            android:textSize="16sp" />
+            android:maxLines="2"
+            android:textAppearance="?android:textAppearanceListItem" />
 
         <TextView
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:textSize="14sp" />
+            android:maxLines="8" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/preference_material_shortcuts_bottom.xml b/app/src/main/res/layout/preference_material_shortcuts_bottom.xml
index d873621..80da304 100644
--- a/app/src/main/res/layout/preference_material_shortcuts_bottom.xml
+++ b/app/src/main/res/layout/preference_material_shortcuts_bottom.xml
@@ -3,8 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
     android:layout_marginTop="4dp"
+    android:layout_marginEnd="16dp"
     android:background="@drawable/preference_card_bottom"
     android:baselineAligned="false"
     android:clickable="true"
@@ -26,8 +26,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="14dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -35,15 +36,14 @@
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurface"
-            android:textSize="16sp" />
+            android:maxLines="2"
+            android:textAppearance="?android:textAppearanceListItem" />
 
         <TextView
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:textSize="14sp" />
+            android:maxLines="8" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/preference_material_shortcuts_center.xml b/app/src/main/res/layout/preference_material_shortcuts_middle.xml
similarity index 86%
rename from app/src/main/res/layout/preference_material_shortcuts_center.xml
rename to app/src/main/res/layout/preference_material_shortcuts_middle.xml
index 8568b4c..16f2901 100644
--- a/app/src/main/res/layout/preference_material_shortcuts_center.xml
+++ b/app/src/main/res/layout/preference_material_shortcuts_middle.xml
@@ -26,8 +26,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="14dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -35,15 +36,14 @@
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurface"
-            android:textSize="16sp" />
+            android:maxLines="2"
+            android:textAppearance="?android:textAppearanceListItem" />
 
         <TextView
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:textSize="14sp" />
+            android:maxLines="8" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/preference_material_shortcuts_top.xml b/app/src/main/res/layout/preference_material_shortcuts_top.xml
index a8ed9f1..3cef822 100644
--- a/app/src/main/res/layout/preference_material_shortcuts_top.xml
+++ b/app/src/main/res/layout/preference_material_shortcuts_top.xml
@@ -3,7 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    android:layout_marginTop="8dp"
     android:layout_marginEnd="16dp"
     android:background="@drawable/preference_card_top"
     android:baselineAligned="false"
@@ -26,8 +25,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="14dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -35,15 +35,14 @@
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurface"
-            android:textSize="16sp" />
+            android:maxLines="2"
+            android:textAppearance="?android:textAppearanceListItem" />
 
         <TextView
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:textSize="14sp" />
+            android:maxLines="8" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/preference_material_top.xml b/app/src/main/res/layout/preference_material_top.xml
index b686dab..5150e81 100644
--- a/app/src/main/res/layout/preference_material_top.xml
+++ b/app/src/main/res/layout/preference_material_top.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    android:layout_marginTop="8dp"
     android:layout_marginEnd="16dp"
     android:background="@drawable/preference_card_top"
     android:baselineAligned="false"
@@ -22,14 +21,15 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="20dp"
         android:importantForAccessibility="no"
-        app:tint="?attr/colorOnSurface" />
+        app:tint="?android:textColorPrimary" />
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="14dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -37,15 +37,14 @@
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurface"
-            android:textSize="16sp" />
+            android:maxLines="2"
+            android:textAppearance="?android:textAppearanceListItem" />
 
         <TextView
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:textSize="14sp" />
+            android:maxLines="8" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/values-night-v27/themes.xml b/app/src/main/res/values-night-v27/themes.xml
index dc4a709..fa8bea7 100644
--- a/app/src/main/res/values-night-v27/themes.xml
+++ b/app/src/main/res/values-night-v27/themes.xml
@@ -4,7 +4,6 @@
     <style name="AppTheme.Base" parent="@style/Theme.Material3.Dark.NoActionBar">
         <!--attributes colors-->
         <item name="android:colorAccent">?colorPrimary</item>
-        <item name="android:colorBackground">@color/md_theme_surface</item>
         <!--components theme-->
         <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="switchPreferenceCompatStyle">@style/Theme.SwitchPreferenceCompat</item>
@@ -32,6 +31,7 @@
         <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
         <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
         <item name="colorSurface">@color/md_theme_surface</item>
         <item name="colorOnSurface">@color/md_theme_onSurface</item>
         <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
@@ -61,9 +61,9 @@
         <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
         <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
         <!-- layout padding -->
-        <item name="android:listPreferredItemPaddingLeft">28dp</item>
-        <item name="android:listPreferredItemPaddingRight">28dp</item>
-        <item name="android:listPreferredItemPaddingStart">28dp</item>
-        <item name="android:listPreferredItemPaddingEnd">28dp</item>
+        <item name="android:listPreferredItemPaddingLeft">17dp</item>
+        <item name="android:listPreferredItemPaddingRight">17dp</item>
+        <item name="android:listPreferredItemPaddingStart">17dp</item>
+        <item name="android:listPreferredItemPaddingEnd">17dp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index d65277e..98f63fc 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -4,7 +4,6 @@
     <style name="AppTheme.Base" parent="@style/Theme.Material3.DynamicColors.Dark.NoActionBar">
         <!--attributes colors-->
         <item name="android:colorAccent">?colorPrimary</item>
-        <item name="android:colorBackground">?colorSurface</item>
         <!--components theme-->
         <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="switchPreferenceCompatStyle">@style/Theme.SwitchPreferenceCompat</item>
@@ -15,10 +14,10 @@
         <item name="android:windowLightNavigationBar">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <!-- layout padding -->
-        <item name="android:listPreferredItemPaddingLeft">28dp</item>
-        <item name="android:listPreferredItemPaddingRight">28dp</item>
-        <item name="android:listPreferredItemPaddingStart">28dp</item>
-        <item name="android:listPreferredItemPaddingEnd">28dp</item>
+        <item name="android:listPreferredItemPaddingLeft">17dp</item>
+        <item name="android:listPreferredItemPaddingRight">17dp</item>
+        <item name="android:listPreferredItemPaddingStart">17dp</item>
+        <item name="android:listPreferredItemPaddingEnd">17dp</item>
         <!--dynamic colors-->
         <item name="isMaterial3DynamicColorApplied">true</item>
     </style>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 18e6725..5af9576 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -4,7 +4,6 @@
     <style name="AppTheme.Base" parent="@style/Theme.Material3.Dark.NoActionBar">
         <!--attributes colors-->
         <item name="android:colorAccent">?colorPrimary</item>
-        <item name="android:colorBackground">@color/md_theme_surface</item>
         <!--components theme-->
         <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="switchPreferenceCompatStyle">@style/Theme.SwitchPreferenceCompat</item>
@@ -30,6 +29,7 @@
         <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
         <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
         <item name="colorSurface">@color/md_theme_surface</item>
         <item name="colorOnSurface">@color/md_theme_onSurface</item>
         <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
@@ -59,9 +59,9 @@
         <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
         <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
         <!-- layout padding -->
-        <item name="android:listPreferredItemPaddingLeft">28dp</item>
-        <item name="android:listPreferredItemPaddingRight">28dp</item>
-        <item name="android:listPreferredItemPaddingStart">28dp</item>
-        <item name="android:listPreferredItemPaddingEnd">28dp</item>
+        <item name="android:listPreferredItemPaddingLeft">17dp</item>
+        <item name="android:listPreferredItemPaddingRight">17dp</item>
+        <item name="android:listPreferredItemPaddingStart">17dp</item>
+        <item name="android:listPreferredItemPaddingEnd">17dp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index 74bd5e4..854d420 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -4,7 +4,6 @@
     <style name="AppTheme.Base" parent="@style/Theme.Material3.Light.NoActionBar">
         <!--attributes colors-->
         <item name="android:colorAccent">?colorPrimary</item>
-        <item name="android:colorBackground">@color/md_theme_surfaceContainer</item>
         <!--components theme-->
         <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="switchPreferenceCompatStyle">@style/Theme.SwitchPreferenceCompat</item>
@@ -32,6 +31,7 @@
         <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
         <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
         <item name="colorSurface">@color/md_theme_surface</item>
         <item name="colorOnSurface">@color/md_theme_onSurface</item>
         <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
@@ -61,9 +61,9 @@
         <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
         <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
         <!-- layout padding -->
-        <item name="android:listPreferredItemPaddingLeft">28dp</item>
-        <item name="android:listPreferredItemPaddingRight">28dp</item>
-        <item name="android:listPreferredItemPaddingStart">28dp</item>
-        <item name="android:listPreferredItemPaddingEnd">28dp</item>
+        <item name="android:listPreferredItemPaddingLeft">17dp</item>
+        <item name="android:listPreferredItemPaddingRight">17dp</item>
+        <item name="android:listPreferredItemPaddingStart">17dp</item>
+        <item name="android:listPreferredItemPaddingEnd">17dp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 5e0bdf5..b70daa0 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -4,7 +4,6 @@
     <style name="AppTheme.Base" parent="@style/Theme.Material3.DynamicColors.Light.NoActionBar">
         <!--attributes colors-->
         <item name="android:colorAccent">?colorPrimary</item>
-        <item name="android:colorBackground">?colorSurfaceContainer</item>
         <!--components theme-->
         <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="switchPreferenceCompatStyle">@style/Theme.SwitchPreferenceCompat</item>
@@ -15,10 +14,10 @@
         <item name="android:windowLightNavigationBar">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <!-- layout padding -->
-        <item name="android:listPreferredItemPaddingLeft">28dp</item>
-        <item name="android:listPreferredItemPaddingRight">28dp</item>
-        <item name="android:listPreferredItemPaddingStart">28dp</item>
-        <item name="android:listPreferredItemPaddingEnd">28dp</item>
+        <item name="android:listPreferredItemPaddingLeft">17dp</item>
+        <item name="android:listPreferredItemPaddingRight">17dp</item>
+        <item name="android:listPreferredItemPaddingStart">17dp</item>
+        <item name="android:listPreferredItemPaddingEnd">17dp</item>
         <!--dynamic colors-->
         <item name="isMaterial3DynamicColorApplied">true</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 117f1d0..ccadc35 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -26,7 +26,6 @@
     <style name="AppTheme.Base" parent="@style/Theme.Material3.Light.NoActionBar">
         <!--attributes colors-->
         <item name="android:colorAccent">?colorPrimary</item>
-        <item name="android:colorBackground">@color/md_theme_surfaceContainer</item>
         <!--components theme-->
         <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="switchPreferenceCompatStyle">@style/Theme.SwitchPreferenceCompat</item>
@@ -52,6 +51,7 @@
         <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
         <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
         <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
         <item name="colorSurface">@color/md_theme_surface</item>
         <item name="colorOnSurface">@color/md_theme_onSurface</item>
         <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
@@ -81,10 +81,10 @@
         <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
         <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
         <!-- layout padding -->
-        <item name="android:listPreferredItemPaddingLeft">28dp</item>
-        <item name="android:listPreferredItemPaddingRight">28dp</item>
-        <item name="android:listPreferredItemPaddingStart">28dp</item>
-        <item name="android:listPreferredItemPaddingEnd">28dp</item>
+        <item name="android:listPreferredItemPaddingLeft">17dp</item>
+        <item name="android:listPreferredItemPaddingRight">17dp</item>
+        <item name="android:listPreferredItemPaddingStart">17dp</item>
+        <item name="android:listPreferredItemPaddingEnd">17dp</item>
     </style>
 
     <!--app theme components-->
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c5103ad..ff64266 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        android:layout="@layout/preference_material_category"
         android:title="@string/pref_category_shortcuts_manager"
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false" />
+        app:allowDividerAbove="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
@@ -14,38 +14,34 @@
         android:layout="@layout/preference_material_shortcuts_top"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
-        android:title="@string/assistant"
-        app:singleLineTitle="false" />
+        android:title="@string/assistant" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_weather"
         android:key="weather_activity"
-        android:layout="@layout/preference_material_shortcuts_center"
+        android:layout="@layout/preference_material_shortcuts_middle"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
-        android:title="@string/weather"
-        app:singleLineTitle="false" />
+        android:title="@string/weather" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_password"
         android:key="password_manager_activity"
-        android:layout="@layout/preference_material_shortcuts_center"
+        android:layout="@layout/preference_material_shortcuts_middle"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
-        android:title="@string/password"
-        app:singleLineTitle="false" />
+        android:title="@string/password" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_game"
         android:key="game_activity"
-        android:layout="@layout/preference_material_shortcuts_center"
+        android:layout="@layout/preference_material_shortcuts_middle"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
-        android:title="@string/games"
-        app:singleLineTitle="false" />
+        android:title="@string/games" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
@@ -54,14 +50,12 @@
         android:layout="@layout/preference_material_shortcuts_bottom"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
-        android:title="@string/music_search_quick_settings"
-        app:singleLineTitle="false" />
+        android:title="@string/music_search_quick_settings" />
 
     <PreferenceCategory
+        android:layout="@layout/preference_material_category"
         android:title="@string/pref_category_other"
-        app:allowDividerAbove="false"
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false" />
+        app:allowDividerAbove="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
@@ -70,18 +64,16 @@
         android:key="device_game_manager"
         android:layout="@layout/preference_material_top"
         android:summary="@string/pref_device_game_manager_summary"
-        android:title="@string/pref_device_game_manager"
-        app:singleLineTitle="false" />
+        android:title="@string/pref_device_game_manager" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:dependency="password_manager_activity"
         android:icon="@drawable/ic_root"
         android:key="password_manager_root"
-        android:layout="@layout/preference_material_center"
+        android:layout="@layout/preference_material_middle"
         android:summary="@string/pref_password_manager_root_summary"
-        android:title="@string/pref_password_manager_root"
-        app:singleLineTitle="false" />
+        android:title="@string/pref_password_manager_root" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
@@ -89,30 +81,26 @@
         android:key="settings_activity"
         android:layout="@layout/preference_material_bottom"
         android:summary="@string/pref_hide_settings_summary"
-        android:title="@string/pref_show_settings"
-        app:singleLineTitle="false" />
+        android:title="@string/pref_show_settings" />
 
     <PreferenceCategory
+        android:layout="@layout/preference_material_category"
         android:title="@string/pref_category_about"
-        app:allowDividerAbove="false"
-        app:iconSpaceReserved="false"
-        app:singleLineTitle="false" />
+        app:allowDividerAbove="false" />
 
     <Preference
         android:icon="@drawable/ic_developer"
         android:key="developer"
         android:layout="@layout/preference_material_top"
         android:summary="@string/pref_developer"
-        android:title="@string/pref_wstxda"
-        app:singleLineTitle="false" />
+        android:title="@string/pref_wstxda" />
 
     <Preference
         android:icon="@drawable/ic_github"
         android:key="github_repository"
-        android:layout="@layout/preference_material_center"
+        android:layout="@layout/preference_material_middle"
         android:summary="@string/pref_source_code"
-        android:title="@string/pref_github"
-        app:singleLineTitle="false" />
+        android:title="@string/pref_github" />
 
     <Preference
         android:icon="@drawable/ic_about"
@@ -120,7 +108,6 @@
         android:layout="@layout/preference_material_bottom"
         android:selectable="false"
         android:summary="@string/pref_version_number"
-        android:title="@string/pref_version"
-        app:singleLineTitle="false" />
+        android:title="@string/pref_version" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file