diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 2c3715b2..79409bcf 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -4217,7 +4217,7 @@
     </function>
      
     <function name="StencilFuncSeparate" extension="Core" version="2.0">
-      <param name="face"><type>CullFaceMode</type></param>
+      <param name="face"><type>StencilFace</type></param>
       <param name="func"><type>StencilFunction</type></param>
     </function>
      
@@ -4232,10 +4232,11 @@
     </function>
      
     <function name="StencilOpSeparate" extension="Core" version="2.0">
-      <param name="face"><type>CullFaceMode</type></param>
-      <param name="fail"><type>StencilOp</type></param>
-      <param name="zfail"><type>StencilOp</type></param>
-      <param name="zpass"><type>StencilOp</type></param>
+      <param name="face"><type>StencilFace</type></param>
+      <param name="func"><type>StencilFunction</type></param>
+      <param name="sfail"><type>StencilOp</type></param>
+      <param name="dpfail"><type>StencilOp</type></param>
+      <param name="dppass"><type>StencilOp</type></param>
     </function>  
 
     <function name="GetBufferParameter" extension="Core" version="2.0">
@@ -4457,6 +4458,22 @@
       <param name="indices" type="void *" flow="in" count="COMPSIZE(count,type)" />
       <returns type="void" />
     </function>
+    
+    <!-- StencilFace <=> CullFaceMode -->
+    <function name="StencilFuncSeparate" category="ES_VERSION_2_0" extension="Core" version="2.0">
+      <param name="face" type="CullFaceMode" flow="in" />
+      <param name="func" type="StencilFunction" flow="in" />
+      <param name="ref" type="StencilValue" flow="in" />
+      <param name="mask" type="MaskedStencilValue" flow="in" />
+      <returns type="void" />
+    </function>
+    <function name="StencilOpSeparate" category="ES_VERSION_2_0" extension="Core" version="2.0">
+      <param name="face" type="CullFaceMode" flow="in" />
+      <param name="sfail" type="StencilOp" flow="in" />
+      <param name="dpfail" type="StencilOp" flow="in" />
+      <param name="dppass" type="StencilOp" flow="in" />
+      <returns type="void" />
+    </function>
   </add>
 
   <add name="gles2" version="2.0">
@@ -4752,6 +4769,12 @@
       <token name="ShaderSourceLength" value="0X8b88" />
     </enum>
      
+    <enum name="StencilFace">
+      <use token="FRONT" />
+      <use token="BACK" />
+      <use token="FRONT_AND_BACK" />
+    </enum>
+     
     <enum name="StringName">
       <token name="Vendor" value="0X1f00" />
       <token name="Renderer" value="0X1f01" />
@@ -5292,11 +5315,56 @@
        <param name="target"><type>TextureTarget</type></param>
      </function>
       
-        <!-- Enumerated Queries [6.1.3] -->
+      <!-- Enumerated Queries [6.1.3] -->
      <function name="GetTexParameter">
        <param name="target"><type>TextureTarget</type></param>
       <param name="pname"><type>GetTextureParameterName</type></param>
-     </function>        
+     </function>
+     
+     <!-- Stencil Test [4.1.4] -->
+     <function name="StencilFunc">
+       <param name="func"><type>StencilFunction</type></param>
+     </function>
+     <function name="StencilFuncSeparate">
+       <param name="face"><type>StencilFace</type></param>
+       <param name="func"><type>StencilFunction</type></param>
+     </function>
+     <function name="StencilOp">
+      <param name="sfail"><type>StencilOp</type></param>
+      <param name="dpfail"><type>StencilOp</type></param>
+      <param name="dppass"><type>StencilOp</type></param>
+    </function>
+    <function name="StencilOpSeparate">
+      <param name="face"><type>StencilFace</type></param>
+      <param name="func"><type>StencilFunction</type></param>
+      <param name="sfail"><type>StencilOp</type></param>
+      <param name="dpfail"><type>StencilOp</type></param>
+      <param name="dppass"><type>StencilOp</type></param>
+    </function>
+    
+    <!-- Depth Buffer Test [4.1.5] -->
+    <function name="DepthFunc">
+      <param name="func"><type>DepthFunction</type></param>
+    </function>
+    
+    <!-- Blending [4.1.7] -->
+    <function name="BlendEquation">
+      <param name="mode"><type>BlendEquationMode</type></param>
+    </function>
+    <function name="BlendEquationSeparate">
+      <param name="modeRGB"><type>BlendEquationMode</type></param>
+      <param name="modeAlpha"><type>BlendEquationMode</type></param>
+    </function>
+    <function name="BlendFunc">
+      <param name="sfactor"><type>BlendingFactorSrc</type></param>
+      <param name="dfactor"><type>BlendingFactorDest</type></param>
+    </function>
+    <function name="BlendFuncSeparate">
+      <param name="srcRGB"><type>BlendingFactorSrc</type></param>
+      <param name="dstRGB"><type>BlendingFactorDest</type></param>
+      <param name="srcAlpha"><type>BlendingFactorSrc</type></param>
+      <param name="dstAlpha"><type>BlendingFactorDest</type></param>
+    </function>
    </replace>
   
   <add name="gles2" version="3.0">
@@ -5383,6 +5451,31 @@
       <use token="UNSIGNED_INT_SAMPLER_CUBE" />
       <use token="UNSIGNED_INT_SAMPLER_2D_ARRAY" />
     </enum>
+    <enum name="BlendEquationMode">
+      <use token="FUNC_ADD" />
+      <use token="FUNC_SUBTRACT" />
+      <use token="FUNC_REVERSE_SUBTRACT" />
+      <use token="MIN" />
+      <use token="MAX" />
+    </enum>
+    <enum name="BlendingFactorDest">
+      <use token="SRC_ALPHA" />
+      <use token="SRC_COLOR" />
+      <use token="DST_ALPHA" />
+      <use token="DST_COLOR" />
+      <use token="CONSTANT_ALPHA" />
+      <use token="CONSTANT_COLOR" />
+      <use token="ONE_MINUS_SRC_ALPHA" />
+      <use token="ONE_MINUS_SRC_COLOR" />
+      <use token="ONE_MINUS_DST_ALPHA" />
+      <use token="ONE_MINUS_DST_COLOR" />
+      <use token="ONE_MINUS_CONSTANT_ALPHA" />
+      <use token="ONE_MINUS_CONSTANT_COLOR" />
+      <use token="SRC_ALPHA_SATURATE" />
+    </enum>
+    <enum name="BlendingFactorSrc">
+      <reuse enum="BlendingFactorDest" />
+    </enum>
     <enum name="BlitFramebufferFilter">
       <use token="LINEAR" />
       <use token="NEAREST" />
@@ -5455,6 +5548,9 @@
       <use token="BACK" />
       <use token="FRONT_AND_BACK" />
     </enum>
+    <enum name="DepthFunction">
+      <reuse enum="StencilFunction" />
+    </enum>
     <enum name="DrawElementsType">
       <use token="UNSIGNED_BYTE" />
       <use token="UNSIGNED_SHORT" />
@@ -5464,6 +5560,13 @@
       <use token="CULL_FACE" /> <!-- Polygons [3.6] -->
       <use token="POLYGON_OFFSET_FILL" />  <!-- Polygons [3.6] -->
       <use token="PRIMITIVE_RESTART_FIXED_INDEX" /> <!-- Vertex Arrays [2.8] -->
+      <use token="SCISSOR_TEST" /> <!-- Scissor Test [4.1.2] -->
+      <use token="SAMPLE_ALPHA_TO_COVERAGE" /> <!-- Multisample Fragment Operations [4.1.3] -->
+      <use token="SAMPLE_COVERAGE" />
+      <use token="STENCIL_TEST" /> <!-- Stencil Test [4.1.4] -->
+      <use token="DEPTH_TEST" /> <!-- Depth Buffer Test [4.1.5] -->
+      <use token="BLEND" /> <!-- Blending [4.1.7] -->
+      <use token="DITHER" /> <!-- DIthering [4.1.9] -->
     </enum>
     <enum name="FrontFaceDirection">
       <use token="CCW" />
@@ -5642,6 +5745,31 @@
       <use token="DEPTH24_STENCIL8" />
       <use token="DEPTH32F_STENCIL8" />
     </enum>
+    <enum name="StencilFace">
+      <use token="FRONT" />
+      <use token="BACK" />
+      <use token="FRONT_AND_BACK" />
+    </enum>
+    <enum name="StencilFunction">
+      <use token="NEVER" />
+      <use token="ALWAYS" />
+      <use token="LESS" />
+      <use token="GREATER" />
+      <use token="LEQUAL" />
+      <use token="GEQUAL" />
+      <use token="EQUAL" />
+      <use token="NOT_EQUAL" />
+    </enum>
+    <enum name="StencilOp">
+      <use token="KEEP" />
+      <use token="ZERO" />
+      <use token="REPLACE" />
+      <use token="INCR" />
+      <use token="DECR" />
+      <use token="INVERT" />
+      <use token="INCR_WRAP" />
+      <use token="DECR_WRAP" />
+    </enum>
     <enum name="TextureComponentCount">
       <reuse enum="SizedInternalFormat" />
       <use token="RGB" />
diff --git a/Source/OpenTK/Graphics/ES20/ES20.cs b/Source/OpenTK/Graphics/ES20/ES20.cs
index 295ad813..d2a5f13e 100644
--- a/Source/OpenTK/Graphics/ES20/ES20.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20.cs
@@ -16503,13 +16503,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
         public static 
-        void StencilFuncSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, Int32 mask)
+        void StencilFuncSeparate(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, Int32 mask)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES20.CullFaceMode)face, (OpenTK.Graphics.ES20.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES20.StencilFace)face, (OpenTK.Graphics.ES20.StencilFunction)func, (Int32)@ref, (UInt32)mask);
             #if DEBUG
             }
             #endif
@@ -16542,13 +16542,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
         public static 
-        void StencilFuncSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask)
+        void StencilFuncSeparate(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES20.CullFaceMode)face, (OpenTK.Graphics.ES20.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES20.StencilFace)face, (OpenTK.Graphics.ES20.StencilFunction)func, (Int32)@ref, (UInt32)mask);
             #if DEBUG
             }
             #endif
@@ -16717,13 +16717,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glStencilOpSeparate")]
         public static 
-        void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass)
+        void StencilOpSeparate(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilOpSeparate((OpenTK.Graphics.ES20.CullFaceMode)face, (OpenTK.Graphics.ES20.StencilOp)sfail, (OpenTK.Graphics.ES20.StencilOp)dpfail, (OpenTK.Graphics.ES20.StencilOp)dppass);
+            Delegates.glStencilOpSeparate((OpenTK.Graphics.ES20.StencilFace)face, (OpenTK.Graphics.ES20.StencilOp)sfail, (OpenTK.Graphics.ES20.StencilOp)dpfail, (OpenTK.Graphics.ES20.StencilOp)dppass);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/ES20/ES20Core.cs b/Source/OpenTK/Graphics/ES20/ES20Core.cs
index e6388d3f..ccfed0ed 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Core.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Core.cs
@@ -878,7 +878,10 @@ namespace OpenTK.Graphics.ES20
             internal extern static void StencilFunc(OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilFuncSeparate", ExactSpelling = true)]
-            internal extern static void StencilFuncSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
+            internal extern static void StencilFuncSeparate(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilFuncSeparate", ExactSpelling = true)]
+            internal extern static void StencilFuncSeparate1(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilMask", ExactSpelling = true)]
             internal extern static void StencilMask(UInt32 mask);
@@ -890,7 +893,10 @@ namespace OpenTK.Graphics.ES20
             internal extern static void StencilOp(OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilOpSeparate", ExactSpelling = true)]
-            internal extern static void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass);
+            internal extern static void StencilOpSeparate(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilOpSeparate", ExactSpelling = true)]
+            internal extern static void StencilOpSeparate1(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTestFenceNV", ExactSpelling = true)]
             internal extern static bool TestFenceNV(UInt32 fence);
diff --git a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
index 63a05158..541e6863 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
@@ -876,9 +876,12 @@ namespace OpenTK.Graphics.ES20
             internal delegate void StencilFunc(OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
             internal static StencilFunc glStencilFunc;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void StencilFuncSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
+            internal delegate void StencilFuncSeparate(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
             internal static StencilFuncSeparate glStencilFuncSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
+            internal delegate void StencilFuncSeparate1(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilFunction func, Int32 @ref, UInt32 mask);
+            internal static StencilFuncSeparate1 glStencilFuncSeparate1;
+            [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void StencilMask(UInt32 mask);
             internal static StencilMask glStencilMask;
             [System.Security.SuppressUnmanagedCodeSecurity()]
@@ -888,9 +891,12 @@ namespace OpenTK.Graphics.ES20
             internal delegate void StencilOp(OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass);
             internal static StencilOp glStencilOp;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass);
+            internal delegate void StencilOpSeparate(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass);
             internal static StencilOpSeparate glStencilOpSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
+            internal delegate void StencilOpSeparate1(OpenTK.Graphics.ES20.StencilFace face, OpenTK.Graphics.ES20.StencilOp sfail, OpenTK.Graphics.ES20.StencilOp dpfail, OpenTK.Graphics.ES20.StencilOp dppass);
+            internal static StencilOpSeparate1 glStencilOpSeparate1;
+            [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate bool TestFenceNV(UInt32 fence);
             internal static TestFenceNV glTestFenceNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
diff --git a/Source/OpenTK/Graphics/ES20/ES20Enums.cs b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
index 1687332a..a7427d97 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Enums.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
@@ -8618,7 +8618,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.CullFace, GL.StencilFuncSeparate and 2 other functions
+    /// Used in GL.CullFace, GL.StencilMaskSeparate
     /// </summary>
     public enum CullFaceMode : int
     {
@@ -19083,6 +19083,25 @@ namespace OpenTK.Graphics.ES20
         Smooth = ((int)0x1D01)        ,
     }
 
+    /// <summary>
+    /// Used in GL.StencilFuncSeparate, GL.StencilOpSeparate
+    /// </summary>
+    public enum StencilFace : int
+    {
+        /// <summary>
+        /// Original was GL_FRONT = 0X0404
+        /// </summary>
+        Front = ((int)0X0404)        ,
+        /// <summary>
+        /// Original was GL_BACK = 0X0405
+        /// </summary>
+        Back = ((int)0X0405)        ,
+        /// <summary>
+        /// Original was GL_FRONT_AND_BACK = 0x0408
+        /// </summary>
+        FrontAndBack = ((int)0x0408)        ,
+    }
+
     /// <summary>
     /// Used in GL.StencilFunc, GL.StencilFuncSeparate
     /// </summary>
diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs
index eff8441c..1173c74d 100644
--- a/Source/OpenTK/Graphics/ES30/ES30.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30.cs
@@ -27116,13 +27116,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
         public static 
-        void StencilFuncSeparate(OpenTK.Graphics.ES30.CullFaceMode face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, Int32 mask)
+        void StencilFuncSeparate(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, Int32 mask)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES30.CullFaceMode)face, (OpenTK.Graphics.ES30.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES30.StencilFace)face, (OpenTK.Graphics.ES30.StencilFunction)func, (Int32)@ref, (UInt32)mask);
             #if DEBUG
             }
             #endif
@@ -27155,13 +27155,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
         public static 
-        void StencilFuncSeparate(OpenTK.Graphics.ES30.CullFaceMode face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask)
+        void StencilFuncSeparate(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES30.CullFaceMode)face, (OpenTK.Graphics.ES30.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.ES30.StencilFace)face, (OpenTK.Graphics.ES30.StencilFunction)func, (Int32)@ref, (UInt32)mask);
             #if DEBUG
             }
             #endif
@@ -27330,13 +27330,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glStencilOpSeparate")]
         public static 
-        void StencilOpSeparate(OpenTK.Graphics.ES30.CullFaceMode face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass)
+        void StencilOpSeparate(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilOpSeparate((OpenTK.Graphics.ES30.CullFaceMode)face, (OpenTK.Graphics.ES30.StencilOp)sfail, (OpenTK.Graphics.ES30.StencilOp)dpfail, (OpenTK.Graphics.ES30.StencilOp)dppass);
+            Delegates.glStencilOpSeparate((OpenTK.Graphics.ES30.StencilFace)face, (OpenTK.Graphics.ES30.StencilOp)sfail, (OpenTK.Graphics.ES30.StencilOp)dpfail, (OpenTK.Graphics.ES30.StencilOp)dppass);
             #if DEBUG
             }
             #endif
@@ -35084,13 +35084,13 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "EXT_blend_minmax", Version = "", EntryPoint = "glBlendEquationEXT")]
             public static 
-            void BlendEquation(OpenTK.Graphics.ES30.All mode)
+            void BlendEquation(OpenTK.Graphics.ES30.BlendEquationMode mode)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlendEquationEXT((OpenTK.Graphics.ES30.All)mode);
+                Delegates.glBlendEquationEXT((OpenTK.Graphics.ES30.BlendEquationMode)mode);
                 #if DEBUG
                 }
                 #endif
diff --git a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
index 9fbdb65b..9cea4ab0 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
@@ -111,7 +111,7 @@ namespace OpenTK.Graphics.ES30
             internal delegate void BlendEquation(OpenTK.Graphics.ES30.BlendEquationMode mode);
             internal static BlendEquation glBlendEquation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationEXT(OpenTK.Graphics.ES30.All mode);
+            internal delegate void BlendEquationEXT(OpenTK.Graphics.ES30.BlendEquationMode mode);
             internal static BlendEquationEXT glBlendEquationEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendEquationSeparate(OpenTK.Graphics.ES30.BlendEquationMode modeRGB, OpenTK.Graphics.ES30.BlendEquationMode modeAlpha);
@@ -1104,9 +1104,12 @@ namespace OpenTK.Graphics.ES30
             internal delegate void StencilFunc(OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
             internal static StencilFunc glStencilFunc;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void StencilFuncSeparate(OpenTK.Graphics.ES30.CullFaceMode face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
+            internal delegate void StencilFuncSeparate(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
             internal static StencilFuncSeparate glStencilFuncSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
+            internal delegate void StencilFuncSeparate1(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
+            internal static StencilFuncSeparate1 glStencilFuncSeparate1;
+            [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void StencilMask(UInt32 mask);
             internal static StencilMask glStencilMask;
             [System.Security.SuppressUnmanagedCodeSecurity()]
@@ -1116,9 +1119,12 @@ namespace OpenTK.Graphics.ES30
             internal delegate void StencilOp(OpenTK.Graphics.ES30.StencilOp fail, OpenTK.Graphics.ES30.StencilOp zfail, OpenTK.Graphics.ES30.StencilOp zpass);
             internal static StencilOp glStencilOp;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void StencilOpSeparate(OpenTK.Graphics.ES30.CullFaceMode face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass);
+            internal delegate void StencilOpSeparate(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass);
             internal static StencilOpSeparate glStencilOpSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
+            internal delegate void StencilOpSeparate1(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass);
+            internal static StencilOpSeparate1 glStencilOpSeparate1;
+            [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate bool TestFenceNV(UInt32 fence);
             internal static TestFenceNV glTestFenceNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
index a21622aa..e197d5ca 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
@@ -385,7 +385,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 79 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 78 other functions
     /// </summary>
     public enum All : int
     {
@@ -9219,22 +9219,30 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BlendEquation, GL.BlendEquationSeparate
+    /// Used in GL.BlendEquation, GL.BlendEquationSeparate and 1 other function
     /// </summary>
     public enum BlendEquationMode : int
     {
         /// <summary>
-        /// Original was GL_FuncAdd = 0X8006
+        /// Original was GL_FUNC_ADD = 0x8006
         /// </summary>
-        FuncAdd = ((int)0X8006)        ,
+        FuncAdd = ((int)0x8006)        ,
         /// <summary>
-        /// Original was GL_FuncSubtract = 0X800a
+        /// Original was GL_MIN = 0x8007
         /// </summary>
-        FuncSubtract = ((int)0X800a)        ,
+        Min = ((int)0x8007)        ,
         /// <summary>
-        /// Original was GL_FuncReverseSubtract = 0X800b
+        /// Original was GL_MAX = 0x8008
         /// </summary>
-        FuncReverseSubtract = ((int)0X800b)        ,
+        Max = ((int)0x8008)        ,
+        /// <summary>
+        /// Original was GL_FUNC_SUBTRACT = 0x800A
+        /// </summary>
+        FuncSubtract = ((int)0x800A)        ,
+        /// <summary>
+        /// Original was GL_FUNC_REVERSE_SUBTRACT = 0x800B
+        /// </summary>
+        FuncReverseSubtract = ((int)0x800B)        ,
     }
 
     /// <summary>
@@ -9310,50 +9318,50 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         OneMinusDstAlpha = ((int)0x0305)        ,
         /// <summary>
-        /// Original was GL_DstColor = 0X0306
+        /// Original was GL_DST_COLOR = 0x0306
         /// </summary>
-        DstColor = ((int)0X0306)        ,
+        DstColor = ((int)0x0306)        ,
         /// <summary>
-        /// Original was GL_OneMinusDstColor = 0X0307
+        /// Original was GL_ONE_MINUS_DST_COLOR = 0x0307
         /// </summary>
-        OneMinusDstColor = ((int)0X0307)        ,
+        OneMinusDstColor = ((int)0x0307)        ,
         /// <summary>
-        /// Original was GL_SrcAlphaSaturate = 0X0308
+        /// Original was GL_SRC_ALPHA_SATURATE = 0x0308
         /// </summary>
-        SrcAlphaSaturate = ((int)0X0308)        ,
+        SrcAlphaSaturate = ((int)0x0308)        ,
+        /// <summary>
+        /// Original was GL_CONSTANT_COLOR = 0x8001
+        /// </summary>
+        ConstantColor = ((int)0x8001)        ,
         /// <summary>
         /// Original was GL_CONSTANT_COLOR_EXT = 0x8001
         /// </summary>
         ConstantColorExt = ((int)0x8001)        ,
         /// <summary>
-        /// Original was GL_ConstantColor = 0X8001
+        /// Original was GL_ONE_MINUS_CONSTANT_COLOR = 0x8002
         /// </summary>
-        ConstantColor = ((int)0X8001)        ,
+        OneMinusConstantColor = ((int)0x8002)        ,
         /// <summary>
         /// Original was GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002
         /// </summary>
         OneMinusConstantColorExt = ((int)0x8002)        ,
         /// <summary>
-        /// Original was GL_OneMinusConstantColor = 0X8002
+        /// Original was GL_CONSTANT_ALPHA = 0x8003
         /// </summary>
-        OneMinusConstantColor = ((int)0X8002)        ,
+        ConstantAlpha = ((int)0x8003)        ,
         /// <summary>
         /// Original was GL_CONSTANT_ALPHA_EXT = 0x8003
         /// </summary>
         ConstantAlphaExt = ((int)0x8003)        ,
         /// <summary>
-        /// Original was GL_ConstantAlpha = 0X8003
+        /// Original was GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004
         /// </summary>
-        ConstantAlpha = ((int)0X8003)        ,
+        OneMinusConstantAlpha = ((int)0x8004)        ,
         /// <summary>
         /// Original was GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004
         /// </summary>
         OneMinusConstantAlphaExt = ((int)0x8004)        ,
         /// <summary>
-        /// Original was GL_OneMinusConstantAlpha = 0X8004
-        /// </summary>
-        OneMinusConstantAlpha = ((int)0X8004)        ,
-        /// <summary>
         /// Original was GL_One = 1
         /// </summary>
         One = ((int)1)        ,
@@ -9369,13 +9377,13 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         Zero = ((int)0)        ,
         /// <summary>
-        /// Original was GL_SrcColor = 0X0300
+        /// Original was GL_SRC_COLOR = 0x0300
         /// </summary>
-        SrcColor = ((int)0X0300)        ,
+        SrcColor = ((int)0x0300)        ,
         /// <summary>
-        /// Original was GL_OneMinusSrcColor = 0X0301
+        /// Original was GL_ONE_MINUS_SRC_COLOR = 0x0301
         /// </summary>
-        OneMinusSrcColor = ((int)0X0301)        ,
+        OneMinusSrcColor = ((int)0x0301)        ,
         /// <summary>
         /// Original was GL_SRC_ALPHA = 0x0302
         /// </summary>
@@ -9405,38 +9413,38 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         SrcAlphaSaturate = ((int)0x0308)        ,
         /// <summary>
+        /// Original was GL_CONSTANT_COLOR = 0x8001
+        /// </summary>
+        ConstantColor = ((int)0x8001)        ,
+        /// <summary>
         /// Original was GL_CONSTANT_COLOR_EXT = 0x8001
         /// </summary>
         ConstantColorExt = ((int)0x8001)        ,
         /// <summary>
-        /// Original was GL_ConstantColor = 0X8001
+        /// Original was GL_ONE_MINUS_CONSTANT_COLOR = 0x8002
         /// </summary>
-        ConstantColor = ((int)0X8001)        ,
+        OneMinusConstantColor = ((int)0x8002)        ,
         /// <summary>
         /// Original was GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002
         /// </summary>
         OneMinusConstantColorExt = ((int)0x8002)        ,
         /// <summary>
-        /// Original was GL_OneMinusConstantColor = 0X8002
+        /// Original was GL_CONSTANT_ALPHA = 0x8003
         /// </summary>
-        OneMinusConstantColor = ((int)0X8002)        ,
+        ConstantAlpha = ((int)0x8003)        ,
         /// <summary>
         /// Original was GL_CONSTANT_ALPHA_EXT = 0x8003
         /// </summary>
         ConstantAlphaExt = ((int)0x8003)        ,
         /// <summary>
-        /// Original was GL_ConstantAlpha = 0X8003
+        /// Original was GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004
         /// </summary>
-        ConstantAlpha = ((int)0X8003)        ,
+        OneMinusConstantAlpha = ((int)0x8004)        ,
         /// <summary>
         /// Original was GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004
         /// </summary>
         OneMinusConstantAlphaExt = ((int)0x8004)        ,
         /// <summary>
-        /// Original was GL_OneMinusConstantAlpha = 0X8004
-        /// </summary>
-        OneMinusConstantAlpha = ((int)0X8004)        ,
-        /// <summary>
         /// Original was GL_One = 1
         /// </summary>
         One = ((int)1)        ,
@@ -10101,7 +10109,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.CullFace, GL.StencilFuncSeparate and 2 other functions
+    /// Used in GL.CullFace, GL.StencilMaskSeparate
     /// </summary>
     public enum CullFaceMode : int
     {
@@ -10789,26 +10797,26 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         MultisampleSgis = ((int)0x809D)        ,
         /// <summary>
+        /// Original was GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E
+        /// </summary>
+        SampleAlphaToCoverage = ((int)0x809E)        ,
+        /// <summary>
         /// Original was GL_SAMPLE_ALPHA_TO_MASK_SGIS = 0x809E
         /// </summary>
         SampleAlphaToMaskSgis = ((int)0x809E)        ,
         /// <summary>
-        /// Original was GL_SampleAlphaToCoverage = 0X809e
-        /// </summary>
-        SampleAlphaToCoverage = ((int)0X809e)        ,
-        /// <summary>
         /// Original was GL_SAMPLE_ALPHA_TO_ONE_SGIS = 0x809F
         /// </summary>
         SampleAlphaToOneSgis = ((int)0x809F)        ,
         /// <summary>
+        /// Original was GL_SAMPLE_COVERAGE = 0x80A0
+        /// </summary>
+        SampleCoverage = ((int)0x80A0)        ,
+        /// <summary>
         /// Original was GL_SAMPLE_MASK_SGIS = 0x80A0
         /// </summary>
         SampleMaskSgis = ((int)0x80A0)        ,
         /// <summary>
-        /// Original was GL_SampleCoverage = 0X80a0
-        /// </summary>
-        SampleCoverage = ((int)0X80a0)        ,
-        /// <summary>
         /// Original was GL_TEXTURE_COLOR_TABLE_SGI = 0x80BC
         /// </summary>
         TextureColorTableSgi = ((int)0x80BC)        ,
@@ -22294,6 +22302,25 @@ namespace OpenTK.Graphics.ES30
         Rgb10A2ui = ((int)0x906F)        ,
     }
 
+    /// <summary>
+    /// Used in GL.StencilFuncSeparate, GL.StencilOpSeparate
+    /// </summary>
+    public enum StencilFace : int
+    {
+        /// <summary>
+        /// Original was GL_FRONT = 0X0404
+        /// </summary>
+        Front = ((int)0X0404)        ,
+        /// <summary>
+        /// Original was GL_BACK = 0X0405
+        /// </summary>
+        Back = ((int)0X0405)        ,
+        /// <summary>
+        /// Original was GL_FRONT_AND_BACK = 0x0408
+        /// </summary>
+        FrontAndBack = ((int)0x0408)        ,
+    }
+
     /// <summary>
     /// Used in GL.StencilFunc, GL.StencilFuncSeparate
     /// </summary>
@@ -22363,13 +22390,13 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         Decr = ((int)0X1e03)        ,
         /// <summary>
-        /// Original was GL_IncrWrap = 0X8507
+        /// Original was GL_INCR_WRAP = 0x8507
         /// </summary>
-        IncrWrap = ((int)0X8507)        ,
+        IncrWrap = ((int)0x8507)        ,
         /// <summary>
-        /// Original was GL_DecrWrap = 0X8508
+        /// Original was GL_DECR_WRAP = 0x8508
         /// </summary>
-        DecrWrap = ((int)0X8508)        ,
+        DecrWrap = ((int)0x8508)        ,
     }
 
     /// <summary>
diff --git a/Source/OpenTK/Graphics/ES30/ES3Core.cs b/Source/OpenTK/Graphics/ES30/ES3Core.cs
index e209c59e..11fb215d 100644
--- a/Source/OpenTK/Graphics/ES30/ES3Core.cs
+++ b/Source/OpenTK/Graphics/ES30/ES3Core.cs
@@ -113,7 +113,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static void BlendEquation(OpenTK.Graphics.ES30.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationEXT", ExactSpelling = true)]
-            internal extern static void BlendEquationEXT(OpenTK.Graphics.ES30.All mode);
+            internal extern static void BlendEquationEXT(OpenTK.Graphics.ES30.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationSeparate", ExactSpelling = true)]
             internal extern static void BlendEquationSeparate(OpenTK.Graphics.ES30.BlendEquationMode modeRGB, OpenTK.Graphics.ES30.BlendEquationMode modeAlpha);
@@ -1106,7 +1106,10 @@ namespace OpenTK.Graphics.ES30
             internal extern static void StencilFunc(OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilFuncSeparate", ExactSpelling = true)]
-            internal extern static void StencilFuncSeparate(OpenTK.Graphics.ES30.CullFaceMode face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
+            internal extern static void StencilFuncSeparate(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilFuncSeparate", ExactSpelling = true)]
+            internal extern static void StencilFuncSeparate1(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilFunction func, Int32 @ref, UInt32 mask);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilMask", ExactSpelling = true)]
             internal extern static void StencilMask(UInt32 mask);
@@ -1118,7 +1121,10 @@ namespace OpenTK.Graphics.ES30
             internal extern static void StencilOp(OpenTK.Graphics.ES30.StencilOp fail, OpenTK.Graphics.ES30.StencilOp zfail, OpenTK.Graphics.ES30.StencilOp zpass);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilOpSeparate", ExactSpelling = true)]
-            internal extern static void StencilOpSeparate(OpenTK.Graphics.ES30.CullFaceMode face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass);
+            internal extern static void StencilOpSeparate(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilOpSeparate", ExactSpelling = true)]
+            internal extern static void StencilOpSeparate1(OpenTK.Graphics.ES30.StencilFace face, OpenTK.Graphics.ES30.StencilOp sfail, OpenTK.Graphics.ES30.StencilOp dpfail, OpenTK.Graphics.ES30.StencilOp dppass);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTestFenceNV", ExactSpelling = true)]
             internal extern static bool TestFenceNV(UInt32 fence);