diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 3d9f53fee1..5fa2c158be 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -111,7 +111,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_VIDEO_THREADED,
    MENU_ENUM_LABEL_VIDEO_VSYNC,
    MENU_ENUM_LABEL_VIDEO_HARD_SYNC,
-   MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION,
    MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX,
    MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO,
    MENU_ENUM_LABEL_VIDEO_REFRESH_RATE,
@@ -158,19 +157,79 @@ enum menu_hash_enums
 
    MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD,
 
+   /* Menu settings */
+   MENU_ENUM_LABEL_MENU_WALLPAPER,
+   MENU_ENUM_LABEL_DYNAMIC_WALLPAPER,
+   MENU_ENUM_LABEL_PAUSE_NONACTIVE,
+   MENU_ENUM_LABEL_MOUSE_ENABLE,
+   MENU_ENUM_LABEL_POINTER_ENABLE,
+   MENU_ENUM_LABEL_MENU_LINEAR_FILTER,
+   MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND,
+   MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS,
+   MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE,
+   MENU_ENUM_LABEL_ENTRY_NORMAL_COLOR,
+   MENU_ENUM_LABEL_ENTRY_HOVER_COLOR,
+   MENU_ENUM_LABEL_XMB_ALPHA_FACTOR,
+   MENU_ENUM_LABEL_XMB_FONT,
+   MENU_ENUM_LABEL_XMB_THEME,
+   MENU_ENUM_LABEL_XMB_GRADIENT,
+   MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE,
+   MENU_ENUM_LABEL_XMB_RIBBON_ENABLE,
+   MENU_ENUM_LABEL_THUMBNAILS,
+   MENU_ENUM_LABEL_TIMEDATE_ENABLE,
+
+   MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER,
+   MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
+   MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
+   MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
+   MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
+   MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER,
+   MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
+   MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
+   MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
+   MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
+   MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
+   MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+   MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
+   MENU_ENUM_LABEL_VALUE_XMB_FONT,
+   MENU_ENUM_LABEL_VALUE_XMB_THEME,
+   MENU_ENUM_LABEL_VALUE_XMB_GRADIENT,
+   MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
+   MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
+   MENU_ENUM_LABEL_VALUE_THUMBNAILS,
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
+
+   /* UI settings */
+   MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION,
+   MENU_ENUM_LABEL_UI_COMPANION_ENABLE,
+   MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT,
+   MENU_ENUM_LABEL_UI_MENUBAR_ENABLE,
+
+   MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
+   MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE,
+   MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT,
+   MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
+
+   /* Menu file browser */
+   MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS,
+   MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
+   MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
+
+   /* Playlists */
+   MENU_ENUM_LABEL_HISTORY_LIST_ENABLE,
+   MENU_ENUM_LABEL_CONTENT_HISTORY_SIZE,
+
+   MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE,
+   MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE,
 
    MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE,
-   MENU_ENUM_LABEL_MENU_WALLPAPER,
-   MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER,
-   MENU_ENUM_LABEL_MENU_LINEAR_FILTER,
-   MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER,
 
 
-   MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS,
-
    MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
    MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY,
 
+   /* Help */
+
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN,
@@ -182,6 +241,17 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD,
 
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_UP,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_DOWN,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_BACK,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_INFO,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_MENU,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD,
+
    MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_TOGGLE_ENABLE,
 
    MENU_ENUM_LABEL_MENU_SETTINGS,
@@ -201,8 +271,6 @@ enum menu_hash_enums
 
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
 
-   MENU_ENUM_LABEL_UI_COMPANION_ENABLE,
-   MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE,
 
    MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
    MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
@@ -269,16 +337,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_VALUE_HELP_CONTROLS,
    MENU_ENUM_LABEL_HELP_CONTROLS,
 
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_UP,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_DOWN,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_BACK,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_INFO,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_MENU,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT,
-   MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD,
 
    MENU_ENUM_LABEL_VALUE_EXTRACTING_PLEASE_WAIT,
 
@@ -429,14 +487,8 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_CORE_ENABLE,
    MENU_ENUM_LABEL_VALUE_CORE_ENABLE,
 
-   MENU_ENUM_LABEL_MOUSE_ENABLE,
-   MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
 
-   MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS,
-   MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
 
-   MENU_ENUM_LABEL_POINTER_ENABLE,
-   MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
 
    MENU_ENUM_LABEL_COLLAPSE_SUBGROUPS_ENABLE,
    MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE,
@@ -455,11 +507,7 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_NO_ITEMS,
    MENU_ENUM_LABEL_VALUE_NO_ITEMS,
 
-   MENU_ENUM_LABEL_UI_MENUBAR_ENABLE,
-   MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
 
-   MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT,
-   MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT,
 
    MENU_ENUM_LABEL_ARCHIVE_MODE,
    MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE,
@@ -529,8 +577,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_R_Y_PLUS,
    MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,
    MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT,
-   MENU_ENUM_LABEL_PAUSE_NONACTIVE,
-   MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
    MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE,
    MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
    MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
@@ -553,8 +599,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_REWIND_GRANULARITY,
    MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
    MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION,
-   MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE,
-   MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
    MENU_ENUM_LABEL_VALUE_VIDEO_THREADED,
    MENU_ENUM_LABEL_VALUE_RUN,
    MENU_ENUM_LABEL_SCREEN_RESOLUTION,
@@ -562,12 +606,6 @@ enum menu_hash_enums
 
    MENU_ENUM_LABEL_TITLE_COLOR,
    MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
-   MENU_ENUM_LABEL_TIMEDATE_ENABLE,
-   MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
-   MENU_ENUM_LABEL_ENTRY_NORMAL_COLOR,
-   MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
-   MENU_ENUM_LABEL_ENTRY_HOVER_COLOR,
-   MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
    MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
    MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
    MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE,
@@ -577,7 +615,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE,
    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD,
    MENU_ENUM_LABEL_SYSTEM_DIRECTORY,
-   MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
    MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE,
    MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE,
    MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE,
@@ -585,19 +622,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE,
    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
    MENU_ENUM_LABEL_XMB_SCALE_FACTOR,
-   MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
-   MENU_ENUM_LABEL_XMB_ALPHA_FACTOR,
-   MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
-   MENU_ENUM_LABEL_XMB_FONT,
-   MENU_ENUM_LABEL_VALUE_XMB_FONT,
-   MENU_ENUM_LABEL_XMB_THEME,
-   MENU_ENUM_LABEL_VALUE_XMB_THEME,
-   MENU_ENUM_LABEL_XMB_GRADIENT,
-   MENU_ENUM_LABEL_VALUE_XMB_GRADIENT,
-   MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE,
-   MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
-   MENU_ENUM_LABEL_XMB_RIBBON_ENABLE,
-   MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
    MENU_ENUM_LABEL_VOLUME_UP,
    MENU_ENUM_LABEL_VOLUME_DOWN,
    MENU_ENUM_LABEL_LOG_VERBOSITY,
@@ -640,10 +664,6 @@ enum menu_hash_enums
 
    MENU_ENUM_LABEL_MENU_ENUM_WALLPAPER,
    MENU_ENUM_LABEL_VALUE_MENU_ENUM_WALLPAPER,
-   MENU_ENUM_LABEL_DYNAMIC_WALLPAPER,
-   MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
-   MENU_ENUM_LABEL_THUMBNAILS,
-   MENU_ENUM_LABEL_VALUE_THUMBNAILS,
 
    MENU_ENUM_LABEL_FASTFORWARD_RATIO,
    MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO,
@@ -871,10 +891,6 @@ enum menu_hash_enums
 
    MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE,
    MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE,
-   MENU_ENUM_LABEL_HISTORY_LIST_ENABLE,
-   MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE,
-   MENU_ENUM_LABEL_CONTENT_HISTORY_SIZE,
-   MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE,
    MENU_ENUM_LABEL_DETECT_CORE_LIST,
    MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST,
    MENU_ENUM_LABEL_DETECT_CORE_LIST_OK,
@@ -892,10 +908,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
    MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN,
    MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
-   MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND,
-   MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
-   MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
-   MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
    MENU_ENUM_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
    MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
    MENU_ENUM_LABEL_CLOSE_CONTENT,