diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 9e23d7bf02..366b49f354 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -4261,11 +4261,11 @@ static bool setting_append_list(
             CONFIG_BOOL(
                   list, list_info,
                   tmp_b,
-                  menu_hash_to_str(MENU_LABEL_PERFCNT_ENABLE),
-                  menu_hash_to_str(MENU_LABEL_VALUE_PERFCNT_ENABLE),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_PERFCNT_ENABLE),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE),
                   false,
-                  menu_hash_to_str(MENU_VALUE_OFF),
-                  menu_hash_to_str(MENU_VALUE_ON),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON),
                   &group_info,
                   &subgroup_info,
                   parent_group,
@@ -4337,8 +4337,8 @@ static bool setting_append_list(
          CONFIG_UINT(
                list, list_info,
                &settings->autosave_interval,
-               menu_hash_to_str(MENU_LABEL_AUTOSAVE_INTERVAL),
-               menu_hash_to_str(MENU_LABEL_VALUE_AUTOSAVE_INTERVAL),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_AUTOSAVE_INTERVAL),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL),
                autosave_interval,
                &group_info,
                &subgroup_info,
@@ -4356,11 +4356,11 @@ static bool setting_append_list(
          CONFIG_BOOL(
                list, list_info,
                &settings->savestate_auto_index,
-               menu_hash_to_str(MENU_LABEL_SAVESTATE_AUTO_INDEX),
-               menu_hash_to_str(MENU_LABEL_VALUE_SAVESTATE_AUTO_INDEX),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX),
                savestate_auto_index,
-               menu_hash_to_str(MENU_VALUE_OFF),
-               menu_hash_to_str(MENU_VALUE_ON),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+               menu_hash_to_str_enum(MENU_VALUE_ON),
                &group_info,
                &subgroup_info,
                parent_group,
@@ -4372,11 +4372,11 @@ static bool setting_append_list(
          CONFIG_BOOL(
                list, list_info,
                &settings->savestate_auto_save,
-               menu_hash_to_str(MENU_LABEL_SAVESTATE_AUTO_SAVE),
-               menu_hash_to_str(MENU_LABEL_VALUE_SAVESTATE_AUTO_SAVE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE),
                savestate_auto_save,
-               menu_hash_to_str(MENU_VALUE_OFF),
-               menu_hash_to_str(MENU_VALUE_ON),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON),
                &group_info,
                &subgroup_info,
                parent_group,
@@ -4388,11 +4388,11 @@ static bool setting_append_list(
          CONFIG_BOOL(
                list, list_info,
                &settings->savestate_auto_load,
-               menu_hash_to_str(MENU_LABEL_SAVESTATE_AUTO_LOAD),
-               menu_hash_to_str(MENU_LABEL_VALUE_SAVESTATE_AUTO_LOAD),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD),
                savestate_auto_load,
-               menu_hash_to_str(MENU_VALUE_OFF),
-               menu_hash_to_str(MENU_VALUE_ON),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON),
                &group_info,
                &subgroup_info,
                parent_group,
@@ -4469,11 +4469,11 @@ static bool setting_append_list(
          CONFIG_BOOL(
                list, list_info,
                &settings->ui.suspend_screensaver_enable,
-               menu_hash_to_str(MENU_LABEL_SUSPEND_SCREENSAVER_ENABLE),
-               menu_hash_to_str(MENU_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE),
                true,
-               menu_hash_to_str(MENU_VALUE_OFF),
-               menu_hash_to_str(MENU_VALUE_ON),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON),
                &group_info,
                &subgroup_info,
                parent_group,
@@ -4511,8 +4511,8 @@ static bool setting_append_list(
          CONFIG_UINT(
                list, list_info,
                &settings->video.monitor_index,
-               menu_hash_to_str(MENU_LABEL_VIDEO_MONITOR_INDEX),
-               menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_MONITOR_INDEX),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX),
                monitor_index,
                &group_info,
                &subgroup_info,
@@ -4531,11 +4531,11 @@ static bool setting_append_list(
             CONFIG_BOOL(
                   list, list_info,
                   &settings->video.fullscreen,
-                  menu_hash_to_str(MENU_LABEL_VIDEO_FULLSCREEN),
-                  menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_FULLSCREEN),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VIDEO_FULLSCREEN),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN),
                   fullscreen,
-                  menu_hash_to_str(MENU_VALUE_OFF),
-                  menu_hash_to_str(MENU_VALUE_ON),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON),
                   &group_info,
                   &subgroup_info,
                   parent_group,
@@ -4624,8 +4624,8 @@ static bool setting_append_list(
          CONFIG_UINT(
                list, list_info,
                &settings->video.aspect_ratio_idx,
-               menu_hash_to_str(MENU_LABEL_VIDEO_ASPECT_RATIO_INDEX),
-               menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX),
                aspect_ratio_idx,
                &group_info,
                &subgroup_info,
@@ -4847,11 +4847,11 @@ static bool setting_append_list(
          CONFIG_BOOL(
                list, list_info,
                &settings->video.threaded,
-               menu_hash_to_str(MENU_LABEL_VIDEO_THREADED),
-               menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_THREADED),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VIDEO_THREADED),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_VIDEO_THREADED),
                video_threaded,
-               menu_hash_to_str(MENU_VALUE_OFF),
-               menu_hash_to_str(MENU_VALUE_ON),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON),
                &group_info,
                &subgroup_info,
                parent_group,
@@ -4866,11 +4866,11 @@ static bool setting_append_list(
          CONFIG_BOOL(
                list, list_info,
                &settings->video.vsync,
-               menu_hash_to_str(MENU_LABEL_VIDEO_VSYNC),
-               menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_VSYNC),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VIDEO_VSYNC),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC),
                vsync,
-               menu_hash_to_str(MENU_VALUE_OFF),
-               menu_hash_to_str(MENU_VALUE_ON),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_OFF),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ON),
                &group_info,
                &subgroup_info,
                parent_group,
@@ -5086,8 +5086,8 @@ static bool setting_append_list(
          CONFIG_FLOAT(
                list, list_info,
                &settings->audio.volume,
-               menu_hash_to_str(MENU_LABEL_AUDIO_VOLUME),
-               menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_VOLUME),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_AUDIO_VOLUME),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME),
                audio_volume,
                "%.1f",
                &group_info,
@@ -5237,8 +5237,8 @@ static bool setting_append_list(
                list, list_info,
                settings->audio.device,
                sizeof(settings->audio.device),
-               menu_hash_to_str(MENU_LABEL_AUDIO_DEVICE),
-               menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_DEVICE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_AUDIO_DEVICE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE),
                "",
                &group_info,
                &subgroup_info,
@@ -5253,8 +5253,8 @@ static bool setting_append_list(
          CONFIG_UINT(
                list, list_info,
                &settings->audio.out_rate,
-               menu_hash_to_str(MENU_LABEL_AUDIO_OUTPUT_RATE),
-               menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_OUTPUT_RATE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE),
                out_rate,
                &group_info,
                &subgroup_info,
@@ -5297,8 +5297,8 @@ static bool setting_append_list(
             CONFIG_UINT(
                   list, list_info,
                   &settings->input.max_users,
-                  menu_hash_to_str(MENU_LABEL_INPUT_MAX_USERS),
-                  menu_hash_to_str(MENU_LABEL_VALUE_INPUT_MAX_USERS),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_INPUT_MAX_USERS),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS),
                   input_max_users,
                   &group_info,
                   &subgroup_info,
@@ -7620,10 +7620,10 @@ static bool setting_append_list(
                list, list_info,
                global->dir.savestate,
                sizeof(global->dir.savestate),
-               menu_hash_to_str(MENU_LABEL_SAVESTATE_DIRECTORY),
-               menu_hash_to_str(MENU_LABEL_VALUE_SAVESTATE_DIRECTORY),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_SAVESTATE_DIRECTORY),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY),
                "",
-               menu_hash_to_str(MENU_VALUE_DIRECTORY_CONTENT),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT),
                &group_info,
                &subgroup_info,
                parent_group,
@@ -7635,10 +7635,10 @@ static bool setting_append_list(
                list, list_info,
                settings->directory.cache,
                sizeof(settings->directory.cache),
-               menu_hash_to_str(MENU_LABEL_CACHE_DIRECTORY),
-               menu_hash_to_str(MENU_LABEL_VALUE_CACHE_DIRECTORY),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_CACHE_DIRECTORY),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY),
                "",
-               menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE),
                &group_info,
                &subgroup_info,
                parent_group,