diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 8a4e6feee9..ef8a4dfc75 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -213,15 +213,15 @@ static void menu_action_setting_disp_set_label_pipeline(
 
    switch (settings->menu.xmb.shader_pipeline)
    {
-      case 0:
+      case XMB_SHADER_PIPELINE_WALLPAPER:
          strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len);
          break;
-      case 1:
+      case XMB_SHADER_PIPELINE_SIMPLE_RIBBON:
          strlcpy(s, 
                msg_hash_to_str(
                   MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED), len);
          break;
-      case 2:
+      case XMB_SHADER_PIPELINE_RIBBON:
          strlcpy(s, 
                msg_hash_to_str(
                   MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON), len);
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 4549cb04a0..61cadb8778 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1925,7 +1925,7 @@ static void xmb_draw_bg(
    menu_display_set_viewport();
 
 #ifdef HAVE_SHADERPIPELINE
-   if (settings->menu.xmb.shader_pipeline > 0
+   if (settings->menu.xmb.shader_pipeline > XMB_SHADER_PIPELINE_WALLPAPER 
          && 
          (settings->menu.xmb.menu_color_theme != XMB_THEME_WALLPAPER))
    {
@@ -1939,7 +1939,7 @@ static void xmb_draw_bg(
       menu_display_draw_gradient(&draw);
 
       draw.pipeline.id = VIDEO_SHADER_MENU_SEC;
-      if (settings->menu.xmb.shader_pipeline == 2)
+      if (settings->menu.xmb.shader_pipeline == XMB_SHADER_PIPELINE_RIBBON)
          draw.pipeline.id  = VIDEO_SHADER_MENU;
 
       menu_display_draw_pipeline(&draw);
diff --git a/menu/menu_display.c b/menu/menu_display.c
index ec1cdab204..33b6a030d7 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -481,7 +481,7 @@ bool menu_display_shader_pipeline_active(void)
    settings_t *settings          = config_get_ptr();
    if (!string_is_equal(menu_driver_ident(), "xmb"))
       return false;
-   if (settings->menu.xmb.shader_pipeline == 0)
+   if (settings->menu.xmb.shader_pipeline == XMB_SHADER_PIPELINE_WALLPAPER)
       return false;
    return true;
 }
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 3425734265..573f0a0cc5 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -56,6 +56,14 @@ enum xmb_color_theme
    XMB_THEME_LAST
 };
 
+enum xmb_shader_pipeline
+{
+   XMB_SHADER_PIPELINE_WALLPAPER = 0,
+   XMB_SHADER_PIPELINE_SIMPLE_RIBBON,
+   XMB_SHADER_PIPELINE_RIBBON,
+   XMB_SHADER_PIPELINE_LAST
+};
+
 enum menu_display_prim_type
 {
    MENU_DISPLAY_PRIM_NONE = 0,
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 228b1b70e0..b62fb1296c 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -6931,7 +6931,7 @@ static bool setting_append_list(
                   parent_group,
                   general_write_handler,
                   general_read_handler);
-            menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true);
+            menu_settings_list_current_add_range(list, list_info, 0, XMB_SHADER_PIPELINE_LAST-1, 1, true, true);
             menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_XMB_RIBBON_ENABLE);
 #endif