diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07488d22..765553ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -395,6 +395,14 @@
     <string name="pref_category_backup">Backup</string>
     <string name="pref_category_extensions">Extensions</string>
     <string name="pref_category_actions">Actions</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_gestures">Gestures</string>
+    <string name="pref_category_player_features">Player features</string>
+    <string name="pref_category_subtitles">Subtitles</string>
+    <string name="pref_category_player_layout">Layout</string>
+    <string name="pref_category_defaults">Defaults</string>
+    <string name="pref_category_looks">Looks</string>
+    <string name="pref_category_ui_features">Features</string>
     <string name="category_general">General</string>
     <string name="random_button_settings">Random Button</string>
     <string name="random_button_settings_desc">Show random button on Homepage</string>
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index 0be6313f..d9b7e247 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -1,104 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Preference
-        android:icon="@drawable/ic_outline_subtitles_24"
-        android:key="@string/subtitle_settings_key"
-        android:title="@string/player_subtitles_settings"
-        app:summary="@string/player_subtitles_settings_des" />
-    <Preference
-        android:icon="@drawable/ic_outline_subtitles_24"
-        android:key="@string/subtitle_settings_chromecast_key"
-        android:title="@string/chromecast_subtitles_settings"
-        app:summary="@string/chromecast_subtitles_settings_des" />
-
-
-    <Preference
-        android:icon="@drawable/ic_baseline_hd_24"
-        android:key="@string/quality_pref_key"
-        android:title="@string/watch_quality_pref" />
-
-    <Preference
-        android:icon="@drawable/netflix_play"
-        android:key="@string/player_pref_key"
-        android:title="@string/player_pref" />
-
-    <Preference
-        android:icon="@drawable/ic_baseline_text_format_24"
-        android:key="@string/prefer_limit_title_key"
-        android:title="@string/limit_title" />
-
-    <Preference
-        android:icon="@drawable/ic_baseline_text_format_24"
-        android:key="@string/prefer_limit_title_rez_key"
-        android:title="@string/limit_title_rez" />
-
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
-        android:summary="@string/picture_in_picture_des"
-        android:title="@string/picture_in_picture"
-        app:defaultValue="true"
-        app:key="@string/pip_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_aspect_ratio_24"
-        android:summary="@string/player_size_settings_des"
-        android:title="@string/player_size_settings"
-        app:defaultValue="true"
-        app:key="@string/player_resize_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_speed_24"
-        android:summary="@string/eigengraumode_settings_des"
-        android:title="@string/eigengraumode_settings"
-        app:defaultValue="false"
-        app:key="@string/playback_speed_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_ondemand_video_24"
-        android:summary="@string/swipe_to_seek_settings_des"
-        android:title="@string/swipe_to_seek_settings"
-        app:defaultValue="true"
-        app:key="@string/swipe_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_ondemand_video_24"
-        android:summary="@string/swipe_to_change_settings_des"
-        android:title="@string/swipe_to_change_settings"
-        app:defaultValue="true"
-        app:key="@string/swipe_vertical_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_skip_next_24"
-        android:summary="@string/autoplay_next_settings_des"
-        android:title="@string/autoplay_next_settings"
-        app:defaultValue="true"
-        app:key="@string/autoplay_next_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_skip_next_24"
-        android:title="@string/video_skip_op"
-        app:defaultValue="true"
-        android:summary="@string/enable_skip_op_from_database_des"
-        app:key="@string/enable_skip_op_from_database" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_touch_app_24"
-        android:summary="@string/double_tap_to_seek_settings_des"
-        android:title="@string/double_tap_to_seek_settings"
-        app:defaultValue="false"
-        app:key="@string/double_tap_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/netflix_pause"
-        android:summary="@string/double_tap_to_pause_settings_des"
-        android:title="@string/double_tap_to_pause_settings"
-        app:defaultValue="false"
-        app:key="@string/double_tap_pause_enabled_key" />
-
-    <SeekBarPreference
-        android:defaultValue="10"
-        android:max="60"
-        android:title="@string/double_tap_to_seek_amount_settings"
-        app:adjustable="true"
-        app:defaultValue="10"
-        app:icon="@drawable/go_forward_30"
-        app:key="@string/double_tap_seek_time_key"
-        app:min="5"
-        app:seekBarIncrement="5"
-        app:showSeekBarValue="true" />
 
     <SwitchPreference
         android:icon="@drawable/baseline_sync_24"
@@ -107,26 +9,144 @@
         app:defaultValue="true"
         app:key="@string/episode_sync_enabled_key" />
 
-    <Preference
-        android:icon="@drawable/ic_baseline_storage_24"
-        android:key="@string/video_buffer_disk_key"
-        android:summary="@string/video_disk_description"
-        android:title="@string/video_buffer_disk_settings" />
+    <PreferenceCategory
+        android:title="@string/pref_category_defaults">
+        <Preference
+            android:icon="@drawable/ic_baseline_hd_24"
+            android:key="@string/quality_pref_key"
+            android:title="@string/watch_quality_pref" />
 
-    <Preference
-        android:icon="@drawable/ic_baseline_storage_24"
-        android:key="@string/video_buffer_size_key"
-        android:summary="@string/video_ram_description"
-        android:title="@string/video_buffer_size_settings" />
+        <Preference
+            android:icon="@drawable/netflix_play"
+            android:key="@string/player_pref_key"
+            android:title="@string/player_pref" />
+    </PreferenceCategory>
 
-    <Preference
-        android:icon="@drawable/ic_baseline_storage_24"
-        android:key="@string/video_buffer_length_key"
-        android:summary="@string/video_ram_description"
-        android:title="@string/video_buffer_length_settings" />
+    <PreferenceCategory
+        android:title="@string/pref_category_player_layout">
+        <Preference
+            android:icon="@drawable/ic_baseline_text_format_24"
+            android:key="@string/prefer_limit_title_key"
+            android:title="@string/limit_title" />
 
-    <Preference
-        android:icon="@drawable/ic_baseline_delete_outline_24"
-        android:key="@string/video_buffer_clear_key"
-        android:title="@string/video_buffer_clear_settings" />
+        <Preference
+            android:icon="@drawable/ic_baseline_text_format_24"
+            android:key="@string/prefer_limit_title_rez_key"
+            android:title="@string/limit_title_rez" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_category_subtitles">
+        <Preference
+            android:icon="@drawable/ic_outline_subtitles_24"
+            android:key="@string/subtitle_settings_key"
+            android:title="@string/player_subtitles_settings"
+            app:summary="@string/player_subtitles_settings_des" />
+        <Preference
+            android:icon="@drawable/ic_outline_subtitles_24"
+            android:key="@string/subtitle_settings_chromecast_key"
+            android:title="@string/chromecast_subtitles_settings"
+            app:summary="@string/chromecast_subtitles_settings_des" />
+    </PreferenceCategory>
+
+
+    <PreferenceCategory
+        android:title="@string/pref_category_player_features">
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
+            android:summary="@string/picture_in_picture_des"
+            android:title="@string/picture_in_picture"
+            app:defaultValue="true"
+            app:key="@string/pip_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_aspect_ratio_24"
+            android:summary="@string/player_size_settings_des"
+            android:title="@string/player_size_settings"
+            app:defaultValue="true"
+            app:key="@string/player_resize_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_speed_24"
+            android:summary="@string/eigengraumode_settings_des"
+            android:title="@string/eigengraumode_settings"
+            app:defaultValue="false"
+            app:key="@string/playback_speed_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_skip_next_24"
+            android:summary="@string/autoplay_next_settings_des"
+            android:title="@string/autoplay_next_settings"
+            app:defaultValue="true"
+            app:key="@string/autoplay_next_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_skip_next_24"
+            android:title="@string/video_skip_op"
+            app:defaultValue="true"
+            android:summary="@string/enable_skip_op_from_database_des"
+            app:key="@string/enable_skip_op_from_database" />
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+        android:title="@string/pref_category_gestures">
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_ondemand_video_24"
+            android:summary="@string/swipe_to_seek_settings_des"
+            android:title="@string/swipe_to_seek_settings"
+            app:defaultValue="true"
+            app:key="@string/swipe_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_ondemand_video_24"
+            android:summary="@string/swipe_to_change_settings_des"
+            android:title="@string/swipe_to_change_settings"
+            app:defaultValue="true"
+            app:key="@string/swipe_vertical_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_touch_app_24"
+            android:summary="@string/double_tap_to_seek_settings_des"
+            android:title="@string/double_tap_to_seek_settings"
+            app:defaultValue="false"
+            app:key="@string/double_tap_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/netflix_pause"
+            android:summary="@string/double_tap_to_pause_settings_des"
+            android:title="@string/double_tap_to_pause_settings"
+            app:defaultValue="false"
+            app:key="@string/double_tap_pause_enabled_key" />
+
+        <SeekBarPreference
+            android:defaultValue="10"
+            android:max="60"
+            android:title="@string/double_tap_to_seek_amount_settings"
+            app:adjustable="true"
+            app:defaultValue="10"
+            app:icon="@drawable/go_forward_30"
+            app:key="@string/double_tap_seek_time_key"
+            app:min="5"
+            app:seekBarIncrement="5"
+            app:showSeekBarValue="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_category_cache">
+        <Preference
+            android:icon="@drawable/ic_baseline_storage_24"
+            android:key="@string/video_buffer_disk_key"
+            android:summary="@string/video_disk_description"
+            android:title="@string/video_buffer_disk_settings" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_storage_24"
+            android:key="@string/video_buffer_size_key"
+            android:summary="@string/video_ram_description"
+            android:title="@string/video_buffer_size_settings" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_storage_24"
+            android:key="@string/video_buffer_length_key"
+            android:summary="@string/video_ram_description"
+            android:title="@string/video_buffer_length_settings" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_delete_outline_24"
+            android:key="@string/video_buffer_clear_key"
+            android:title="@string/video_buffer_clear_settings" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settins_ui.xml b/app/src/main/res/xml/settins_ui.xml
index 071df918..0d9115a1 100644
--- a/app/src/main/res/xml/settins_ui.xml
+++ b/app/src/main/res/xml/settins_ui.xml
@@ -1,57 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Preference
-            android:icon="@drawable/ic_baseline_color_lens_24"
-            android:key="@string/primary_color_key"
-            android:title="@string/primary_color_settings" />
-    <Preference
-            android:icon="@drawable/ic_baseline_color_lens_24"
-            android:key="@string/app_theme_key"
-            android:title="@string/app_theme_settings" />
-    <Preference
-            android:icon="@drawable/ic_baseline_tv_24"
-            android:key="@string/app_layout_key"
-            android:title="@string/app_layout" />
-    <Preference
-            android:icon="@drawable/ic_baseline_tv_24"
-            android:key="@string/poster_ui_key"
-            android:title="@string/poster_ui_settings" />
-    <SwitchPreference
-            android:icon="@drawable/search_icon"
-            app:key="advanced_search"
-            android:title="@string/advanced_search"
-            android:summary="@string/advanced_search_des"
-            app:defaultValue="true" />
-    <SwitchPreference
+
+    <PreferenceCategory
+        android:title="@string/pref_category_looks">
+        <Preference
+                android:icon="@drawable/ic_baseline_color_lens_24"
+                android:key="@string/primary_color_key"
+                android:title="@string/primary_color_settings" />
+        <Preference
+                android:icon="@drawable/ic_baseline_color_lens_24"
+                android:key="@string/app_theme_key"
+                android:title="@string/app_theme_settings" />
+        <Preference
+                android:icon="@drawable/ic_baseline_tv_24"
+                android:key="@string/app_layout_key"
+                android:title="@string/app_layout" />
+        <SwitchPreference
             android:defaultValue="true"
             android:icon="@drawable/baseline_grid_view_24"
             android:key="@string/bottom_title_key"
             android:summary="@string/bottom_title_settings_des"
             android:title="@string/bottom_title_settings" />
-    <SwitchPreference
-            android:key="@string/show_trailers_key"
-            android:icon="@drawable/baseline_theaters_24"
-            android:title="@string/show_trailers_settings"
-            android:defaultValue="true" />
-    <SwitchPreference
-            android:key="@string/show_kitsu_posters_key"
-            android:icon="@drawable/kitsu_icon"
-            android:title="@string/kitsu_settings"
-            android:defaultValue="true" />
-    <SwitchPreference
-            android:key="@string/show_fillers_key"
-            android:icon="@drawable/ic_baseline_skip_next_24"
-            android:title="@string/show_fillers_settings"
-            android:defaultValue="false" />
-    <SwitchPreference
-            android:icon="@drawable/ic_baseline_play_arrow_24"
-            app:key="@string/random_button_key"
-            android:title="@string/random_button_settings"
-            android:summary="@string/random_button_settings_desc"
-            app:defaultValue="false" />
-    <Preference
-        android:icon="@drawable/ic_baseline_filter_list_24"
-        android:key="@string/pref_filter_search_quality_key"
-        android:title="@string/pref_filter_search_quality" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_category_ui_features">
+        <Preference
+                android:icon="@drawable/ic_baseline_tv_24"
+                android:key="@string/poster_ui_key"
+                android:title="@string/poster_ui_settings" />
+        <SwitchPreference
+                android:icon="@drawable/search_icon"
+                app:key="advanced_search"
+                android:title="@string/advanced_search"
+                android:summary="@string/advanced_search_des"
+                app:defaultValue="true" />
+        <SwitchPreference
+                android:key="@string/show_trailers_key"
+                android:icon="@drawable/baseline_theaters_24"
+                android:title="@string/show_trailers_settings"
+                android:defaultValue="true" />
+        <SwitchPreference
+                android:key="@string/show_kitsu_posters_key"
+                android:icon="@drawable/kitsu_icon"
+                android:title="@string/kitsu_settings"
+                android:defaultValue="true" />
+        <SwitchPreference
+                android:key="@string/show_fillers_key"
+                android:icon="@drawable/ic_baseline_skip_next_24"
+                android:title="@string/show_fillers_settings"
+                android:defaultValue="false" />
+        <SwitchPreference
+                android:icon="@drawable/ic_baseline_play_arrow_24"
+                app:key="@string/random_button_key"
+                android:title="@string/random_button_settings"
+                android:summary="@string/random_button_settings_desc"
+                app:defaultValue="false" />
+        <Preference
+            android:icon="@drawable/ic_baseline_filter_list_24"
+            android:key="@string/pref_filter_search_quality_key"
+            android:title="@string/pref_filter_search_quality" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file