diff --git a/Source/Bind/Structures/Function.cs b/Source/Bind/Structures/Function.cs
index 04e1985b..d4e47fcb 100644
--- a/Source/Bind/Structures/Function.cs
+++ b/Source/Bind/Structures/Function.cs
@@ -731,7 +731,7 @@ namespace Bind.Structures
         /// <param name="f">The Function to add.</param>
         public void AddChecked(Function f)
         {
-            if (f.Name.Contains("Uniform1u"))
+            if (f.Name.Contains("Color3ub"))
             {
             }
 
@@ -742,6 +742,16 @@ namespace Bind.Structures
                 {
                     Bind.Structures.Function.Wrappers.Add(f);
                 }
+                else
+                {
+                    Function existing = Bind.Structures.Function.Wrappers[f.Extension][index];
+                    if ((existing.Parameters.HasUnsignedParameters && !unsignedFunctions.IsMatch(existing.Name) && unsignedFunctions.IsMatch(f.Name)) ||
+                        (!existing.Parameters.HasUnsignedParameters && unsignedFunctions.IsMatch(existing.Name) && !unsignedFunctions.IsMatch(f.Name)))
+                    {
+                        Bind.Structures.Function.Wrappers[f.Extension].RemoveAt(index);
+                        Bind.Structures.Function.Wrappers[f.Extension].Add(f);
+                    }
+                }
             }
             else
             {
diff --git a/Source/Bind/Structures/Type.cs b/Source/Bind/Structures/Type.cs
index c35733b3..4d6768ae 100644
--- a/Source/Bind/Structures/Type.cs
+++ b/Source/Bind/Structures/Type.cs
@@ -155,7 +155,7 @@ namespace Bind.Structures
         {
             get
             {
-                bool compliant = !Unsigned;
+                bool compliant = !(CurrentType.Contains("UInt") || CurrentType.Contains("SByte"));
                 if (Pointer)
                 {
                     compliant &= CurrentType.Contains("IntPtr");    // IntPtr's are CLSCompliant.
@@ -189,7 +189,7 @@ namespace Bind.Structures
         {
             get
             {
-                return (CurrentType.Contains("UInt") || CurrentType.Contains("SByte"));
+                return (CurrentType.Contains("UInt") || CurrentType.Contains("Byte"));
             }
         }
 
diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs
index 821d6f39..e791b2c4 100644
--- a/Source/OpenTK/Graphics/GL/GL.cs
+++ b/Source/OpenTK/Graphics/GL/GL.cs
@@ -406,13 +406,6 @@ namespace OpenTK.Graphics
             Delegates.glColor3b((SByte)red, (SByte)green, (SByte)blue);
         }
 
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3b")]
-        public static 
-        void Color3(Byte red, Byte green, Byte blue)
-        {
-            Delegates.glColor3b((SByte)red, (SByte)green, (SByte)blue);
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3bv")]
         public static 
@@ -427,19 +420,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3bv")]
-        public static 
-        void Color3(Byte[] v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = v)
-                {
-                    Delegates.glColor3bv((SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3bv")]
         public static 
@@ -454,19 +434,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3bv")]
-        public static 
-        void Color3(ref Byte v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = &v)
-                {
-                    Delegates.glColor3bv((SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3bv")]
         public static 
@@ -475,14 +442,6 @@ namespace OpenTK.Graphics
             Delegates.glColor3bv((SByte*)v);
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3bv")]
-        public static 
-        unsafe void Color3(Byte* v)
-        {
-            Delegates.glColor3bv((SByte*)v);
-        }
-
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3d")]
         public static 
         void Color3(Double red, Double green, Double blue)
@@ -647,6 +606,47 @@ namespace OpenTK.Graphics
             Delegates.glColor3sv((Int16*)v);
         }
 
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3ub")]
+        public static 
+        void Color3(Byte red, Byte green, Byte blue)
+        {
+            Delegates.glColor3ub((Byte)red, (Byte)green, (Byte)blue);
+        }
+
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3ubv")]
+        public static 
+        void Color3(Byte[] v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = v)
+                {
+                    Delegates.glColor3ubv((Byte*)v_ptr);
+                }
+            }
+        }
+
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3ubv")]
+        public static 
+        void Color3(ref Byte v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = &v)
+                {
+                    Delegates.glColor3ubv((Byte*)v_ptr);
+                }
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3ubv")]
+        public static 
+        unsafe void Color3(Byte* v)
+        {
+            Delegates.glColor3ubv((Byte*)v);
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor3ui")]
         public static 
@@ -743,13 +743,6 @@ namespace OpenTK.Graphics
             Delegates.glColor4b((SByte)red, (SByte)green, (SByte)blue, (SByte)alpha);
         }
 
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4b")]
-        public static 
-        void Color4(Byte red, Byte green, Byte blue, Byte alpha)
-        {
-            Delegates.glColor4b((SByte)red, (SByte)green, (SByte)blue, (SByte)alpha);
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4bv")]
         public static 
@@ -764,19 +757,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4bv")]
-        public static 
-        void Color4(Byte[] v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = v)
-                {
-                    Delegates.glColor4bv((SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4bv")]
         public static 
@@ -791,19 +771,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4bv")]
-        public static 
-        void Color4(ref Byte v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = &v)
-                {
-                    Delegates.glColor4bv((SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4bv")]
         public static 
@@ -812,14 +779,6 @@ namespace OpenTK.Graphics
             Delegates.glColor4bv((SByte*)v);
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4bv")]
-        public static 
-        unsafe void Color4(Byte* v)
-        {
-            Delegates.glColor4bv((SByte*)v);
-        }
-
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4d")]
         public static 
         void Color4(Double red, Double green, Double blue, Double alpha)
@@ -984,6 +943,47 @@ namespace OpenTK.Graphics
             Delegates.glColor4sv((Int16*)v);
         }
 
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4ub")]
+        public static 
+        void Color4(Byte red, Byte green, Byte blue, Byte alpha)
+        {
+            Delegates.glColor4ub((Byte)red, (Byte)green, (Byte)blue, (Byte)alpha);
+        }
+
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4ubv")]
+        public static 
+        void Color4(Byte[] v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = v)
+                {
+                    Delegates.glColor4ubv((Byte*)v_ptr);
+                }
+            }
+        }
+
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4ubv")]
+        public static 
+        void Color4(ref Byte v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = &v)
+                {
+                    Delegates.glColor4ubv((Byte*)v_ptr);
+                }
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4ubv")]
+        public static 
+        unsafe void Color4(Byte* v)
+        {
+            Delegates.glColor4ubv((Byte*)v);
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Drawing", Version = "1.0", EntryPoint = "glColor4ui")]
         public static 
@@ -13961,13 +13961,6 @@ namespace OpenTK.Graphics
             Delegates.glSecondaryColor3b((SByte)red, (SByte)green, (SByte)blue);
         }
 
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3b")]
-        public static 
-        void SecondaryColor3(Byte red, Byte green, Byte blue)
-        {
-            Delegates.glSecondaryColor3b((SByte)red, (SByte)green, (SByte)blue);
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
         public static 
@@ -13982,19 +13975,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
-        public static 
-        void SecondaryColor3(Byte[] v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = v)
-                {
-                    Delegates.glSecondaryColor3bv((SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
         public static 
@@ -14009,19 +13989,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
-        public static 
-        void SecondaryColor3(ref Byte v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = &v)
-                {
-                    Delegates.glSecondaryColor3bv((SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
         public static 
@@ -14030,14 +13997,6 @@ namespace OpenTK.Graphics
             Delegates.glSecondaryColor3bv((SByte*)v);
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
-        public static 
-        unsafe void SecondaryColor3(Byte* v)
-        {
-            Delegates.glSecondaryColor3bv((SByte*)v);
-        }
-
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3d")]
         public static 
         void SecondaryColor3(Double red, Double green, Double blue)
@@ -14202,6 +14161,47 @@ namespace OpenTK.Graphics
             Delegates.glSecondaryColor3sv((Int16*)v);
         }
 
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3ub")]
+        public static 
+        void SecondaryColor3(Byte red, Byte green, Byte blue)
+        {
+            Delegates.glSecondaryColor3ub((Byte)red, (Byte)green, (Byte)blue);
+        }
+
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3ubv")]
+        public static 
+        void SecondaryColor3(Byte[] v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = v)
+                {
+                    Delegates.glSecondaryColor3ubv((Byte*)v_ptr);
+                }
+            }
+        }
+
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3ubv")]
+        public static 
+        void SecondaryColor3(ref Byte v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = &v)
+                {
+                    Delegates.glSecondaryColor3ubv((Byte*)v_ptr);
+                }
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3ubv")]
+        public static 
+        unsafe void SecondaryColor3(Byte* v)
+        {
+            Delegates.glSecondaryColor3ubv((Byte*)v);
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glSecondaryColor3ui")]
         public static 
@@ -20454,19 +20454,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
-        public static 
-        void VertexAttrib4N(Int32 index, Byte[] v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib4Nbv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
         public static 
@@ -20481,19 +20468,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
-        public static 
-        void VertexAttrib4N(Int32 index, ref Byte v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = &v)
-                {
-                    Delegates.glVertexAttrib4Nbv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
         public static 
@@ -20502,14 +20476,6 @@ namespace OpenTK.Graphics
             Delegates.glVertexAttrib4Nbv((UInt32)index, (SByte*)v);
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
-        public static 
-        unsafe void VertexAttrib4N(Int32 index, Byte* v)
-        {
-            Delegates.glVertexAttrib4Nbv((UInt32)index, (SByte*)v);
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Niv")]
         public static 
@@ -20679,6 +20645,19 @@ namespace OpenTK.Graphics
             }
         }
 
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
+        public static 
+        void VertexAttrib4N(Int32 index, Byte[] v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib4Nubv((UInt32)index, (Byte*)v_ptr);
+                }
+            }
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
         public static 
@@ -20693,6 +20672,19 @@ namespace OpenTK.Graphics
             }
         }
 
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
+        public static 
+        void VertexAttrib4N(Int32 index, ref Byte v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = &v)
+                {
+                    Delegates.glVertexAttrib4Nubv((UInt32)index, (Byte*)v_ptr);
+                }
+            }
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
         public static 
@@ -20701,6 +20693,14 @@ namespace OpenTK.Graphics
             Delegates.glVertexAttrib4Nubv((UInt32)index, (Byte*)v);
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
+        public static 
+        unsafe void VertexAttrib4N(Int32 index, Byte* v)
+        {
+            Delegates.glVertexAttrib4Nubv((UInt32)index, (Byte*)v);
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nuiv")]
         public static 
@@ -20787,19 +20787,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4bv")]
-        public static 
-        void VertexAttrib4(Int32 index, Byte[] v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib4bv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4bv")]
         public static 
@@ -20814,19 +20801,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4bv")]
-        public static 
-        void VertexAttrib4(Int32 index, ref Byte v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = &v)
-                {
-                    Delegates.glVertexAttrib4bv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4bv")]
         public static 
@@ -20835,14 +20809,6 @@ namespace OpenTK.Graphics
             Delegates.glVertexAttrib4bv((UInt32)index, (SByte*)v);
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4bv")]
-        public static 
-        unsafe void VertexAttrib4(Int32 index, Byte* v)
-        {
-            Delegates.glVertexAttrib4bv((UInt32)index, (SByte*)v);
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4d")]
         public static 
@@ -21182,6 +21148,19 @@ namespace OpenTK.Graphics
             }
         }
 
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
+        public static 
+        void VertexAttrib4(Int32 index, Byte[] v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib4ubv((UInt32)index, (Byte*)v_ptr);
+                }
+            }
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
         public static 
@@ -21196,6 +21175,19 @@ namespace OpenTK.Graphics
             }
         }
 
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
+        public static 
+        void VertexAttrib4(Int32 index, ref Byte v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = &v)
+                {
+                    Delegates.glVertexAttrib4ubv((UInt32)index, (Byte*)v_ptr);
+                }
+            }
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
         public static 
@@ -21204,6 +21196,14 @@ namespace OpenTK.Graphics
             Delegates.glVertexAttrib4ubv((UInt32)index, (Byte*)v);
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
+        public static 
+        unsafe void VertexAttrib4(Int32 index, Byte* v)
+        {
+            Delegates.glVertexAttrib4ubv((UInt32)index, (Byte*)v);
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4uiv")]
         public static 
@@ -22623,19 +22623,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4bv")]
-        public static 
-        void VertexAttribI4(Int32 index, Byte[] v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = v)
-                {
-                    Delegates.glVertexAttribI4bv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4bv")]
         public static 
@@ -22650,19 +22637,6 @@ namespace OpenTK.Graphics
             }
         }
 
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4bv")]
-        public static 
-        void VertexAttribI4(Int32 index, ref Byte v)
-        {
-            unsafe
-            {
-                fixed (Byte* v_ptr = &v)
-                {
-                    Delegates.glVertexAttribI4bv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4bv")]
         public static 
@@ -22671,14 +22645,6 @@ namespace OpenTK.Graphics
             Delegates.glVertexAttribI4bv((UInt32)index, (SByte*)v);
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4bv")]
-        public static 
-        unsafe void VertexAttribI4(Int32 index, Byte* v)
-        {
-            Delegates.glVertexAttribI4bv((UInt32)index, (SByte*)v);
-        }
-
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4sv")]
         public static 
@@ -22763,6 +22729,19 @@ namespace OpenTK.Graphics
             }
         }
 
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
+        public static 
+        void VertexAttribI4(Int32 index, Byte[] v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = v)
+                {
+                    Delegates.glVertexAttribI4ubv((UInt32)index, (Byte*)v_ptr);
+                }
+            }
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
         public static 
@@ -22777,6 +22756,19 @@ namespace OpenTK.Graphics
             }
         }
 
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
+        public static 
+        void VertexAttribI4(Int32 index, ref Byte v)
+        {
+            unsafe
+            {
+                fixed (Byte* v_ptr = &v)
+                {
+                    Delegates.glVertexAttribI4ubv((UInt32)index, (Byte*)v_ptr);
+                }
+            }
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
         public static 
@@ -22785,6 +22777,14 @@ namespace OpenTK.Graphics
             Delegates.glVertexAttribI4ubv((UInt32)index, (Byte*)v);
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
+        public static 
+        unsafe void VertexAttribI4(Int32 index, Byte* v)
+        {
+            Delegates.glVertexAttribI4ubv((UInt32)index, (Byte*)v);
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4usv")]
         public static 
@@ -33683,19 +33683,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
-            public static 
-            void Weight(Int32 size, Byte[] weights)
-            {
-                unsafe
-                {
-                    fixed (Byte* weights_ptr = weights)
-                    {
-                        Delegates.glWeightbvARB((Int32)size, (SByte*)weights_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
             public static 
@@ -33710,19 +33697,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
-            public static 
-            void Weight(Int32 size, ref Byte weights)
-            {
-                unsafe
-                {
-                    fixed (Byte* weights_ptr = &weights)
-                    {
-                        Delegates.glWeightbvARB((Int32)size, (SByte*)weights_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
             public static 
@@ -33731,14 +33705,6 @@ namespace OpenTK.Graphics
                 Delegates.glWeightbvARB((Int32)size, (SByte*)weights);
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
-            public static 
-            unsafe void Weight(Int32 size, Byte* weights)
-            {
-                Delegates.glWeightbvARB((Int32)size, (SByte*)weights);
-            }
-
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightsvARB")]
             public static 
             void Weight(Int32 size, Int16[] weights)
@@ -33875,6 +33841,40 @@ namespace OpenTK.Graphics
                 Delegates.glWeightdvARB((Int32)size, (Double*)weights);
             }
 
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightubvARB")]
+            public static 
+            void Weight(Int32 size, Byte[] weights)
+            {
+                unsafe
+                {
+                    fixed (Byte* weights_ptr = weights)
+                    {
+                        Delegates.glWeightubvARB((Int32)size, (Byte*)weights_ptr);
+                    }
+                }
+            }
+
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightubvARB")]
+            public static 
+            void Weight(Int32 size, ref Byte weights)
+            {
+                unsafe
+                {
+                    fixed (Byte* weights_ptr = &weights)
+                    {
+                        Delegates.glWeightubvARB((Int32)size, (Byte*)weights_ptr);
+                    }
+                }
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightubvARB")]
+            public static 
+            unsafe void Weight(Int32 size, Byte* weights)
+            {
+                Delegates.glWeightubvARB((Int32)size, (Byte*)weights);
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightusvARB")]
             public static 
@@ -35298,19 +35298,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
-            public static 
-            void VertexAttrib4N(Int32 index, Byte[] v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4NbvARB((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
             public static 
@@ -35325,19 +35312,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
-            public static 
-            void VertexAttrib4N(Int32 index, ref Byte v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = &v)
-                    {
-                        Delegates.glVertexAttrib4NbvARB((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
             public static 
@@ -35346,14 +35320,6 @@ namespace OpenTK.Graphics
                 Delegates.glVertexAttrib4NbvARB((UInt32)index, (SByte*)v);
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
-            public static 
-            unsafe void VertexAttrib4N(Int32 index, Byte* v)
-            {
-                Delegates.glVertexAttrib4NbvARB((UInt32)index, (SByte*)v);
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NivARB")]
             public static 
@@ -35523,6 +35489,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
+            public static 
+            void VertexAttrib4N(Int32 index, Byte[] v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4NubvARB((UInt32)index, (Byte*)v_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
             public static 
@@ -35537,6 +35516,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
+            public static 
+            void VertexAttrib4N(Int32 index, ref Byte v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = &v)
+                    {
+                        Delegates.glVertexAttrib4NubvARB((UInt32)index, (Byte*)v_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
             public static 
@@ -35545,6 +35537,14 @@ namespace OpenTK.Graphics
                 Delegates.glVertexAttrib4NubvARB((UInt32)index, (Byte*)v);
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
+            public static 
+            unsafe void VertexAttrib4N(Int32 index, Byte* v)
+            {
+                Delegates.glVertexAttrib4NubvARB((UInt32)index, (Byte*)v);
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NuivARB")]
             public static 
@@ -35631,19 +35631,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4bvARB")]
-            public static 
-            void VertexAttrib4(Int32 index, Byte[] v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4bvARB((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4bvARB")]
             public static 
@@ -35658,19 +35645,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4bvARB")]
-            public static 
-            void VertexAttrib4(Int32 index, ref Byte v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = &v)
-                    {
-                        Delegates.glVertexAttrib4bvARB((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4bvARB")]
             public static 
@@ -35679,14 +35653,6 @@ namespace OpenTK.Graphics
                 Delegates.glVertexAttrib4bvARB((UInt32)index, (SByte*)v);
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4bvARB")]
-            public static 
-            unsafe void VertexAttrib4(Int32 index, Byte* v)
-            {
-                Delegates.glVertexAttrib4bvARB((UInt32)index, (SByte*)v);
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4dARB")]
             public static 
@@ -36026,6 +35992,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
+            public static 
+            void VertexAttrib4(Int32 index, Byte[] v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4ubvARB((UInt32)index, (Byte*)v_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
             public static 
@@ -36040,6 +36019,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
+            public static 
+            void VertexAttrib4(Int32 index, ref Byte v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = &v)
+                    {
+                        Delegates.glVertexAttrib4ubvARB((UInt32)index, (Byte*)v_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
             public static 
@@ -36048,6 +36040,14 @@ namespace OpenTK.Graphics
                 Delegates.glVertexAttrib4ubvARB((UInt32)index, (Byte*)v);
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
+            public static 
+            unsafe void VertexAttrib4(Int32 index, Byte* v)
+            {
+                Delegates.glVertexAttrib4ubvARB((UInt32)index, (Byte*)v);
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4uivARB")]
             public static 
@@ -41247,13 +41247,6 @@ namespace OpenTK.Graphics
                 Delegates.glSecondaryColor3bEXT((SByte)red, (SByte)green, (SByte)blue);
             }
 
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bEXT")]
-            public static 
-            void SecondaryColor3(Byte red, Byte green, Byte blue)
-            {
-                Delegates.glSecondaryColor3bEXT((SByte)red, (SByte)green, (SByte)blue);
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
             public static 
@@ -41268,19 +41261,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
-            public static 
-            void SecondaryColor3(Byte[] v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = v)
-                    {
-                        Delegates.glSecondaryColor3bvEXT((SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
             public static 
@@ -41295,19 +41275,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
-            public static 
-            void SecondaryColor3(ref Byte v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = &v)
-                    {
-                        Delegates.glSecondaryColor3bvEXT((SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
             public static 
@@ -41316,14 +41283,6 @@ namespace OpenTK.Graphics
                 Delegates.glSecondaryColor3bvEXT((SByte*)v);
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
-            public static 
-            unsafe void SecondaryColor3(Byte* v)
-            {
-                Delegates.glSecondaryColor3bvEXT((SByte*)v);
-            }
-
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3dEXT")]
             public static 
             void SecondaryColor3(Double red, Double green, Double blue)
@@ -41488,6 +41447,47 @@ namespace OpenTK.Graphics
                 Delegates.glSecondaryColor3svEXT((Int16*)v);
             }
 
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubEXT")]
+            public static 
+            void SecondaryColor3(Byte red, Byte green, Byte blue)
+            {
+                Delegates.glSecondaryColor3ubEXT((Byte)red, (Byte)green, (Byte)blue);
+            }
+
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubvEXT")]
+            public static 
+            void SecondaryColor3(Byte[] v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = v)
+                    {
+                        Delegates.glSecondaryColor3ubvEXT((Byte*)v_ptr);
+                    }
+                }
+            }
+
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubvEXT")]
+            public static 
+            void SecondaryColor3(ref Byte v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = &v)
+                    {
+                        Delegates.glSecondaryColor3ubvEXT((Byte*)v_ptr);
+                    }
+                }
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubvEXT")]
+            public static 
+            unsafe void SecondaryColor3(Byte* v)
+            {
+                Delegates.glSecondaryColor3ubvEXT((Byte*)v);
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3uiEXT")]
             public static 
@@ -42804,19 +42804,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
-            public static 
-            void Variant(Int32 id, Byte[] addr)
-            {
-                unsafe
-                {
-                    fixed (Byte* addr_ptr = addr)
-                    {
-                        Delegates.glVariantbvEXT((UInt32)id, (SByte*)addr_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
             public static 
@@ -42831,19 +42818,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
-            public static 
-            void Variant(Int32 id, ref Byte addr)
-            {
-                unsafe
-                {
-                    fixed (Byte* addr_ptr = &addr)
-                    {
-                        Delegates.glVariantbvEXT((UInt32)id, (SByte*)addr_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
             public static 
@@ -42852,14 +42826,6 @@ namespace OpenTK.Graphics
                 Delegates.glVariantbvEXT((UInt32)id, (SByte*)addr);
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
-            public static 
-            unsafe void Variant(Int32 id, Byte* addr)
-            {
-                Delegates.glVariantbvEXT((UInt32)id, (SByte*)addr);
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantsvEXT")]
             public static 
@@ -43154,6 +43120,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
+            public static 
+            void Variant(Int32 id, Byte[] addr)
+            {
+                unsafe
+                {
+                    fixed (Byte* addr_ptr = addr)
+                    {
+                        Delegates.glVariantubvEXT((UInt32)id, (Byte*)addr_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
             public static 
@@ -43168,6 +43147,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
+            public static 
+            void Variant(Int32 id, ref Byte addr)
+            {
+                unsafe
+                {
+                    fixed (Byte* addr_ptr = &addr)
+                    {
+                        Delegates.glVariantubvEXT((UInt32)id, (Byte*)addr_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
             public static 
@@ -43176,6 +43168,14 @@ namespace OpenTK.Graphics
                 Delegates.glVariantubvEXT((UInt32)id, (Byte*)addr);
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
+            public static 
+            unsafe void Variant(Int32 id, Byte* addr)
+            {
+                Delegates.glVariantubvEXT((UInt32)id, (Byte*)addr);
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantusvEXT")]
             public static 
@@ -45511,19 +45511,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4bvEXT")]
-            public static 
-            void VertexAttribI4(Int32 index, Byte[] v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribI4bvEXT((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4bvEXT")]
             public static 
@@ -45538,19 +45525,6 @@ namespace OpenTK.Graphics
                 }
             }
 
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4bvEXT")]
-            public static 
-            void VertexAttribI4(Int32 index, ref Byte v)
-            {
-                unsafe
-                {
-                    fixed (Byte* v_ptr = &v)
-                    {
-                        Delegates.glVertexAttribI4bvEXT((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4bvEXT")]
             public static 
@@ -45559,14 +45533,6 @@ namespace OpenTK.Graphics
                 Delegates.glVertexAttribI4bvEXT((UInt32)index, (SByte*)v);
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4bvEXT")]
-            public static 
-            unsafe void VertexAttribI4(Int32 index, Byte* v)
-            {
-                Delegates.glVertexAttribI4bvEXT((UInt32)index, (SByte*)v);
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4svEXT")]
             public static 
@@ -45651,6 +45617,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
+            public static 
+            void VertexAttribI4(Int32 index, Byte[] v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribI4ubvEXT((UInt32)index, (Byte*)v_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
             public static 
@@ -45665,6 +45644,19 @@ namespace OpenTK.Graphics
                 }
             }
 
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
+            public static 
+            void VertexAttribI4(Int32 index, ref Byte v)
+            {
+                unsafe
+                {
+                    fixed (Byte* v_ptr = &v)
+                    {
+                        Delegates.glVertexAttribI4ubvEXT((UInt32)index, (Byte*)v_ptr);
+                    }
+                }
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
             public static 
@@ -45673,6 +45665,14 @@ namespace OpenTK.Graphics
                 Delegates.glVertexAttribI4ubvEXT((UInt32)index, (Byte*)v);
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
+            public static 
+            unsafe void VertexAttribI4(Int32 index, Byte* v)
+            {
+                Delegates.glVertexAttribI4ubvEXT((UInt32)index, (Byte*)v);
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4usvEXT")]
             public static 
@@ -55992,13 +55992,6 @@ namespace OpenTK.Graphics
                 Delegates.glGlobalAlphaFactorbSUN((SByte)factor);
             }
 
-            [AutoGenerated(Category = "SunGlobalAlpha", Version = "1.1", EntryPoint = "glGlobalAlphaFactorbSUN")]
-            public static 
-            void GlobalAlphaFactor(Byte factor)
-            {
-                Delegates.glGlobalAlphaFactorbSUN((SByte)factor);
-            }
-
             [AutoGenerated(Category = "SunGlobalAlpha", Version = "1.1", EntryPoint = "glGlobalAlphaFactorsSUN")]
             public static 
             void GlobalAlphaFactors(Int16 factor)
@@ -56027,6 +56020,13 @@ namespace OpenTK.Graphics
                 Delegates.glGlobalAlphaFactordSUN((Double)factor);
             }
 
+            [AutoGenerated(Category = "SunGlobalAlpha", Version = "1.1", EntryPoint = "glGlobalAlphaFactorubSUN")]
+            public static 
+            void GlobalAlphaFactor(Byte factor)
+            {
+                Delegates.glGlobalAlphaFactorubSUN((Byte)factor);
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunGlobalAlpha", Version = "1.1", EntryPoint = "glGlobalAlphaFactorusSUN")]
             public static