diff --git a/msg_hash.h b/msg_hash.h
index 0a7c91486a..a53ab0d955 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -664,14 +664,32 @@ enum msg_hash_enums
 
    /* Menu settings */
    MENU_ENUM_LABEL_MENU_WALLPAPER,
+   MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER,
+
    MENU_ENUM_LABEL_DYNAMIC_WALLPAPER,
+   MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
+
    MENU_ENUM_LABEL_PAUSE_NONACTIVE,
+   MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
+
    MENU_ENUM_LABEL_MOUSE_ENABLE,
+   MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
+
    MENU_ENUM_LABEL_POINTER_ENABLE,
+   MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
+
    MENU_ENUM_LABEL_MENU_LINEAR_FILTER,
+   MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER,
+
    MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND,
+   MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
+
    MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS,
+   MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
+
    MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE,
+   MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
+
    MENU_ENUM_LABEL_ENTRY_NORMAL_COLOR,
    MENU_ENUM_LABEL_ENTRY_HOVER_COLOR,
    MENU_ENUM_LABEL_XMB_ALPHA_FACTOR,
@@ -689,15 +707,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_TIMEDATE_ENABLE,
    MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME,
 
-   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,
@@ -816,31 +825,25 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_MENU_ENUM_THROTTLE_FRAMERATE,
    MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE,
 
-
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
 
-
    MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
    MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
 
    MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL,
    MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
 
-   MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
-
    MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
 
    MENU_ENUM_LABEL_CHEEVOS_ENABLE,
+   MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
 
 
    MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION,
-
    MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION,
 
-   MENU_ENUM_LABEL_VALUE_STATE_SLOT,
-
    MENU_ENUM_LABEL_STATE_SLOT,
-
+   MENU_ENUM_LABEL_VALUE_STATE_SLOT,
 
    MENU_ENUM_LABEL_PLAYLIST_SETTINGS_BEGIN,