diff --git a/msg_hash.h b/msg_hash.h
index 62562fd9fe..ce5f1b44da 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -622,36 +622,16 @@ enum msg_hash_enums
    MENU_LABEL(XMB_FONT),
    MENU_LABEL(XMB_THEME),
    MENU_LABEL(XMB_MENU_COLOR_THEME),
-
-   MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE,
-   MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
-
-   MENU_ENUM_LABEL_XMB_SHOW_SETTINGS,
-   MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS,
-
-   MENU_ENUM_LABEL_XMB_SHOW_IMAGES,
-   MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES,
-
-   MENU_ENUM_LABEL_XMB_SHOW_MUSIC,
-   MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC,
-
-   MENU_ENUM_LABEL_XMB_SHOW_VIDEO,
-   MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO,
-
-   MENU_ENUM_LABEL_XMB_SHOW_HISTORY,
-   MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY,
-
-   MENU_ENUM_LABEL_XMB_RIBBON_ENABLE,
-   MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
-
-   MENU_ENUM_LABEL_THUMBNAILS,
-   MENU_ENUM_LABEL_VALUE_THUMBNAILS,
-
-   MENU_ENUM_LABEL_TIMEDATE_ENABLE,
-   MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
-
-   MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME,
-   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME,
+   MENU_LABEL(XMB_SHADOWS_ENABLE),
+   MENU_LABEL(XMB_SHOW_SETTINGS),
+   MENU_LABEL(XMB_SHOW_IMAGES),
+   MENU_LABEL(XMB_SHOW_MUSIC),
+   MENU_LABEL(XMB_SHOW_VIDEO),
+   MENU_LABEL(XMB_SHOW_HISTORY),
+   MENU_LABEL(XMB_RIBBON_ENABLE),
+   MENU_LABEL(THUMBNAILS),
+   MENU_LABEL(TIMEDATE_ENABLE),
+   MENU_LABEL(MATERIALUI_MENU_COLOR_THEME),
 
    /* UI settings */
    MENU_LABEL(VIDEO_DISABLE_COMPOSITION),
@@ -727,11 +707,8 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_CONNECT_WIFI,
 
-   MENU_ENUM_LABEL_MENU_ENUM_LINEAR_FILTER,
-   MENU_ENUM_LABEL_VALUE_MENU_ENUM_LINEAR_FILTER,
-
+   MENU_LABEL(MENU_ENUM_LINEAR_FILTER),
    MENU_LABEL(MENU_ENUM_THROTTLE_FRAMERATE),
-
    MENU_LABEL(STATE_SLOT),
 
    MENU_ENUM_LABEL_PLAYLIST_SETTINGS_BEGIN,
@@ -755,8 +732,8 @@ enum msg_hash_enums
    MENU_LABEL(CHEEVOS_LOCKED_ACHIEVEMENTS),
    MENU_LABEL(ACCOUNTS_RETRO_ACHIEVEMENTS),
 
-   MENU_ENUM_LABEL_ACCOUNTS_LIST,
-   MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST,
+   MENU_LABEL(ACCOUNTS_LIST),
+
    MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST_END,
 
    MENU_ENUM_LABEL_VALUE_MENU_ENUM_CONTROLS_PROLOG,
@@ -956,71 +933,51 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_R_X_MINUS,
    MENU_ENUM_LABEL_R_Y_MINUS,
    MENU_ENUM_LABEL_R_Y_PLUS,
-   MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE,
-   MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
-   MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG,
-   MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG,
-   MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS,
-   MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
-   MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_CREATE,
-   MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE,
-   MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE,
-   MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_IN_USE,
-   MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE,
-   MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
-   MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE,
-   MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
-   MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE,
-   MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
-   MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN,
-   MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN,
-   MENU_ENUM_LABEL_SCREENSHOT,
-   MENU_ENUM_LABEL_REWIND_GRANULARITY,
-   MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
-   MENU_ENUM_LABEL_VALUE_RUN,
-   MENU_ENUM_LABEL_SCREEN_RESOLUTION,
-   MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION,
 
+   MENU_LABEL(BLOCK_SRAM_OVERWRITE),
+   MENU_LABEL(CORE_SPECIFIC_CONFIG),
+   MENU_LABEL(GAME_SPECIFIC_OPTIONS),
+   MENU_LABEL(GAME_SPECIFIC_OPTIONS_CREATE),
+   MENU_LABEL(GAME_SPECIFIC_OPTIONS_IN_USE),
+   MENU_LABEL(AUTO_OVERRIDES_ENABLE),
+   MENU_LABEL(AUTO_REMAPS_ENABLE),
+   MENU_LABEL(AUTO_SHADERS_ENABLE),
+   MENU_LABEL(RGUI_SHOW_START_SCREEN),
+
+   MENU_ENUM_LABEL_SCREENSHOT,
+
+   MENU_LABEL(REWIND_GRANULARITY),
+
+   MENU_ENUM_LABEL_VALUE_RUN,
+
+   MENU_LABEL(SCREEN_RESOLUTION),
    MENU_LABEL(TITLE_COLOR),
    MENU_LABEL(SAVESTATE_AUTO_INDEX),
    MENU_LABEL(SAVESTATE_AUTO_SAVE),
    MENU_LABEL(SAVESTATE_AUTO_LOAD),
 
    MENU_LABEL(SUSPEND_SCREENSAVER_ENABLE),
-
-   MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE,
-   MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-   MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE,
-   MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
+   MENU_LABEL(DPI_OVERRIDE_ENABLE),
+   MENU_LABEL(DPI_OVERRIDE_VALUE),
    MENU_ENUM_LABEL_VOLUME_UP,
    MENU_ENUM_LABEL_VOLUME_DOWN,
 
    MENU_LABEL(LOG_VERBOSITY),
 
    MENU_ENUM_LABEL_OVERLAY_NEXT,
-   MENU_ENUM_LABEL_NETPLAY_ENABLE,
-   MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE,
 
+   MENU_LABEL(NETPLAY_ENABLE),
    MENU_LABEL(SSH_ENABLE),
    MENU_LABEL(SAMBA_ENABLE),
    MENU_LABEL(BLUETOOTH_ENABLE),
-
-   MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT,
-   MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT,
-   MENU_ENUM_LABEL_NETPLAY_DELAY_FRAMES,
-   MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES,
-   MENU_ENUM_LABEL_NETPLAY_CHECK_FRAMES,
-   MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES,
-   MENU_ENUM_LABEL_NETPLAY_SPECTATOR_MODE_ENABLE,
-   MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE,
-   MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT,
-   MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT,
-   MENU_ENUM_LABEL_SORT_SAVEFILES_ENABLE,
-   MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
-   MENU_ENUM_LABEL_SORT_SAVESTATES_ENABLE,
-   MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
-   MENU_ENUM_LABEL_NETPLAY_IP_ADDRESS,
-   MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
+   MENU_LABEL(NETPLAY_CLIENT_SWAP_INPUT),
+   MENU_LABEL(NETPLAY_DELAY_FRAMES),
+   MENU_LABEL(NETPLAY_CHECK_FRAMES),
+   MENU_LABEL(NETPLAY_SPECTATOR_MODE_ENABLE),
+   MENU_LABEL(NETPLAY_TCP_UDP_PORT),
+   MENU_LABEL(SORT_SAVEFILES_ENABLE),
+   MENU_LABEL(SORT_SAVESTATES_ENABLE),
+   MENU_LABEL(NETPLAY_IP_ADDRESS),
    MENU_LABEL(NETPLAY_MODE),
    MENU_LABEL(PERFCNT_ENABLE),
    MENU_LABEL(OVERLAY_SCALE),
@@ -1086,79 +1043,44 @@ enum msg_hash_enums
 
    /* RDB Settings */
 
-   MENU_ENUM_LABEL_RDB_ENTRY_ANALOG,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG,
-   MENU_ENUM_LABEL_RDB_ENTRY_SERIAL,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SERIAL,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RUMBLE,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_COOP,
-   MENU_ENUM_LABEL_RDB_ENTRY_RUMBLE,
-   MENU_ENUM_LABEL_RDB_ENTRY_COOP,
-   MENU_ENUM_LABEL_RDB_ENTRY_START_CONTENT,
-   MENU_ENUM_LABEL_RDB_ENTRY_DESCRIPTION,
-   MENU_ENUM_LABEL_RDB_ENTRY_GENRE,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ENHANCEMENT_HW,
-   MENU_ENUM_LABEL_RDB_ENTRY_ENHANCEMENT_HW,
-   MENU_ENUM_LABEL_RDB_ENTRY_FRANCHISE,
-   MENU_ENUM_LABEL_RDB_ENTRY_ORIGIN,
-   MENU_ENUM_LABEL_RDB_ENTRY_DEVELOPER,
-   MENU_ENUM_LABEL_RDB_ENTRY_NAME,
-   MENU_ENUM_LABEL_RDB_ENTRY_PUBLISHER,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ESRB_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_ESRB_RATING,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_BBFC_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_BBFC_RATING,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ELSPA_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_ELSPA_RATING,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PEGI_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_PEGI_RATING,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CERO_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_CERO_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_RATING,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_ISSUE,
-   MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_ISSUE,
-   MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_REVIEW,
-   MENU_ENUM_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_TGDB_RATING,
-   MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_MONTH,
-   MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_YEAR,
-   MENU_ENUM_LABEL_RDB_ENTRY_MAX_USERS,
-   MENU_ENUM_LABEL_RDB_ENTRY_SHA1,
-   MENU_ENUM_LABEL_RDB_ENTRY_MD5,
-   MENU_ENUM_LABEL_RDB_ENTRY_CRC32,
-
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_START_CONTENT,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PUBLISHER,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DEVELOPER,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FRANCHISE,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING,
-
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW,
-
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FAMITSU_MAGAZINE_RATING,
-
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING,
-
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MAX_USERS,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MD5,
-   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CRC32,
+   MENU_LABEL(RDB_ENTRY_ANALOG),
+   MENU_LABEL(RDB_ENTRY_SERIAL),
+   MENU_LABEL(RDB_ENTRY_RUMBLE),
+   MENU_LABEL(RDB_ENTRY_COOP),
+   MENU_LABEL(RDB_ENTRY_START_CONTENT),
+   MENU_LABEL(RDB_ENTRY_DESCRIPTION),
+   MENU_LABEL(RDB_ENTRY_GENRE),
+   MENU_LABEL(RDB_ENTRY_ENHANCEMENT_HW),
+   MENU_LABEL(RDB_ENTRY_FRANCHISE),
+   MENU_LABEL(RDB_ENTRY_ORIGIN),
+   MENU_LABEL(RDB_ENTRY_DEVELOPER),
+   MENU_LABEL(RDB_ENTRY_NAME),
+   MENU_LABEL(RDB_ENTRY_PUBLISHER),
+   MENU_LABEL(RDB_ENTRY_ESRB_RATING),
+   MENU_LABEL(RDB_ENTRY_BBFC_RATING),
+   MENU_LABEL(RDB_ENTRY_ELSPA_RATING),
+   MENU_LABEL(RDB_ENTRY_PEGI_RATING),
+   MENU_LABEL(RDB_ENTRY_CERO_RATING),
+   MENU_LABEL(RDB_ENTRY_EDGE_MAGAZINE_RATING),
+   MENU_LABEL(RDB_ENTRY_EDGE_MAGAZINE_ISSUE),
+   MENU_LABEL(RDB_ENTRY_EDGE_MAGAZINE_REVIEW),
+   MENU_LABEL(RDB_ENTRY_FAMITSU_MAGAZINE_RATING),
+   MENU_LABEL(RDB_ENTRY_TGDB_RATING),
+   MENU_LABEL(RDB_ENTRY_RELEASE_MONTH),
+   MENU_LABEL(RDB_ENTRY_RELEASE_YEAR),
+   MENU_LABEL(RDB_ENTRY_MAX_USERS),
+   MENU_LABEL(RDB_ENTRY_SHA1),
+   MENU_LABEL(RDB_ENTRY_MD5),
+   MENU_LABEL(RDB_ENTRY_CRC32),
 
    MENU_LABEL(NO_PLAYLIST_ENTRIES_AVAILABLE),
 
    MENU_ENUM_LABEL_VIDEO_SHADER_DEFAULT_FILTER,
    MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS,
    MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS,
-   MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES,
-   MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES,
-   MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES,
-   MENU_ENUM_LABEL_CHEAT_NUM_PASSES,
+
+   MENU_LABEL(VIDEO_SHADER_NUM_PASSES),
+   MENU_LABEL(CHEAT_NUM_PASSES),
 
    MENU_ENUM_LABEL_VALUE_NO_DISK,