diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index d3791d8ae0..8d4a674ed1 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1767,7 +1767,7 @@ static INLINE void gl_draw_texture(gl_t *gl)
    glBindTexture(GL_TEXTURE_2D, gl->menu_texture);
 
    shader_info.data       = gl;
-   shader_info.idx        = GL_SHADER_STOCK_BLEND;
+   shader_info.idx        = VIDEO_SHADER_STOCK_BLEND;
    shader_info.set_active = true;
 
    video_shader_driver_ctl(SHADER_CTL_USE, &shader_info);
@@ -3606,7 +3606,7 @@ static void gl_render_overlay(gl_t *gl)
 
    /* Ensure that we reset the attrib array. */
    shader_info.data       = gl;
-   shader_info.idx        = GL_SHADER_STOCK_BLEND;
+   shader_info.idx        = VIDEO_SHADER_STOCK_BLEND;
    shader_info.set_active = true;
 
    video_shader_driver_ctl(SHADER_CTL_USE, &shader_info);
diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index 98afa1b789..81cc384d93 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -407,7 +407,7 @@ static void gl_raster_font_setup_viewport(gl_raster_t *font, bool full_screen)
    glBindTexture(GL_TEXTURE_2D, font->tex);
 
    shader_info.data       = NULL;
-   shader_info.idx        = GL_SHADER_STOCK_BLEND;
+   shader_info.idx        = VIDEO_SHADER_STOCK_BLEND;
    shader_info.set_active = true;
 
    video_shader_driver_ctl(SHADER_CTL_USE, &shader_info);
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 3ae35c6b2d..a6441f8be3 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -342,7 +342,7 @@ static void gl_cg_set_params(void *data, void *shader_data,
 
    if (!cg_data || (cg_data->active_idx == 0))
          return;
-   if (cg_data->active_idx == GL_SHADER_STOCK_BLEND)
+   if (cg_data->active_idx == VIDEO_SHADER_STOCK_BLEND)
       return;
 
    /* Set frame. */
@@ -1147,7 +1147,7 @@ static void *gl_cg_init(void *data, const char *path)
    cg_data->prg[cg_data->shader->passes + 1] = cg_data->prg[0]; 
 
    /* No need to apply Android hack in Cg. */
-   cg_data->prg[GL_SHADER_STOCK_BLEND] = cg_data->prg[0];
+   cg_data->prg[VIDEO_SHADER_STOCK_BLEND] = cg_data->prg[0];
 
    cgGLBindProgram(cg_data->prg[1].fprg);
    cgGLBindProgram(cg_data->prg[1].vprg);
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 09503686db..372debc581 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -1007,18 +1007,18 @@ static void *gl_glsl_init(void *data, const char *path)
 
       gl_glsl_compile_program(
             glsl,
-            GL_SHADER_STOCK_BLEND,
-            &glsl->prg[GL_SHADER_STOCK_BLEND],
+            VIDEO_SHADER_STOCK_BLEND,
+            &glsl->prg[VIDEO_SHADER_STOCK_BLEND],
             &shader_prog_info
             );
 
-      gl_glsl_find_uniforms(glsl, 0, glsl->prg[GL_SHADER_STOCK_BLEND].id,
-            &glsl->uniforms[GL_SHADER_STOCK_BLEND]);
+      gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_STOCK_BLEND].id,
+            &glsl->uniforms[VIDEO_SHADER_STOCK_BLEND]);
    }
    else
    {
-      glsl->prg[GL_SHADER_STOCK_BLEND] = glsl->prg[0];
-      glsl->uniforms[GL_SHADER_STOCK_BLEND] = glsl->uniforms[0];
+      glsl->prg[VIDEO_SHADER_STOCK_BLEND] = glsl->prg[0];
+      glsl->uniforms[VIDEO_SHADER_STOCK_BLEND] = glsl->uniforms[0];
    }
 
    shader_prog_info.vertex   = stock_vertex_xmb;
@@ -1027,8 +1027,8 @@ static void *gl_glsl_init(void *data, const char *path)
 
    gl_glsl_compile_program(
          glsl,
-         GL_SHADER_STOCK_XMB,
-         &glsl->prg[GL_SHADER_STOCK_XMB],
+         VIDEO_SHADER_MENU,
+         &glsl->prg[VIDEO_SHADER_MENU],
          &shader_prog_info);
 
    gl_glsl_reset_attrib(glsl);
diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h
index 400bb91812..26072857c2 100644
--- a/gfx/video_shader_driver.h
+++ b/gfx/video_shader_driver.h
@@ -31,8 +31,8 @@
 
 #include "video_shader_parse.h"
 
-#define GL_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
-#define GL_SHADER_STOCK_XMB (GFX_MAX_SHADERS - 2)
+#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
+#define VIDEO_SHADER_MENU        (GFX_MAX_SHADERS - 2)
 
 #endif
 
diff --git a/gfx/video_shader_parse.h b/gfx/video_shader_parse.h
index d33af0eda5..110adbd77d 100644
--- a/gfx/video_shader_parse.h
+++ b/gfx/video_shader_parse.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 #ifndef GFX_MAX_SHADERS
-#define GFX_MAX_SHADERS 24
+#define GFX_MAX_SHADERS 25
 #endif
 
 #ifndef GFX_MAX_TEXTURES
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index ca1db23d08..f09cb104c0 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -83,7 +83,7 @@ static void menu_display_gl_blend_begin(void)
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
    shader_info.data = NULL;
-   shader_info.idx  = GL_SHADER_STOCK_BLEND;
+   shader_info.idx  = VIDEO_SHADER_STOCK_BLEND;
    shader_info.set_active = true;
 
    video_shader_driver_ctl(SHADER_CTL_USE, &shader_info);