diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index d8ca553e05..fca16c5d87 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -1157,6 +1157,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
          return "system_information_cpu_cores";
       case MENU_ENUM_LABEL_NO_ITEMS:
          return "no_items";
+      case MENU_ENUM_LABEL_NO_SHADER_PARAMETERS:
+         return "no_shader_parameters.";
       case MENU_ENUM_LABEL_SETTINGS_TAB:
          return "settings_tab";
       case MENU_ENUM_LABEL_HISTORY_TAB:
@@ -1575,6 +1577,10 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
          return "core_specific_config";
       case MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS:
          return "game_specific_options";
+      case MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_CREATE:
+         return "game_specific_options_create";
+      case MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_IN_USE:
+         return "game_specific_options_in_use";
       case MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE:
          return "auto_overrides_enable";
       case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 15a1f144c8..8bf5dffd8e 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2315,7 +2315,7 @@ loop:
       menu_entries_add_enum(info->list,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND),
             msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND),
-            MSG_UNKNOWN,
+            MENU_ENUM_LABEL_NO_SETTINGS_FOUND,
             0, 0, 0);
 
    return 0;
@@ -2484,7 +2484,7 @@ loop:
       menu_entries_add_enum(info->list,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND),
             msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND),
-            MSG_UNKNOWN,
+            MENU_ENUM_LABEL_NO_SETTINGS_FOUND,
             0, 0, 0);
 
    return 0;
@@ -4392,8 +4392,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          {
             menu_entries_add_enum(info->list,
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS),
-                  "",
-                  MSG_UNKNOWN,
+                  msg_hash_to_str(MENU_ENUM_LABEL_NO_SHADER_PARAMETERS),
+                  MENU_ENUM_LABEL_NO_SHADER_PARAMETERS,
                   0, 0, 0);
             ret = 0;
          }
@@ -4463,7 +4463,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          {
 #ifdef HAVE_NETWORKING
             char new_label[PATH_MAX_LENGTH] = {0};
-            fill_pathname_join(new_label, settings->network.buildbot_assets_url, "cores", sizeof(new_label));
+            fill_pathname_join(new_label,
+                  settings->network.buildbot_assets_url,
+                  "cores", sizeof(new_label));
             print_buf_lines(info->list, core_buf, new_label,
                   core_len, FILE_TYPE_DOWNLOAD_URL);
             info->need_push    = true;
@@ -4691,14 +4693,18 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                if (!runloop_ctl(RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE, NULL))
                   menu_entries_add_enum(info->list,
                         msg_hash_to_str(
-                           MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE), "",
-                        MSG_UNKNOWN,
+                           MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE),
+                        msg_hash_to_str(
+                           MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_CREATE),
+                        MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_CREATE,
                         MENU_SETTINGS_CORE_OPTION_CREATE, 0, 0);
                else
                   menu_entries_add_enum(info->list,
                         msg_hash_to_str(
-                           MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE), "",
-                        MSG_UNKNOWN, 
+                           MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE),
+                        msg_hash_to_str(
+                           MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_IN_USE),
+                        MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS_IN_USE,
                         MENU_SETTINGS_CORE_OPTION_CREATE, 0, 0);
             }
             if (opts == 0)
diff --git a/msg_hash.h b/msg_hash.h
index 3ef6705eac..0ee813413c 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -739,6 +739,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND,
 
    MENU_ENUM_LABEL_NO_ITEMS,
+   MENU_ENUM_LABEL_NO_SHADER_PARAMETERS,
    MENU_ENUM_LABEL_VALUE_NO_ITEMS,
 
 
@@ -815,8 +816,10 @@ enum msg_hash_enums
    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,