diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c47b240..499aad95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,11 +24,17 @@
     <string name="incomplete_prod_keys">Incomplete production keys</string>
     <!-- Settings - Emulator -->
     <string name="emulator">Emulator</string>
-    <string name="search_location">Search Location</string>
     <string name="open_data_directory">View Internal Directory</string>
     <string name="open_data_directory_summary">Opens Skyline\'s internal directory in a file manager</string>
     <string name="failed_open_directory">Cannot find an external file manager to open Skyline\'s internal directory</string>
     <string name="theme">Theme</string>
+    <string name="perf_stats">Show Performance Statistics</string>
+    <string name="perf_stats_desc_off">Performance Statistics will not be shown</string>
+    <string name="perf_stats_desc_on">Performance Statistics will be shown in the top-left corner</string>
+    <string name="log_level">Log Level</string>
+    <!-- Settings - App List -->
+    <string name="app_list">App List</string>
+    <string name="search_location">Search Location</string>
     <string name="layout_type">Game Display Layout</string>
     <string name="group_by_format">Group Games By Format</string>
     <string name="group_by_format_desc_off">Games will be shown as a single list</string>
@@ -37,16 +43,6 @@
     <string name="select_action">Always Show Game Information</string>
     <string name="select_action_desc_on">Game information will be shown on clicking a game</string>
     <string name="select_action_desc_off">Game information will only be shown on long-clicking a game</string>
-    <string name="perf_stats">Show Performance Statistics</string>
-    <string name="shader_cache">Disable shader cache</string>
-    <string name="perf_stats_desc_off">Performance Statistics will not be shown</string>
-    <string name="perf_stats_desc_on">Performance Statistics will be shown in the top-left corner</string>
-    <string name="shader_cache_disabled">Cached shaders won\'t be loaded, will cause stutters</string>
-    <string name="shader_cache_enabled">Cached shaders will be loaded, can heavily reduce stuttering</string>
-    <string name="log_level">Log Level</string>
-    <string name="gpu_driver_config">GPU Driver Configuration</string>
-    <string name="gpu_driver_config_desc">Active driver: %1$s</string>
-    <string name="gpu_driver_config_desc_unsupported">Your device doesn\'t support custom drivers</string>
     <!-- Settings - System -->
     <string name="system">System</string>
     <string name="use_docked">Use Docked Mode</string>
@@ -82,6 +78,11 @@
     <string name="respect_display_cutout">Respect Display Cutout</string>
     <string name="respect_display_cutout_enabled">Do not draw UI elements in the cutout area</string>
     <string name="respect_display_cutout_disabled">Allow UI elements to be drawn in the cutout area</string>
+    <!-- Settings - GPU -->
+    <string name="gpu">GPU</string>
+    <string name="gpu_driver_config">GPU Driver Configuration</string>
+    <string name="gpu_driver_config_desc">Active driver: %1$s</string>
+    <string name="gpu_driver_config_desc_unsupported">Your device doesn\'t support custom drivers</string>
     <string name="executor_slot_count_scale">Executor Slot Count Scale</string>
     <string name="executor_slot_count_scale_desc">Scale controlling the maximum number of simultaneous GPU executions (Higher may sometimes perform better but will use more RAM)</string>
     <string name="executor_flush_threshold">Executor Flush Threshold</string>
@@ -91,6 +92,9 @@
     <string name="force_max_gpu_clocks">Force Maximum GPU Clocks</string>
     <string name="force_max_gpu_clocks_desc">Forces the GPU to run at its maximum possible clock speed (May cause excessive heating and power usage)</string>
     <string name="force_max_gpu_clocks_desc_unsupported">Your device does not support forcing maximum GPU clocks</string>
+    <string name="shader_cache">Disable shader cache</string>
+    <string name="shader_cache_disabled">Cached shaders won\'t be loaded, will cause stutters</string>
+    <string name="shader_cache_enabled">Cached shaders will be loaded, can heavily reduce stuttering</string>
     <!-- Settings - Hacks -->
     <string name="hacks">Hacks</string>
     <string name="enable_fast_gpu_readback">Enable fast GPU readback</string>
@@ -102,7 +106,6 @@
     <string name="disable_subgroup_shuffle">Disable GPU subgroup shuffle</string>
     <string name="disable_subgroup_shuffle_enabled">Shader subgroup shuffle operations are disabled, may cause severe graphical issues</string>
     <string name="disable_subgroup_shuffle_disabled">Shader subgroup shuffle operations are enabled, ensures maximum accuracy</string>
-
     <!-- Settings - Audio -->
     <string name="audio">Audio</string>
     <string name="disable_audio_output">Disable Audio Output</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 79f05eab..09938e97 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,9 +3,6 @@
     <PreferenceCategory
         android:key="category_emulator"
         android:title="@string/emulator">
-        <emu.skyline.preference.FolderPickerPreference
-            app:key="search_location"
-            app:title="@string/search_location" />
         <emu.skyline.preference.DocumentsProviderPreference
             app:key="document_provider"
             app:summary="@string/open_data_directory_summary"
@@ -16,32 +13,6 @@
             app:key="app_theme"
             app:title="@string/theme"
             app:useSimpleSummaryProvider="true" />
-        <emu.skyline.preference.IntegerListPreference
-            android:defaultValue="1"
-            android:entries="@array/layout_type"
-            app:key="layout_type"
-            app:title="@string/layout_type"
-            app:useSimpleSummaryProvider="true" />
-        <emu.skyline.preference.RefreshCheckBoxPreference
-            android:defaultValue="true"
-            android:summaryOff="@string/group_by_format_desc_off"
-            android:summaryOn="@string/group_by_format_desc_on"
-            app:key="group_by_format"
-            app:refreshRequired="true"
-            app:title="@string/group_by_format" />
-        <emu.skyline.preference.IntegerListPreference
-            android:defaultValue="0"
-            android:entries="@array/sort_apps_by"
-            app:key="sort_apps_by"
-            app:refreshRequired="true"
-            app:title="@string/sort_apps_by"
-            app:useSimpleSummaryProvider="true" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:summaryOff="@string/select_action_desc_off"
-            android:summaryOn="@string/select_action_desc_on"
-            app:key="select_action"
-            app:title="@string/select_action" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:summaryOff="@string/perf_stats_desc_off"
@@ -54,9 +25,40 @@
             app:key="log_level"
             app:title="@string/log_level"
             app:useSimpleSummaryProvider="true" />
-        <emu.skyline.preference.GpuDriverPreference
-            app:key="gpu_driver"
-            app:title="@string/gpu_driver_config" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:key="category_applist"
+        android:title="@string/app_list"
+        app:initialExpandedChildrenCount="3">
+        <emu.skyline.preference.FolderPickerPreference
+            app:key="search_location"
+            app:title="@string/search_location" />
+        <emu.skyline.preference.IntegerListPreference
+            android:defaultValue="1"
+            android:entries="@array/layout_type"
+            app:key="layout_type"
+            app:title="@string/layout_type"
+            app:useSimpleSummaryProvider="true" />
+        <emu.skyline.preference.IntegerListPreference
+            android:defaultValue="0"
+            android:entries="@array/sort_apps_by"
+            app:key="sort_apps_by"
+            app:refreshRequired="true"
+            app:title="@string/sort_apps_by"
+            app:useSimpleSummaryProvider="true" />
+        <emu.skyline.preference.RefreshCheckBoxPreference
+            android:defaultValue="true"
+            android:summaryOff="@string/group_by_format_desc_off"
+            android:summaryOn="@string/group_by_format_desc_on"
+            app:key="group_by_format"
+            app:refreshRequired="true"
+            app:title="@string/group_by_format" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:summaryOff="@string/select_action_desc_off"
+            android:summaryOn="@string/select_action_desc_on"
+            app:key="select_action"
+            app:title="@string/select_action" />
     </PreferenceCategory>
     <PreferenceCategory
         android:key="category_keys"
@@ -113,6 +115,18 @@
             app:key="orientation"
             app:title="@string/screen_orientation"
             app:useSimpleSummaryProvider="true" />
+        <emu.skyline.preference.IntegerListPreference
+            android:defaultValue="0"
+            android:entries="@array/aspect_ratios"
+            app:key="aspect_ratio"
+            app:title="@string/aspect_ratio"
+            app:useSimpleSummaryProvider="true" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:summaryOff="@string/respect_display_cutout_disabled"
+            android:summaryOn="@string/respect_display_cutout_enabled"
+            app:key="respect_display_cutout"
+            app:title="@string/respect_display_cutout" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:summaryOff="@string/triple_buffering_disabled"
@@ -132,34 +146,29 @@
             android:summaryOn="@string/max_refresh_rate_enabled"
             app:key="max_refresh_rate"
             app:title="@string/max_refresh_rate" />
-        <emu.skyline.preference.IntegerListPreference
-            android:defaultValue="0"
-            android:entries="@array/aspect_ratios"
-            app:key="aspect_ratio"
-            app:title="@string/aspect_ratio"
-            app:useSimpleSummaryProvider="true" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:summaryOff="@string/respect_display_cutout_disabled"
-            android:summaryOn="@string/respect_display_cutout_enabled"
-            app:key="respect_display_cutout"
-            app:title="@string/respect_display_cutout" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:key="category_gpu"
+        android:title="@string/gpu">
+        <emu.skyline.preference.GpuDriverPreference
+            app:key="gpu_driver"
+            app:title="@string/gpu_driver_config" />
         <SeekBarPreference
-            android:min="1"
             android:defaultValue="4"
             android:max="6"
+            android:min="1"
             android:summary="@string/executor_slot_count_scale_desc"
             app:key="executor_slot_count_scale"
-            app:title="@string/executor_slot_count_scale"
-            app:showSeekBarValue="true" />
+            app:showSeekBarValue="true"
+            app:title="@string/executor_slot_count_scale" />
         <SeekBarPreference
-            android:min="0"
             android:defaultValue="256"
             android:max="1024"
+            android:min="0"
             android:summary="@string/executor_flush_threshold_desc"
             app:key="executor_flush_threshold"
-            app:title="@string/executor_flush_threshold"
-            app:showSeekBarValue="true" />
+            app:showSeekBarValue="true"
+            app:title="@string/executor_flush_threshold" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:summary="@string/use_direct_memory_import_desc"
@@ -237,8 +246,7 @@
     </PreferenceCategory>
     <PreferenceCategory
         android:key="category_credits"
-        android:title="@string/credits">
-    </PreferenceCategory>
+        android:title="@string/credits" />
     <PreferenceCategory
         android:key="category_licenses"
         android:title="@string/licenses"