diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 90b49f7e..cf9e7899 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -208,7 +208,6 @@ dependencies {
 
     // Oneplus UI
     implementation(libs.oneplus.ui)
-
 }
 
 tasks.register("printVersionName") {
diff --git a/app/src/main/res/layout/custom_preference_illustration.xml b/app/src/main/res/layout/custom_preference_illustration.xml
index 09ec6b05..2060f907 100644
--- a/app/src/main/res/layout/custom_preference_illustration.xml
+++ b/app/src/main/res/layout/custom_preference_illustration.xml
@@ -21,7 +21,8 @@
     android:gravity="center"
     android:clickable="false"
     android:importantForAccessibility="noHideDescendants"
-    android:layout_margin="@dimen/preference_card_margin_horizontal"
+    android:layout_marginHorizontal="@dimen/preference_card_margin_horizontal"
+    android:layout_marginTop="@dimen/preference_card_margin_horizontal"
     android:orientation="horizontal">
 
     <FrameLayout
diff --git a/app/src/main/res/xml/aod_prefs.xml b/app/src/main/res/xml/aod_prefs.xml
index 0222586c..da0e113a 100644
--- a/app/src/main/res/xml/aod_prefs.xml
+++ b/app/src/main/res/xml/aod_prefs.xml
@@ -6,17 +6,20 @@
         android:key="sb_illustration"
         app:lottie_rawRes="@raw/aod_illustration" />
 
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodClock"
-        android:key="aod_clock"
-        android:title="@string/aod_clock"
-        app:forcePosition="top"
-        app:iconSpaceReserved="false" />
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodWeather"
-        android:key="aod_weather"
-        android:title="@string/aod_weather"
-        app:iconSpaceReserved="false" />
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodClock"
+            android:key="aod_clock"
+            android:title="@string/aod_clock"
+            app:iconSpaceReserved="false" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodWeather"
+            android:key="aod_weather"
+            android:title="@string/aod_weather"
+            app:iconSpaceReserved="false" />
+
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/aod_weather_prefs.xml b/app/src/main/res/xml/aod_weather_prefs.xml
index 47bef112..b02abd76 100644
--- a/app/src/main/res/xml/aod_weather_prefs.xml
+++ b/app/src/main/res/xml/aod_weather_prefs.xml
@@ -10,7 +10,7 @@
         app:forcePosition="full"
         app:iconSpaceReserved="false" />
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusMenuPreference
             android:defaultValue="2"
@@ -68,9 +68,9 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="aod_weather_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="aod_weather_prefs">
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="true"
@@ -126,9 +126,9 @@
             app:minVal="13"
             app:valueFormat="dp" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="aod_weather_colors_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="aod_weather_colors_prefs">
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -145,7 +145,7 @@
             android:title="@string/custom_color"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory android:title="@string/weather_custom_location_title">
 
@@ -164,7 +164,7 @@
 
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oxygencustomizer.ui.preferences.ListWithPopUpPreference
             android:dependency="aod_weather_enabled"
@@ -208,6 +208,6 @@
             app:minVal="0"
             app:valueFormat="dp" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/battery_bar_settings.xml b/app/src/main/res/xml/battery_bar_settings.xml
index 8a9743ce..35d6819f 100644
--- a/app/src/main/res/xml/battery_bar_settings.xml
+++ b/app/src/main/res/xml/battery_bar_settings.xml
@@ -11,7 +11,7 @@
         app:forcePosition="full"
         app:iconSpaceReserved="false" />
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -52,9 +52,9 @@
             android:summaryOn="@string/general_on"
             android:title="@string/BB_center_align_title"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -113,9 +113,9 @@
             android:key="batteryPowerSaveColor"
             android:title="@string/BB_batteryPowerSaveColor"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSliderPreference
             android:key="batteryWarningRange"
@@ -149,6 +149,6 @@
             android:title="@string/BB_batteryWarningColor"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/colors_prefs.xml b/app/src/main/res/xml/colors_prefs.xml
index 30dab7b2..ab3d804c 100644
--- a/app/src/main/res/xml/colors_prefs.xml
+++ b/app/src/main/res/xml/colors_prefs.xml
@@ -7,13 +7,15 @@
         app:lottie_cacheComposition="false"
         app:lottie_rawRes="@raw/themes_illustration" />
 
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory/>
+
     <it.dhd.oxygencustomizer.ui.preferences.OplusColorPreference
         android:key="primary_color"
         android:title="@string/primary_color"
         app:cpv_showAlphaSlider="true"
         app:forcePosition="full" />
 
-    <PreferenceCategory/>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory/>
 
     <it.dhd.oneplusui.preference.OplusPreference
         android:key="apply_colors"
diff --git a/app/src/main/res/xml/gesture_prefs.xml b/app/src/main/res/xml/gesture_prefs.xml
index fbe41293..6baff225 100644
--- a/app/src/main/res/xml/gesture_prefs.xml
+++ b/app/src/main/res/xml/gesture_prefs.xml
@@ -44,7 +44,7 @@
             app:iconSpaceReserved="false" />
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -79,7 +79,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory
         android:key="nav_pill_cat"
diff --git a/app/src/main/res/xml/lockscreen_weather_prefs.xml b/app/src/main/res/xml/lockscreen_weather_prefs.xml
index 5c791e52..919c418f 100644
--- a/app/src/main/res/xml/lockscreen_weather_prefs.xml
+++ b/app/src/main/res/xml/lockscreen_weather_prefs.xml
@@ -25,7 +25,7 @@
         app:forcePosition="full"
         app:iconSpaceReserved="false" />
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusMenuPreference
             android:defaultValue="2"
@@ -83,9 +83,9 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="lockscreen_weather_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="lockscreen_weather_prefs">
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="true"
@@ -141,9 +141,9 @@
             app:minVal="13"
             app:valueFormat="dp" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="lockscreen_weather_colors_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="lockscreen_weather_colors_prefs">
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
             android:key="weather_custom_color_switch"
@@ -158,7 +158,7 @@
             android:key="weather_custom_color"
             android:title="@string/custom_color"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory android:title="@string/weather_custom_location_title">
 
@@ -177,7 +177,7 @@
 
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oxygencustomizer.ui.preferences.ListWithPopUpPreference
             android:dependency="lockscreen_weather_enabled"
@@ -230,6 +230,6 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/memc_overview.xml b/app/src/main/res/xml/memc_overview.xml
index 4374539a..d82bf98a 100644
--- a/app/src/main/res/xml/memc_overview.xml
+++ b/app/src/main/res/xml/memc_overview.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusPreference
             android:key="memc_feature_on"
@@ -34,9 +34,9 @@
             android:title="@string/memc_mode"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -58,7 +58,7 @@
             android:summary="@string/custom_memc_configuration_summary"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oxygencustomizer.ui.preferences.FooterPreference
         android:key="footer"
diff --git a/app/src/main/res/xml/misc_prefs.xml b/app/src/main/res/xml/misc_prefs.xml
index 82a598b2..412e5869 100644
--- a/app/src/main/res/xml/misc_prefs.xml
+++ b/app/src/main/res/xml/misc_prefs.xml
@@ -6,23 +6,26 @@
         android:key="sb_illustration"
         app:lottie_rawRes="@raw/misc_illustration" />
 
-    <it.dhd.oneplusui.preference.OplusSwitchPreference
-        android:defaultValue="false"
-        android:key="misc_remove_rotate_floating"
-        android:summaryOff="@string/general_off"
-        android:summaryOn="@string/general_on"
-        android:title="@string/misc_remove_rotate_floating_title"
-        app:forcePosition="top"
-        app:iconSpaceReserved="false" />
-
-    <it.dhd.oneplusui.preference.OplusSwitchPreference
-        android:defaultValue="false"
-        android:key="remove_usb_dialog"
-        android:summary="@string/remove_usb_dialog_summary"
-        android:title="@string/remove_usb_dialog"
-        app:forcePosition="bottom"
-        app:iconSpaceReserved="false" />
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
+        <it.dhd.oneplusui.preference.OplusSwitchPreference
+            android:defaultValue="false"
+            android:key="misc_remove_rotate_floating"
+            android:summaryOff="@string/general_off"
+            android:summaryOn="@string/general_on"
+            android:title="@string/misc_remove_rotate_floating_title"
+            app:forcePosition="top"
+            app:iconSpaceReserved="false" />
+
+        <it.dhd.oneplusui.preference.OplusSwitchPreference
+            android:defaultValue="false"
+            android:key="remove_usb_dialog"
+            android:summary="@string/remove_usb_dialog_summary"
+            android:title="@string/remove_usb_dialog"
+            app:forcePosition="bottom"
+            app:iconSpaceReserved="false" />
+
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory
         android:title="@string/misc_power_menu"
@@ -126,9 +129,9 @@
         app:iconSpaceReserved="false">
 
         <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.misc.MemcFragment"
             android:key="memc_prefs"
             android:title="@string/memc_page_title"
-            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.misc.MemcFragment"
             app:iconSpaceReserved="false" />
 
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
diff --git a/app/src/main/res/xml/mods.xml b/app/src/main/res/xml/mods.xml
index bb99ef92..084dc517 100644
--- a/app/src/main/res/xml/mods.xml
+++ b/app/src/main/res/xml/mods.xml
@@ -3,96 +3,98 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:search="http://schemas.android.com/apk/it.dhd.oxygencustomizer.ui.preferences.preferencesearch">
 
-    <it.dhd.oxygencustomizer.ui.preferences.preferencesearch.SearchPreference
-        android:key="searchPreference" />
+    <it.dhd.oxygencustomizer.ui.preferences.preferencesearch.SearchPreference android:key="searchPreference" />
 
     <it.dhd.oxygencustomizer.ui.preferences.IllustrationPreference
         android:key="sb_illustration"
         app:lottie_rawRes="@raw/main" />
 
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_statusbar"
-        android:key="statusbar"
-        android:title="@string/statusbar_title"
-        app:forcePosition="top"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Statusbar"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_qs"
-        android:key="quick_settings"
-        android:title="@string/quick_settings_title"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.quicksettings.QuickSettings"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_mods_qs_header"
-        android:key="qs_header"
-        android:title="@string/qs_header_title"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.qsheader.QsHeader"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_navigationbar"
-        android:key="navbar"
-        android:title="@string/navbar_title"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Navigation"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_buttons"
-        android:key="buttons"
-        android:title="@string/buttons_title"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Buttons"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_navbar_home"
-        android:key="launcher"
-        android:title="@string/launcher_title"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Launcher"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_mods_lockscreen"
-        android:key="lockscreen"
-        android:title="@string/lockscreen_title"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.lockscreen.Lockscreen"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_aod"
-        android:key="aod"
-        android:title="@string/aod_title"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$Aod"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_volume"
-        android:key="sound"
-        android:title="@string/sound"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$Sound"
-        search:ignore="true" />
-
-    <!-- not ready <it.dhd.oneplusui.preference.OplusJumpPreferencerence
-        android:icon="@drawable/ic_mods_package_manager"
-        android:key="package_manager"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$PackageManager"
-        android:title="@string/package_manager"
-        search:ignore="true"/> -->
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_colors"
-        android:key="colors"
-        android:title="@string/colors"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.ColorsFragment"
-        search:ignore="true" />
-
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:icon="@drawable/ic_mods_misc"
-        android:key="misc"
-        android:title="@string/misc"
-        app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$Misc"
-        search:ignore="true" />
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_statusbar"
+            android:key="statusbar"
+            android:title="@string/statusbar_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Statusbar"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_qs"
+            android:key="quick_settings"
+            android:title="@string/quick_settings_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.quicksettings.QuickSettings"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_mods_qs_header"
+            android:key="qs_header"
+            android:title="@string/qs_header_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.qsheader.QsHeader"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_navigationbar"
+            android:key="navbar"
+            android:title="@string/navbar_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Navigation"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_buttons"
+            android:key="buttons"
+            android:title="@string/buttons_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Buttons"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_navbar_home"
+            android:key="launcher"
+            android:title="@string/launcher_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.Launcher"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_mods_lockscreen"
+            android:key="lockscreen"
+            android:title="@string/lockscreen_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.lockscreen.Lockscreen"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_aod"
+            android:key="aod"
+            android:title="@string/aod_title"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$Aod"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_volume"
+            android:key="sound"
+            android:title="@string/sound"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$Sound"
+            search:ignore="true" />
+
+        <!-- not ready <it.dhd.oneplusui.preference.OplusJumpPreferencerence
+            android:icon="@drawable/ic_mods_package_manager"
+            android:key="package_manager"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$PackageManager"
+            android:title="@string/package_manager"
+            search:ignore="true"/> -->
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_colors"
+            android:key="colors"
+            android:title="@string/colors"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.ColorsFragment"
+            search:ignore="true" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:icon="@drawable/ic_mods_misc"
+            android:key="misc"
+            android:title="@string/misc"
+            app:fragment="it.dhd.oxygencustomizer.ui.fragments.Mods$Misc"
+            search:ignore="true" />
+
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/navbar_settings.xml b/app/src/main/res/xml/navbar_settings.xml
index 5cfd996d..462618e8 100644
--- a/app/src/main/res/xml/navbar_settings.xml
+++ b/app/src/main/res/xml/navbar_settings.xml
@@ -6,6 +6,8 @@
         android:key="sb_illustration"
         app:lottie_rawRes="@raw/nav_illustration" />
 
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory/>
+
     <it.dhd.oneplusui.preference.OplusJumpPreference
         android:key="gesturenav_header"
         android:title="@string/gesture_navigation_title"
diff --git a/app/src/main/res/xml/qs_header_image_prefs.xml b/app/src/main/res/xml/qs_header_image_prefs.xml
index 4a1877dc..d818f0f7 100644
--- a/app/src/main/res/xml/qs_header_image_prefs.xml
+++ b/app/src/main/res/xml/qs_header_image_prefs.xml
@@ -2,17 +2,17 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
             android:key="qs_header_image_enabled"
             android:summary="@string/qs_header_image_enabled_summary"
             android:title="@string/qs_header_image_enabled_title"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
         <it.dhd.oxygencustomizer.ui.preferences.ListWithPopUpPreference
             android:defaultValue="-1"
             android:dependency="qs_header_image_enabled"
@@ -29,9 +29,9 @@
             android:title="@string/file_header_select_title"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusMenuPreference
             android:defaultValue="0"
@@ -95,9 +95,9 @@
             android:title="@string/qs_header_image_landscape_enabled_title"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSliderPreference
             android:dependency="qs_header_image_enabled"
@@ -124,7 +124,7 @@
             android:title="@string/qs_header_image_zoomtofit_title"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/statusbar_notifications.xml b/app/src/main/res/xml/statusbar_notifications.xml
index 8d2f1595..78f42a59 100644
--- a/app/src/main/res/xml/statusbar_notifications.xml
+++ b/app/src/main/res/xml/statusbar_notifications.xml
@@ -87,7 +87,7 @@
             app:iconSpaceReserved="false" />
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:key="customizeClearButton"
@@ -123,6 +123,6 @@
             android:title="@string/clear_all_icon_color"
             app:cpv_showAlphaSlider="true"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/weather_settings.xml b/app/src/main/res/xml/weather_settings.xml
index 7eeb0f0d..9ff58e10 100644
--- a/app/src/main/res/xml/weather_settings.xml
+++ b/app/src/main/res/xml/weather_settings.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusMenuPreference
             android:defaultValue="2"
@@ -54,7 +54,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory android:title="@string/weather_custom_location_title">
 
@@ -72,13 +72,13 @@
 
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oxygencustomizer.ui.preferences.ListWithPopUpPreference
             android:key="weather_icon_pack"
             android:title="@string/weather_icon_pack_title"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index af00f507..e0701c16 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ persian-date-time = "4.2.1"
 okhttp = "4.12.0"
 image-cropper = "4.6.0"
 commons-text = "1.12.0"
-oneplus-ui = "1.3.4"
+oneplus-ui = "1.3.5"
 
 [libraries]