diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fb06c03..a7956bad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -390,6 +390,11 @@
         responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
         CloudStream 3 at your own risk.
     </string>
+    <string name="pref_category_links">Links</string>
+    <string name="pref_category_app_updates">App updates</string>
+    <string name="pref_category_backup">Backup</string>
+    <string name="pref_category_extensions">Extensions</strings>
+    <string name="pref_category_actions">Actions</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_updates.xml b/app/src/main/res/xml/settings_updates.xml
index b974b2fd..ba098c8c 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -1,39 +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:title="@string/check_for_update"
-        app:icon="@drawable/ic_baseline_system_update_24"
-        app:key="@string/manual_check_update_key"
-        app:summary="@string/app_version" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_developer_mode_24"
-        android:summary="@string/uprereleases_settings_des"
-        android:title="@string/uprereleases_settings"
-        app:defaultValue="@bool/is_prerelease"
-        app:key="@string/prerelease_update_key" />
-
-    <Preference
-        android:icon="@drawable/netflix_download"
-        android:key="@string/apk_installer_key"
-        android:title="@string/apk_installer_settings"
-        android:summary="@string/apk_installer_settings_des"
-        />
-
-    <Preference
-        android:icon="@drawable/baseline_save_as_24"
-        android:key="@string/backup_key"
-        android:title="@string/backup_settings" />
-
-    <Preference
-        android:icon="@drawable/baseline_restore_page_24"
-        android:key="@string/restore_key"
-        android:title="@string/restore_settings" />
-
-    <Preference
-        android:icon="@drawable/baseline_description_24"
-        android:key="@string/show_logcat_key"
-        android:title="@string/show_log_cat" />
     <SwitchPreference
         android:defaultValue="false"
         android:icon="@drawable/ic_baseline_bug_report_24"
@@ -41,25 +8,73 @@
         android:summaryOff="@string/bug_report_settings_off"
         android:summaryOn="@string/bug_report_settings_on"
         android:title="@string/pref_disable_acra" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@drawable/ic_baseline_extension_24"
-        android:key="@string/auto_update_plugins_key"
-        android:title="@string/automatic_plugin_updates" />
-    <SwitchPreference
-        android:defaultValue="false"
-        android:icon="@drawable/ic_baseline_extension_24"
-        android:key="@string/auto_download_plugins_key"
-        android:title="@string/automatic_plugin_download"
-        android:summary="@string/automatic_plugin_download_summary" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_notifications_active_24"
-        android:summary="@string/updates_settings_des"
-        android:title="@string/updates_settings"
-        app:defaultValue="true"
-        app:key="@string/auto_update_key" />
-    <Preference
-        android:icon="@drawable/ic_baseline_construction_24"
-        android:title="@string/redo_setup_process"
-        app:key="@string/redo_setup_key" />
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_app_updates">
+        <Preference
+            android:title="@string/check_for_update"
+            app:icon="@drawable/ic_baseline_system_update_24"
+            app:key="@string/manual_check_update_key"
+            app:summary="@string/app_version" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_developer_mode_24"
+            android:summary="@string/uprereleases_settings_des"
+            android:title="@string/uprereleases_settings"
+            app:defaultValue="@bool/is_prerelease"
+            app:key="@string/prerelease_update_key" />
+
+        <Preference
+            android:icon="@drawable/netflix_download"
+            android:key="@string/apk_installer_key"
+            android:title="@string/apk_installer_settings"
+            android:summary="@string/apk_installer_settings_des"
+            />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_notifications_active_24"
+            android:summary="@string/updates_settings_des"
+            android:title="@string/updates_settings"
+            app:defaultValue="true"
+            app:key="@string/auto_update_key" />
+    </PreferenceCategory>
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_backup">
+        <Preference
+            android:icon="@drawable/baseline_save_as_24"
+            android:key="@string/backup_key"
+            android:title="@string/backup_settings" />
+
+        <Preference
+            android:icon="@drawable/baseline_restore_page_24"
+            android:key="@string/restore_key"
+            android:title="@string/restore_settings" />
+    </PreferenceCategory>
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_extensions">
+        <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_baseline_extension_24"
+            android:key="@string/auto_update_plugins_key"
+            android:title="@string/automatic_plugin_updates" />
+        
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_baseline_extension_24"
+            android:key="@string/auto_download_plugins_key"
+            android:title="@string/automatic_plugin_download"
+            android:summary="@string/automatic_plugin_download_summary" />
+    </PreferenceCategory>
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_actions">
+        <Preference
+            android:icon="@drawable/baseline_description_24"
+            android:key="@string/show_logcat_key"
+            android:title="@string/show_log_cat" />
+        <Preference
+            android:icon="@drawable/ic_baseline_construction_24"
+            android:title="@string/redo_setup_process"
+            app:key="@string/redo_setup_key" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settins_general.xml b/app/src/main/res/xml/settins_general.xml
index ae87c611..726f3fd0 100644
--- a/app/src/main/res/xml/settins_general.xml
+++ b/app/src/main/res/xml/settins_general.xml
@@ -29,33 +29,39 @@
             android:icon="@drawable/ic_baseline_warning_24" />
 
     <Preference
-            android:title="@string/github"
-            android:icon="@drawable/ic_github_logo"
-            app:summary="https://github.com/recloudstream/cloudstream">
-        <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/recloudstream/cloudstream" />
-    </Preference>
+        android:key="@string/benene_count"
+        android:title="@string/benene"
+        android:icon="@drawable/benene"
+        app:summary="@string/benene_des" />
 
-    <Preference
-            android:title="@string/lightnovel"
-            android:icon="@drawable/quick_novel_icon"
-            app:summary="https://github.com/LagradOst/QuickNovel">
-        <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/LagradOst/QuickNovel" />
-    </Preference>
-    <Preference
-            android:title="@string/discord"
-            android:icon="@drawable/ic_baseline_discord_24"
-            app:summary="https://discord.gg/5Hus6fM">
-        <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://discord.gg/5Hus6fM" />
-    </Preference>
-    <Preference
-            android:key="@string/benene_count"
-            android:title="@string/benene"
-            android:icon="@drawable/benene"
-            app:summary="@string/benene_des" />
+    <PreferenceCategory
+            android:title="@string/pref_category_links">
+
+        <Preference
+                android:title="@string/github"
+                android:icon="@drawable/ic_github_logo"
+                app:summary="https://github.com/recloudstream/cloudstream">
+            <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/recloudstream/cloudstream" />
+        </Preference>
+
+        <Preference
+                android:title="@string/lightnovel"
+                android:icon="@drawable/quick_novel_icon"
+                app:summary="https://github.com/LagradOst/QuickNovel">
+            <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/LagradOst/QuickNovel" />
+        </Preference>
+        <Preference
+                android:title="@string/discord"
+                android:icon="@drawable/ic_baseline_discord_24"
+                app:summary="https://discord.gg/5Hus6fM">
+            <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://discord.gg/5Hus6fM" />
+        </Preference>
+    
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file