diff --git a/Box2D.NET.Bindgen/Box2D.NET.Bindgen.csproj b/Box2D.NET.Bindgen/Box2D.NET.Bindgen.csproj
index efa26fe..57fc9fd 100644
--- a/Box2D.NET.Bindgen/Box2D.NET.Bindgen.csproj
+++ b/Box2D.NET.Bindgen/Box2D.NET.Bindgen.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bindgen.NET" Version="0.1.9"/>
+        <PackageReference Include="Bindgen.NET" Version="0.1.13"/>
     </ItemGroup>
 
 </Project>
diff --git a/Box2D.NET.Bindgen/Program.cs b/Box2D.NET.Bindgen/Program.cs
index d33df0c..04e318b 100644
--- a/Box2D.NET.Bindgen/Program.cs
+++ b/Box2D.NET.Bindgen/Program.cs
@@ -25,23 +25,11 @@
 
     TreatInputFileAsRawSourceCode = true,
     InputFile = """
-                #include <box2d/api.h>
+                #include <box2d/base.h>
                 #include <box2d/box2d.h>
-                #include <box2d/callbacks.h>
-                #include <box2d/color.h>
-                #include <box2d/constants.h>
-                #include <box2d/debug_draw.h>
-                #include <box2d/distance.h>
-                #include <box2d/dynamic_tree.h>
-                #include <box2d/event_types.h>
-                #include <box2d/geometry.h>
-                #include <box2d/hull.h>
+                #include <box2d/collision.h>
                 #include <box2d/id.h>
-                #include <box2d/joint_types.h>
-                #include <box2d/manifold.h>
-                #include <box2d/math.h>
-                #include <box2d/math_types.h>
-                #include <box2d/timer.h>
+                #include <box2d/math_functions.h>
                 #include <box2d/types.h>
                 """,
     OutputFile = GetOutputDirectory("B2.g.cs"),
diff --git a/Box2D.NET.Bindings/B2.g.cs b/Box2D.NET.Bindings/B2.g.cs
index e62a00a..9395992 100644
--- a/Box2D.NET.Bindings/B2.g.cs
+++ b/Box2D.NET.Bindings/B2.g.cs
@@ -22,6 +22,12 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Abs", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 Abs(Vec2 a);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2AbsFloat", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float AbsFloat(float a);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2AbsInt", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int AbsInt(int a);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Add", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 Add(Vec2 a, Vec2 b);
 
@@ -40,6 +46,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_ApplyLinearImpulseToCenter", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodyApplyLinearImpulseToCenter(BodyId bodyId, Vec2 impulse, byte wake);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_ApplyMassFromShapes", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void BodyApplyMassFromShapes(BodyId bodyId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_ApplyTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodyApplyTorque(BodyId bodyId, float torque, byte wake);
 
@@ -52,6 +61,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_Enable", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodyEnable(BodyId bodyId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_EnableHitEvents", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void BodyEnableHitEvents(BodyId bodyId, byte enableHitEvents);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_EnableSleep", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodyEnableSleep(BodyId bodyId, byte enableSleep);
 
@@ -64,21 +76,27 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetAngularVelocity", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float BodyGetAngularVelocity(BodyId bodyId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetAutomaticMass", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern byte BodyGetAutomaticMass(BodyId bodyId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetContactCapacity", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern int BodyGetContactCapacity(BodyId bodyId);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetContactData", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern int BodyGetContactData(BodyId bodyId, ContactData* contactData, int capacity);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetFirstShape", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern ShapeId BodyGetFirstShape(BodyId bodyId);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetGravityScale", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float BodyGetGravityScale(BodyId bodyId);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetInertiaTensor", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float BodyGetInertiaTensor(BodyId bodyId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetJointCount", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int BodyGetJointCount(BodyId bodyId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetJoints", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int BodyGetJoints(BodyId bodyId, JointId* jointArray, int capacity);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetLinearDamping", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float BodyGetLinearDamping(BodyId bodyId);
 
@@ -100,15 +118,21 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetMassData", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern MassData BodyGetMassData(BodyId bodyId);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetNextShape", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern ShapeId BodyGetNextShape(ShapeId shapeId);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetPosition", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 BodyGetPosition(BodyId bodyId);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetRotation", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Rot BodyGetRotation(BodyId bodyId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetShapeCount", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int BodyGetShapeCount(BodyId bodyId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetShapes", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int BodyGetShapes(BodyId bodyId, ShapeId* shapeArray, int capacity);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetSleepThreshold", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float BodyGetSleepThreshold(BodyId bodyId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_GetTransform", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Transform BodyGetTransform(BodyId bodyId);
 
@@ -145,15 +169,18 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_IsValid", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte BodyIsValid(BodyId id);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_ResetMassData", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void BodyResetMassData(BodyId bodyId);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetAngularDamping", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodySetAngularDamping(BodyId bodyId, float angularDamping);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetAngularVelocity", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodySetAngularVelocity(BodyId bodyId, float angularVelocity);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetAutomaticMass", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void BodySetAutomaticMass(BodyId bodyId, byte automaticMass);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetAwake", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void BodySetAwake(BodyId bodyId, byte awake);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetBullet", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodySetBullet(BodyId bodyId, byte flag);
 
@@ -172,6 +199,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetMassData", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodySetMassData(BodyId bodyId, MassData massData);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetSleepThreshold", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void BodySetSleepThreshold(BodyId bodyId, float sleepVelocity);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetTransform", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodySetTransform(BodyId bodyId, Vec2 position, float angle);
 
@@ -181,9 +211,6 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_SetUserData", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void BodySetUserData(BodyId bodyId, void* userData);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Body_Wake", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void BodyWake(BodyId bodyId);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Chain_IsValid", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte ChainIsValid(ChainId id);
 
@@ -196,6 +223,12 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Clamp", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 Clamp(Vec2 v, Vec2 a, Vec2 b);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2ClampFloat", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float ClampFloat(float a, float lower, float upper);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2ClampInt", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int ClampInt(int a, int lower, int upper);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2CollideCapsuleAndCircle", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Manifold CollideCapsuleAndCircle(Capsule* capsuleA, Transform xfA, Circle* circleB, Transform xfB);
 
@@ -355,9 +388,6 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DestroyBody", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void DestroyBody(BodyId bodyId);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DestroyBodyAndJoints", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void DestroyBodyAndJoints(BodyId bodyId);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DestroyChain", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void DestroyChain(ChainId chainId);
 
@@ -373,8 +403,14 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Distance", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float Distance(Vec2 a, Vec2 b);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_GetConstraintForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float DistanceJointGetConstraintForce(JointId jointId, float timeStep);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_EnableLimit", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void DistanceJointEnableLimit(JointId jointId, byte enableLimit);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_EnableMotor", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void DistanceJointEnableMotor(JointId jointId, byte enableMotor);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_EnableSpring", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void DistanceJointEnableSpring(JointId jointId, byte enableSpring);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_GetCurrentLength", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float DistanceJointGetCurrentLength(JointId jointId);
@@ -391,17 +427,44 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_GetMaxLength", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float DistanceJointGetMaxLength(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_GetMaxMotorForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float DistanceJointGetMaxMotorForce(JointId jointId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_GetMinLength", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float DistanceJointGetMinLength(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_GetMotorForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float DistanceJointGetMotorForce(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_GetMotorSpeed", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float DistanceJointGetMotorSpeed(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_IsLimitEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern byte DistanceJointIsLimitEnabled(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_IsMotorEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern byte DistanceJointIsMotorEnabled(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_IsSpringEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern byte DistanceJointIsSpringEnabled(JointId jointId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_SetLength", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void DistanceJointSetLength(JointId jointId, float length);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_SetLengthRange", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void DistanceJointSetLengthRange(JointId jointId, float minLength, float maxLength);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_SetTuning", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void DistanceJointSetTuning(JointId jointId, float hertz, float dampingRatio);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_SetMaxMotorForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void DistanceJointSetMaxMotorForce(JointId jointId, float force);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_SetMotorSpeed", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void DistanceJointSetMotorSpeed(JointId jointId, float motorSpeed);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_SetSpringDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void DistanceJointSetSpringDampingRatio(JointId jointId, float dampingRatio);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceJoint_SetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void DistanceJointSetSpringHertz(JointId jointId, float hertz);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DistanceSquared", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float DistanceSquared(Vec2 a, Vec2 b);
@@ -409,9 +472,6 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Dot", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float Dot(Vec2 a, Vec2 b);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_Clone", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void DynamicTreeClone(DynamicTree* outTree, DynamicTree* inTree);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_Create", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern DynamicTree DynamicTreeCreate();
 
@@ -433,6 +493,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_GetAreaRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float DynamicTreeGetAreaRatio(DynamicTree* tree);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_GetByteCount", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int DynamicTreeGetByteCount(DynamicTree* tree);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_GetHeight", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern int DynamicTreeGetHeight(DynamicTree* tree);
 
@@ -449,13 +512,10 @@ public static unsafe partial class B2
         public static extern void DynamicTreeMoveProxy(DynamicTree* tree, int proxyId, AABB aabb);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_Query", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void DynamicTreeQuery(DynamicTree* tree, AABB aabb, System.IntPtr* callback, void* context);
-
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_QueryFiltered", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void DynamicTreeQueryFiltered(DynamicTree* tree, AABB aabb, uint maskBits, System.IntPtr* callback, void* context);
+        public static extern void DynamicTreeQuery(DynamicTree* tree, AABB aabb, uint maskBits, System.IntPtr callback, void* context);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_RayCast", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void DynamicTreeRayCast(DynamicTree* tree, RayCastInput* input, uint maskBits, System.IntPtr* callback, void* context);
+        public static extern void DynamicTreeRayCast(DynamicTree* tree, RayCastInput* input, uint maskBits, System.IntPtr callback, void* context);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_Rebuild", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern int DynamicTreeRebuild(DynamicTree* tree, byte fullBuild);
@@ -464,7 +524,7 @@ public static unsafe partial class B2
         public static extern void DynamicTreeRebuildBottomUp(DynamicTree* tree);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_ShapeCast", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void DynamicTreeShapeCast(DynamicTree* tree, ShapeCastInput* input, uint maskBits, System.IntPtr* callback, void* context);
+        public static extern void DynamicTreeShapeCast(DynamicTree* tree, ShapeCastInput* input, uint maskBits, System.IntPtr callback, void* context);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2DynamicTree_ShiftOrigin", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void DynamicTreeShiftOrigin(DynamicTree* tree, Vec2 newOrigin);
@@ -473,7 +533,7 @@ public static unsafe partial class B2
         public static extern void DynamicTreeValidate(DynamicTree* tree);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2GetByteCount", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern uint GetByteCount();
+        public static extern int GetByteCount();
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2GetInverse22", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Mat22 GetInverse22(Mat22 A);
@@ -481,6 +541,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2GetLengthAndNormalize", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 GetLengthAndNormalize(float* length, Vec2 v);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2GetLengthUnitsPerMeter", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float GetLengthUnitsPerMeter();
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2GetMilliseconds", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float GetMilliseconds(Timer* timer);
 
@@ -493,6 +556,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2GetTicks", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern long GetTicks(Timer* timer);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2GetVersion", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern Version GetVersion();
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2IntegrateRotation", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Rot IntegrateRotation(Rot q1, float deltaAngle);
 
@@ -506,7 +572,7 @@ public static unsafe partial class B2
         public static extern Vec2 InvRotateVector(Rot q, Vec2 v);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2InvTransformPoint", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Vec2 InvTransformPoint(Transform xf, Vec2 p);
+        public static extern Vec2 InvTransformPoint(Transform t, Vec2 p);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2IsNormalized", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte IsNormalized(Rot q);
@@ -526,6 +592,12 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Joint_GetCollideConnected", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte JointGetCollideConnected(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Joint_GetConstraintForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern Vec2 JointGetConstraintForce(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Joint_GetConstraintTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float JointGetConstraintTorque(JointId jointId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Joint_GetLocalAnchorA", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 JointGetLocalAnchorA(JointId jointId);
 
@@ -565,12 +637,6 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MakeBox", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Polygon MakeBox(float hx, float hy);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MakeColor", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Color MakeColor(HexColor hexCode);
-
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MakeColorAlpha", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Color MakeColorAlpha(HexColor hexCode, float alpha);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MakeOffsetBox", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Polygon MakeOffsetBox(float hx, float hy, Vec2 center, float angle);
 
@@ -595,17 +661,23 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Max", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 Max(Vec2 a, Vec2 b);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MaxFloat", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float MaxFloat(float a, float b);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MaxInt", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int MaxInt(int a, int b);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Min", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 Min(Vec2 a, Vec2 b);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MotorJoint_GetAngularOffset", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float MotorJointGetAngularOffset(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MinFloat", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float MinFloat(float a, float b);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MotorJoint_GetConstraintForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Vec2 MotorJointGetConstraintForce(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MinInt", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern int MinInt(int a, int b);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MotorJoint_GetConstraintTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float MotorJointGetConstraintTorque(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MotorJoint_GetAngularOffset", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float MotorJointGetAngularOffset(JointId jointId);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MotorJoint_GetCorrectionFactor", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float MotorJointGetCorrectionFactor(JointId jointId);
@@ -634,21 +706,30 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MotorJoint_SetMaxTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void MotorJointSetMaxTorque(JointId jointId, float maxTorque);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_GetDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float MouseJointGetDampingRatio(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_GetMaxForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float MouseJointGetMaxForce(JointId jointId);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_GetHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float MouseJointGetHertz(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_GetSpringDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float MouseJointGetSpringDampingRatio(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_GetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float MouseJointGetSpringHertz(JointId jointId);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_GetTarget", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 MouseJointGetTarget(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_SetMaxForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void MouseJointSetMaxForce(JointId jointId, float maxForce);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_SetSpringDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void MouseJointSetSpringDampingRatio(JointId jointId, float dampingRatio);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_SetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void MouseJointSetSpringHertz(JointId jointId, float hertz);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_SetTarget", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void MouseJointSetTarget(JointId jointId, Vec2 target);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2MouseJoint_SetTuning", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void MouseJointSetTuning(JointId jointId, float hertz, float dampingRatio);
-
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Mul", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 Mul(Vec2 a, Vec2 b);
 
@@ -700,11 +781,8 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_EnableMotor", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void PrismaticJointEnableMotor(JointId jointId, byte enableMotor);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_GetConstraintForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Vec2 PrismaticJointGetConstraintForce(JointId jointId);
-
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_GetConstraintTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float PrismaticJointGetConstraintTorque(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_EnableSpring", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void PrismaticJointEnableSpring(JointId jointId, byte enableSpring);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_GetLowerLimit", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float PrismaticJointGetLowerLimit(JointId jointId);
@@ -718,6 +796,12 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_GetMotorSpeed", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float PrismaticJointGetMotorSpeed(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_GetSpringDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float PrismaticJointGetSpringDampingRatio(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_GetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float PrismaticJointGetSpringHertz(JointId jointId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_GetUpperLimit", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float PrismaticJointGetUpperLimit(JointId jointId);
 
@@ -727,6 +811,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_IsMotorEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte PrismaticJointIsMotorEnabled(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_IsSpringEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern byte PrismaticJointIsSpringEnabled(JointId jointId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_SetLimits", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void PrismaticJointSetLimits(JointId jointId, float lower, float upper);
 
@@ -736,6 +823,12 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_SetMotorSpeed", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void PrismaticJointSetMotorSpeed(JointId jointId, float motorSpeed);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_SetSpringDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void PrismaticJointSetSpringDampingRatio(JointId jointId, float dampingRatio);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2PrismaticJoint_SetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void PrismaticJointSetSpringHertz(JointId jointId, float hertz);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RayCastCapsule", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern CastOutput RayCastCapsule(RayCastInput* input, Capsule* shape);
 
@@ -757,11 +850,11 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_EnableMotor", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void RevoluteJointEnableMotor(JointId jointId, byte enableMotor);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetConstraintForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Vec2 RevoluteJointGetConstraintForce(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_EnableSpring", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void RevoluteJointEnableSpring(JointId jointId, byte enableSpring);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetConstraintTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float RevoluteJointGetConstraintTorque(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetAngle", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float RevoluteJointGetAngle(JointId jointId);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetLowerLimit", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float RevoluteJointGetLowerLimit(JointId jointId);
@@ -775,6 +868,12 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetMotorTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float RevoluteJointGetMotorTorque(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetSpringDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float RevoluteJointGetSpringDampingRatio(JointId jointId);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float RevoluteJointGetSpringHertz(JointId jointId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_GetUpperLimit", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float RevoluteJointGetUpperLimit(JointId jointId);
 
@@ -793,6 +892,12 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_SetMotorSpeed", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void RevoluteJointSetMotorSpeed(JointId jointId, float motorSpeed);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_SetSpringDampingRatio", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void RevoluteJointSetSpringDampingRatio(JointId jointId, float dampingRatio);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RevoluteJoint_SetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void RevoluteJointSetSpringHertz(JointId jointId, float hertz);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2RightPerp", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 RightPerp(Vec2 v);
 
@@ -815,14 +920,20 @@ public static unsafe partial class B2
         public static extern SegmentDistanceResult SegmentDistance(Vec2 p1, Vec2 q1, Vec2 p2, Vec2 q2);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2SetAllocator", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void SetAllocator(System.IntPtr* allocFcn, System.IntPtr* freeFcn);
+        public static extern void SetAllocator(System.IntPtr allocFcn, System.IntPtr freeFcn);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2SetAssertFcn", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void SetAssertFcn(System.IntPtr* assertFcn);
+        public static extern void SetAssertFcn(System.IntPtr assertFcn);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2SetLengthUnitsPerMeter", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void SetLengthUnitsPerMeter(float lengthUnits);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_AreContactEventsEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte ShapeAreContactEventsEnabled(ShapeId shapeId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_AreHitEventsEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern byte ShapeAreHitEventsEnabled(ShapeId shapeId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_ArePreSolveEventsEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte ShapeArePreSolveEventsEnabled(ShapeId shapeId);
 
@@ -832,6 +943,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_EnableContactEvents", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void ShapeEnableContactEvents(ShapeId shapeId, byte flag);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_EnableHitEvents", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void ShapeEnableHitEvents(ShapeId shapeId, byte flag);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_EnablePreSolveEvents", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void ShapeEnablePreSolveEvents(ShapeId shapeId, byte flag);
 
@@ -850,6 +964,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_GetCircle", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Circle ShapeGetCircle(ShapeId shapeId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_GetClosestPoint", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern Vec2 ShapeGetClosestPoint(ShapeId shapeId, Vec2 target);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Shape_GetContactCapacity", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern int ShapeGetContactCapacity(ShapeId shapeId);
 
@@ -944,7 +1061,7 @@ public static unsafe partial class B2
         public static extern DistanceOutput ShapeDistance(DistanceCache* cache, DistanceInput* input);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2SleepMilliseconds", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void SleepMilliseconds(float milliseconds);
+        public static extern void SleepMilliseconds(int milliseconds);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Solve22", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Vec2 Solve22(Mat22 A, Vec2 b);
@@ -956,11 +1073,14 @@ public static unsafe partial class B2
         public static extern TOIOutput TimeOfImpact(TOIInput* input);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2TransformPoint", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Vec2 TransformPoint(Transform xf, Vec2 p);
+        public static extern Vec2 TransformPoint(Transform t, Vec2 p);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2TransformPolygon", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Polygon TransformPolygon(Transform transform, Polygon* polygon);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2UnwindAngle", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern float UnwindAngle(float angle);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2ValidateHull", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte ValidateHull(Hull* hull);
 
@@ -997,11 +1117,8 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_EnableMotor", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void WheelJointEnableMotor(JointId jointId, byte enableMotor);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_GetConstraintForce", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern Vec2 WheelJointGetConstraintForce(JointId jointId);
-
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_GetConstraintTorque", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern float WheelJointGetConstraintTorque(JointId jointId);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_EnableSpring", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WheelJointEnableSpring(JointId jointId, byte enableSpring);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_GetLowerLimit", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern float WheelJointGetLowerLimit(JointId jointId);
@@ -1030,6 +1147,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_IsMotorEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern byte WheelJointIsMotorEnabled(JointId jointId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_IsSpringEnabled", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern byte WheelJointIsSpringEnabled(JointId jointId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_SetLimits", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void WheelJointSetLimits(JointId jointId, float lower, float upper);
 
@@ -1045,14 +1165,26 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2WheelJoint_SetSpringHertz", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void WheelJointSetSpringHertz(JointId jointId, float hertz);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_CapsuleCast", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldCapsuleCast(WorldId worldId, Capsule* capsule, Transform originTransform, Vec2 translation, QueryFilter filter, System.IntPtr* fcn, void* context);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_CastCapsule", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldCastCapsule(WorldId worldId, Capsule* capsule, Transform originTransform, Vec2 translation, QueryFilter filter, System.IntPtr fcn, void* context);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_CircleCast", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldCircleCast(WorldId worldId, Circle* circle, Transform originTransform, Vec2 translation, QueryFilter filter, System.IntPtr* fcn, void* context);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_CastCircle", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldCastCircle(WorldId worldId, Circle* circle, Transform originTransform, Vec2 translation, QueryFilter filter, System.IntPtr fcn, void* context);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_CastPolygon", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldCastPolygon(WorldId worldId, Polygon* polygon, Transform originTransform, Vec2 translation, QueryFilter filter, System.IntPtr fcn, void* context);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_CastRay", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldCastRay(WorldId worldId, Vec2 origin, Vec2 translation, QueryFilter filter, System.IntPtr fcn, void* context);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_CastRayClosest", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern RayResult WorldCastRayClosest(WorldId worldId, Vec2 origin, Vec2 translation, QueryFilter filter);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_Draw", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldDraw(WorldId worldId, DebugDraw* debugDraw);
+        public static extern void WorldDraw(WorldId worldId, DebugDraw* draw);
+
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_DumpMemoryStats", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldDumpMemoryStats(WorldId worldId);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_EnableContinuous", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void WorldEnableContinuous(WorldId worldId, byte flag);
@@ -1063,6 +1195,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_EnableWarmStarting", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void WorldEnableWarmStarting(WorldId worldId, byte flag);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_Explode", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldExplode(WorldId worldId, Vec2 position, float radius, float impulse);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_GetBodyEvents", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern BodyEvents WorldGetBodyEvents(WorldId worldId);
 
@@ -1072,6 +1207,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_GetCounters", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Counters WorldGetCounters(WorldId worldId);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_GetGravity", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern Vec2 WorldGetGravity(WorldId worldId);
+
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_GetProfile", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern Profile WorldGetProfile(WorldId worldId);
 
@@ -1082,31 +1220,31 @@ public static unsafe partial class B2
         public static extern byte WorldIsValid(WorldId id);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_OverlapAABB", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldOverlapAABB(WorldId worldId, AABB aabb, QueryFilter filter, System.IntPtr* fcn, void* context);
+        public static extern void WorldOverlapAABB(WorldId worldId, AABB aabb, QueryFilter filter, System.IntPtr fcn, void* context);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_OverlapCapsule", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldOverlapCapsule(WorldId worldId, Capsule* capsule, Transform transform, QueryFilter filter, System.IntPtr* fcn, void* context);
+        public static extern void WorldOverlapCapsule(WorldId worldId, Capsule* capsule, Transform transform, QueryFilter filter, System.IntPtr fcn, void* context);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_OverlapCircle", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldOverlapCircle(WorldId worldId, Circle* circle, Transform transform, QueryFilter filter, System.IntPtr* fcn, void* context);
+        public static extern void WorldOverlapCircle(WorldId worldId, Circle* circle, Transform transform, QueryFilter filter, System.IntPtr fcn, void* context);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_OverlapPolygon", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldOverlapPolygon(WorldId worldId, Polygon* polygon, Transform transform, QueryFilter filter, System.IntPtr* fcn, void* context);
+        public static extern void WorldOverlapPolygon(WorldId worldId, Polygon* polygon, Transform transform, QueryFilter filter, System.IntPtr fcn, void* context);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_PolygonCast", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldPolygonCast(WorldId worldId, Polygon* polygon, Transform originTransform, Vec2 translation, QueryFilter filter, System.IntPtr* fcn, void* context);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_SetContactTuning", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldSetContactTuning(WorldId worldId, float hertz, float dampingRatio, float pushVelocity);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_RayCast", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldRayCast(WorldId worldId, Vec2 origin, Vec2 translation, QueryFilter filter, System.IntPtr* fcn, void* context);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_SetCustomFilterCallback", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldSetCustomFilterCallback(WorldId worldId, System.IntPtr fcn, void* context);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_RayCastClosest", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern RayResult WorldRayCastClosest(WorldId worldId, Vec2 origin, Vec2 translation, QueryFilter filter);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_SetGravity", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldSetGravity(WorldId worldId, Vec2 gravity);
 
-        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_SetContactTuning", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldSetContactTuning(WorldId worldId, float hertz, float dampingRatio, float pushVelocity);
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_SetHitEventThreshold", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void WorldSetHitEventThreshold(WorldId worldId, float value);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_SetPreSolveCallback", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
-        public static extern void WorldSetPreSolveCallback(WorldId worldId, System.IntPtr* fcn, void* context);
+        public static extern void WorldSetPreSolveCallback(WorldId worldId, System.IntPtr fcn, void* context);
 
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_SetRestitutionThreshold", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void WorldSetRestitutionThreshold(WorldId worldId, float value);
@@ -1114,6 +1252,9 @@ public static unsafe partial class B2
         [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2World_Step", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
         public static extern void WorldStep(WorldId worldId, float timeStep, int subStepCount);
 
+        [System.Runtime.InteropServices.DllImport(BindgenInternal.DllImportPath, EntryPoint = "b2Yield", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl)]
+        public static extern void Yield();
+
         public partial struct AABB
         {
             public Vec2 lowerBound;
@@ -1139,6 +1280,8 @@ public partial struct BodyDef
 
             public float gravityScale;
 
+            public float sleepThreshold;
+
             public void* userData;
 
             public byte enableSleep;
@@ -1150,6 +1293,10 @@ public partial struct BodyDef
             public byte isBullet;
 
             public byte isEnabled;
+
+            public byte automaticMass;
+
+            public int internalValue;
         }
 
         public partial struct BodyEvents
@@ -1161,9 +1308,9 @@ public partial struct BodyEvents
 
         public partial struct BodyId
         {
-            public int index;
+            public int index1;
 
-            public ushort world;
+            public ushort world0;
 
             public ushort revision;
         }
@@ -1181,9 +1328,9 @@ public partial struct BodyMoveEvent
 
         public partial struct Capsule
         {
-            public Vec2 point1;
+            public Vec2 center1;
 
-            public Vec2 point2;
+            public Vec2 center2;
 
             public float radius;
         }
@@ -1203,55 +1350,44 @@ public partial struct CastOutput
 
         public partial struct ChainDef
         {
+            public void* userData;
+
             public Vec2* points;
 
             public int count;
 
-            public byte isLoop;
-
-            public void* userData;
-
             public float friction;
 
             public float restitution;
 
             public Filter filter;
+
+            public byte isLoop;
+
+            public int internalValue;
         }
 
         public partial struct ChainId
         {
-            public int index;
+            public int index1;
 
-            public short world;
+            public ushort world0;
 
             public ushort revision;
         }
 
         public partial struct Circle
         {
-            public Vec2 point;
+            public Vec2 center;
 
             public float radius;
         }
 
-        public partial struct Color
-        {
-            public float r;
-
-            public float g;
-
-            public float b;
-
-            public float a;
-        }
-
         public partial struct ContactBeginTouchEvent
         {
             public ShapeId shapeIdA;
 
             public ShapeId shapeIdB;
-
-            public Manifold manifold;
         }
 
         public partial struct ContactData
@@ -1276,66 +1412,87 @@ public partial struct ContactEvents
 
             public ContactEndTouchEvent* endEvents;
 
+            public ContactHitEvent* hitEvents;
+
             public int beginCount;
 
             public int endCount;
+
+            public int hitCount;
+        }
+
+        public partial struct ContactHitEvent
+        {
+            public ShapeId shapeIdA;
+
+            public ShapeId shapeIdB;
+
+            public Vec2 point;
+
+            public Vec2 normal;
+
+            public float approachSpeed;
         }
 
         public partial struct Counters
         {
-            public int islandCount;
+            public int staticBodyCount;
 
             public int bodyCount;
 
+            public int shapeCount;
+
             public int contactCount;
 
             public int jointCount;
 
-            public int proxyCount;
-
-            public int pairCount;
+            public int islandCount;
 
-            public int treeHeight;
+            public int stackUsed;
 
-            public int stackCapacity;
+            public int staticTreeHeight;
 
-            public int stackUsed;
+            public int treeHeight;
 
             public int byteCount;
 
             public int taskCount;
 
-            public fixed int colorCounts[13];
+            public fixed int colorCounts[12];
         }
 
         public partial struct DebugDraw
         {
-            public System.IntPtr DrawPolygon; // delegate* unmanaged<Vec2*, int, Color, void*, void>
+            public System.IntPtr DrawPolygon; // delegate*<Vec2*, int, HexColor, void*, void>
+
+            public System.IntPtr DrawSolidPolygon; // delegate*<Transform, Vec2*, int, float, HexColor, void*, void>
 
-            public System.IntPtr DrawSolidPolygon; // delegate* unmanaged<Vec2*, int, Color, void*, void>
+            public System.IntPtr DrawCircle; // delegate*<Vec2, float, HexColor, void*, void>
 
-            public System.IntPtr DrawRoundedPolygon; // delegate* unmanaged<Vec2*, int, float, Color, Color, void*, void>
+            public System.IntPtr DrawSolidCircle; // delegate*<Transform, float, HexColor, void*, void>
 
-            public System.IntPtr DrawCircle; // delegate* unmanaged<Vec2, float, Color, void*, void>
+            public System.IntPtr DrawCapsule; // delegate*<Vec2, Vec2, float, HexColor, void*, void>
 
-            public System.IntPtr DrawSolidCircle; // delegate* unmanaged<Vec2, float, Vec2, Color, void*, void>
+            public System.IntPtr DrawSolidCapsule; // delegate*<Vec2, Vec2, float, HexColor, void*, void>
 
-            public System.IntPtr DrawCapsule; // delegate* unmanaged<Vec2, Vec2, float, Color, void*, void>
+            public System.IntPtr DrawSegment; // delegate*<Vec2, Vec2, HexColor, void*, void>
 
-            public System.IntPtr DrawSolidCapsule; // delegate* unmanaged<Vec2, Vec2, float, Color, void*, void>
+            public System.IntPtr DrawTransform; // delegate*<Transform, void*, void>
 
-            public System.IntPtr DrawSegment; // delegate* unmanaged<Vec2, Vec2, Color, void*, void>
+            public System.IntPtr DrawPoint; // delegate*<Vec2, float, HexColor, void*, void>
 
-            public System.IntPtr DrawTransform; // delegate* unmanaged<Transform, void*, void>
+            public System.IntPtr DrawString; // delegate*<Vec2, byte*, void*, void>
 
-            public System.IntPtr DrawPoint; // delegate* unmanaged<Vec2, float, Color, void*, void>
+            public AABB drawingBounds;
 
-            public System.IntPtr DrawString; // delegate* unmanaged<Vec2, byte*, void*, void>
+            public byte useDrawingBounds;
 
             public byte drawShapes;
 
             public byte drawJoints;
 
+            public byte drawJointExtras;
+
             public byte drawAABBs;
 
             public byte drawMass;
@@ -1389,17 +1546,29 @@ public partial struct DistanceJointDef
 
             public float length;
 
+            public byte enableSpring;
+
+            public float hertz;
+
+            public float dampingRatio;
+
+            public byte enableLimit;
+
             public float minLength;
 
             public float maxLength;
 
-            public float hertz;
+            public byte enableMotor;
 
-            public float dampingRatio;
+            public float maxMotorForce;
+
+            public float motorSpeed;
 
             public byte collideConnected;
 
             public void* userData;
+
+            public int internalValue;
         }
 
         public partial struct DistanceOutput
@@ -1415,13 +1584,13 @@ public partial struct DistanceOutput
 
         public partial struct DistanceProxy
         {
-            public vertices_FixedBuffer vertices;
+            public points_FixedBuffer points;
 
             public int count;
 
             public float radius;
 
-            public partial struct vertices_FixedBuffer
+            public partial struct points_FixedBuffer
             {
                 public Vec2 Item0;
 
@@ -1513,9 +1682,9 @@ public partial struct points_FixedBuffer
 
         public partial struct JointId
         {
-            public int index;
+            public int index1;
 
-            public ushort world;
+            public ushort world0;
 
             public ushort revision;
         }
@@ -1557,6 +1726,8 @@ public partial struct ManifoldPoint
 
             public float maxNormalImpulse;
 
+            public float normalVelocity;
+
             public ushort id;
 
             public byte persisted;
@@ -1597,6 +1768,8 @@ public partial struct MotorJointDef
             public byte collideConnected;
 
             public void* userData;
+
+            public int internalValue;
         }
 
         public partial struct MouseJointDef
@@ -1611,9 +1784,13 @@ public partial struct MouseJointDef
 
             public float dampingRatio;
 
+            public float maxForce;
+
             public byte collideConnected;
 
             public void* userData;
+
+            public int internalValue;
         }
 
         public partial struct Polygon
@@ -1691,6 +1868,12 @@ public partial struct PrismaticJointDef
 
             public float referenceAngle;
 
+            public byte enableSpring;
+
+            public float hertz;
+
+            public float dampingRatio;
+
             public byte enableLimit;
 
             public float lowerTranslation;
@@ -1706,6 +1889,8 @@ public partial struct PrismaticJointDef
             public byte collideConnected;
 
             public void* userData;
+
+            public int internalValue;
         }
 
         public partial struct Profile
@@ -1722,6 +1907,34 @@ public partial struct Profile
 
             public float solveConstraints;
 
+            public float prepareTasks;
+
+            public float solverTasks;
+
+            public float prepareConstraints;
+
+            public float integrateVelocities;
+
+            public float warmStart;
+
+            public float solveVelocities;
+
+            public float integratePositions;
+
+            public float relaxVelocities;
+
+            public float applyRestitution;
+
+            public float storeImpulses;
+
+            public float finalizeBodies;
+
+            public float splitIslands;
+
+            public float sleepIslands;
+
+            public float hitEvents;
+
             public float broadphase;
 
             public float continuous;
@@ -1768,6 +1981,12 @@ public partial struct RevoluteJointDef
 
             public float referenceAngle;
 
+            public byte enableSpring;
+
+            public float hertz;
+
+            public float dampingRatio;
+
             public byte enableLimit;
 
             public float lowerAngle;
@@ -1785,13 +2004,15 @@ public partial struct RevoluteJointDef
             public byte collideConnected;
 
             public void* userData;
+
+            public int internalValue;
         }
 
         public partial struct Rot
         {
-            public float s;
-
             public float c;
+
+            public float s;
         }
 
         public partial struct Segment
@@ -1909,14 +2130,20 @@ public partial struct ShapeDef
 
             public byte enableContactEvents;
 
+            public byte enableHitEvents;
+
             public byte enablePreSolveEvents;
+
+            public byte forceContactCreation;
+
+            public int internalValue;
         }
 
         public partial struct ShapeId
         {
-            public int index;
+            public int index1;
 
-            public ushort world;
+            public ushort world0;
 
             public ushort revision;
         }
@@ -1929,7 +2156,7 @@ public partial struct SmoothSegment
 
             public Vec2 ghost2;
 
-            public int chainIndex;
+            public int chainId;
         }
 
         public partial struct Sweep
@@ -1985,7 +2212,7 @@ public partial struct TreeNode
 
             public uint categoryBits;
 
-            public AnonymousRecord_dynamic_tree_L27_C2 AnonymousRecord_dynamic_tree_L27_C2_Field;
+            public AnonymousRecord_collision_L586_C2 AnonymousRecord_collision_L586_C2_Field;
 
             public int child1;
 
@@ -1999,12 +2226,12 @@ public partial struct TreeNode
 
             public fixed byte pad[9];
 
-            public ref int parent => ref AnonymousRecord_dynamic_tree_L27_C2_Field.parent;
+            public ref int parent => ref AnonymousRecord_collision_L586_C2_Field.parent;
 
-            public ref int next => ref AnonymousRecord_dynamic_tree_L27_C2_Field.next;
+            public ref int next => ref AnonymousRecord_collision_L586_C2_Field.next;
 
             [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Explicit)]
-            public partial struct AnonymousRecord_dynamic_tree_L27_C2
+            public partial struct AnonymousRecord_collision_L586_C2
             {
                 [System.Runtime.InteropServices.FieldOffset(0)]
                 public int parent;
@@ -2053,6 +2280,8 @@ public partial struct WeldJointDef
             public byte collideConnected;
 
             public void* userData;
+
+            public int internalValue;
         }
 
         public partial struct WheelJointDef
@@ -2067,6 +2296,12 @@ public partial struct WheelJointDef
 
             public Vec2 localAxisA;
 
+            public byte enableSpring;
+
+            public float hertz;
+
+            public float dampingRatio;
+
             public byte enableLimit;
 
             public float lowerTranslation;
@@ -2079,13 +2314,11 @@ public partial struct WheelJointDef
 
             public float motorSpeed;
 
-            public float hertz;
-
-            public float dampingRatio;
-
             public byte collideConnected;
 
             public void* userData;
+
+            public int internalValue;
         }
 
         public partial struct WorldDef
@@ -2096,6 +2329,8 @@ public partial struct WorldDef
 
             public float contactPushoutVelocity;
 
+            public float hitEventThreshold;
+
             public float contactHertz;
 
             public float contactDampingRatio;
@@ -2108,28 +2343,20 @@ public partial struct WorldDef
 
             public byte enableContinous;
 
-            public int bodyCapacity;
-
-            public int shapeCapacity;
-
-            public int contactCapacity;
-
-            public int jointCapacity;
-
-            public int stackAllocatorCapacity;
-
-            public uint workerCount;
+            public int workerCount;
 
-            public System.IntPtr* enqueueTask; // delegate* unmanaged<System.IntPtr, int, int, void*, void*, void*>
+            public System.IntPtr enqueueTask; // delegate*<System.IntPtr, int, int, void*, void*, void*>
 
-            public System.IntPtr* finishTask; // delegate* unmanaged<void*, void*, void>
+            public System.IntPtr finishTask; // delegate*<void*, void*, void>
 
             public void* userTaskContext;
+
+            public int internalValue;
         }
 
         public partial struct WorldId
         {
-            public ushort index;
+            public ushort index1;
 
             public ushort revision;
         }
@@ -2146,372 +2373,100 @@ public enum HexColor : uint
         {
             colorAliceBlue = 15792383,
             colorAntiqueWhite = 16444375,
-            colorAntiqueWhite1 = 16773083,
-            colorAntiqueWhite2 = 15654860,
-            colorAntiqueWhite3 = 13484208,
-            colorAntiqueWhite4 = 9143160,
             colorAqua = 65535,
             colorAquamarine = 8388564,
-            colorAquamarine1 = 8388564,
-            colorAquamarine2 = 7794374,
-            colorAquamarine3 = 6737322,
-            colorAquamarine4 = 4557684,
             colorAzure = 15794175,
-            colorAzure1 = 15794175,
-            colorAzure2 = 14741230,
-            colorAzure3 = 12701133,
-            colorAzure4 = 8620939,
             colorBeige = 16119260,
             colorBisque = 16770244,
-            colorBisque1 = 16770244,
-            colorBisque2 = 15652279,
-            colorBisque3 = 13481886,
-            colorBisque4 = 9141611,
             colorBlack = 0,
             colorBlanchedAlmond = 16772045,
             colorBlue = 255,
-            colorBlue1 = 255,
-            colorBlue2 = 238,
-            colorBlue3 = 205,
-            colorBlue4 = 139,
             colorBlueViolet = 9055202,
             colorBrown = 10824234,
-            colorBrown1 = 16728128,
-            colorBrown2 = 15612731,
-            colorBrown3 = 13447987,
-            colorBrown4 = 9118499,
             colorBurlywood = 14596231,
-            colorBurlywood1 = 16765851,
-            colorBurlywood2 = 15648145,
-            colorBurlywood3 = 13478525,
-            colorBurlywood4 = 9139029,
             colorCadetBlue = 6266528,
-            colorCadetBlue1 = 10024447,
-            colorCadetBlue2 = 9364974,
-            colorCadetBlue3 = 8046029,
-            colorCadetBlue4 = 5473931,
             colorChartreuse = 8388352,
-            colorChartreuse1 = 8388352,
-            colorChartreuse2 = 7794176,
-            colorChartreuse3 = 6737152,
-            colorChartreuse4 = 4557568,
             colorChocolate = 13789470,
-            colorChocolate1 = 16744228,
-            colorChocolate2 = 15627809,
-            colorChocolate3 = 13461021,
-            colorChocolate4 = 9127187,
             colorCoral = 16744272,
-            colorCoral1 = 16740950,
-            colorCoral2 = 15624784,
-            colorCoral3 = 13458245,
-            colorCoral4 = 9125423,
             colorCornflowerBlue = 6591981,
             colorCornsilk = 16775388,
-            colorCornsilk1 = 16775388,
-            colorCornsilk2 = 15657165,
-            colorCornsilk3 = 13486257,
-            colorCornsilk4 = 9144440,
             colorCrimson = 14423100,
             colorCyan = 65535,
-            colorCyan1 = 65535,
-            colorCyan2 = 61166,
-            colorCyan3 = 52685,
-            colorCyan4 = 35723,
             colorDarkBlue = 139,
             colorDarkCyan = 35723,
             colorDarkGoldenrod = 12092939,
-            colorDarkGoldenrod1 = 16759055,
-            colorDarkGoldenrod2 = 15641870,
-            colorDarkGoldenrod3 = 13473036,
-            colorDarkGoldenrod4 = 9135368,
             colorDarkGray = 11119017,
             colorDarkGreen = 25600,
             colorDarkKhaki = 12433259,
             colorDarkMagenta = 9109643,
             colorDarkOliveGreen = 5597999,
-            colorDarkOliveGreen1 = 13303664,
-            colorDarkOliveGreen2 = 12381800,
-            colorDarkOliveGreen3 = 10669402,
-            colorDarkOliveGreen4 = 7244605,
             colorDarkOrange = 16747520,
-            colorDarkOrange1 = 16744192,
-            colorDarkOrange2 = 15627776,
-            colorDarkOrange3 = 13460992,
-            colorDarkOrange4 = 9127168,
             colorDarkOrchid = 10040012,
-            colorDarkOrchid1 = 12533503,
-            colorDarkOrchid2 = 11680494,
-            colorDarkOrchid3 = 10105549,
-            colorDarkOrchid4 = 6824587,
             colorDarkRed = 9109504,
             colorDarkSalmon = 15308410,
             colorDarkSeaGreen = 9419919,
-            colorDarkSeaGreen1 = 12713921,
-            colorDarkSeaGreen2 = 11857588,
-            colorDarkSeaGreen3 = 10210715,
-            colorDarkSeaGreen4 = 6916969,
             colorDarkSlateBlue = 4734347,
             colorDarkSlateGray = 3100495,
-            colorDarkSlateGray1 = 9961471,
-            colorDarkSlateGray2 = 9301742,
-            colorDarkSlateGray3 = 7982541,
-            colorDarkSlateGray4 = 5409675,
             colorDarkTurquoise = 52945,
             colorDarkViolet = 9699539,
             colorDeepPink = 16716947,
-            colorDeepPink1 = 16716947,
-            colorDeepPink2 = 15602313,
-            colorDeepPink3 = 13439094,
-            colorDeepPink4 = 9112144,
             colorDeepSkyBlue = 49151,
-            colorDeepSkyBlue1 = 49151,
-            colorDeepSkyBlue2 = 45806,
-            colorDeepSkyBlue3 = 39629,
-            colorDeepSkyBlue4 = 26763,
             colorDimGray = 6908265,
             colorDodgerBlue = 2003199,
-            colorDodgerBlue1 = 2003199,
-            colorDodgerBlue2 = 1869550,
-            colorDodgerBlue3 = 1602765,
-            colorDodgerBlue4 = 1068683,
             colorFirebrick = 11674146,
-            colorFirebrick1 = 16724016,
-            colorFirebrick2 = 15608876,
-            colorFirebrick3 = 13444646,
-            colorFirebrick4 = 9116186,
             colorFloralWhite = 16775920,
             colorForestGreen = 2263842,
             colorFuchsia = 16711935,
             colorGainsboro = 14474460,
             colorGhostWhite = 16316671,
             colorGold = 16766720,
-            colorGold1 = 16766720,
-            colorGold2 = 15649024,
-            colorGold3 = 13479168,
-            colorGold4 = 9139456,
             colorGoldenrod = 14329120,
-            colorGoldenrod1 = 16761125,
-            colorGoldenrod2 = 15643682,
-            colorGoldenrod3 = 13474589,
-            colorGoldenrod4 = 9136404,
             colorGray = 12500670,
-            colorGray0 = 0,
-            colorGray1 = 197379,
-            colorGray10 = 1710618,
-            colorGray100 = 16777215,
-            colorGray11 = 1842204,
-            colorGray12 = 2039583,
-            colorGray13 = 2171169,
-            colorGray14 = 2368548,
-            colorGray15 = 2500134,
-            colorGray16 = 2697513,
-            colorGray17 = 2829099,
-            colorGray18 = 3026478,
-            colorGray19 = 3158064,
-            colorGray2 = 328965,
-            colorGray20 = 3355443,
-            colorGray21 = 3552822,
-            colorGray22 = 3684408,
-            colorGray23 = 3881787,
-            colorGray24 = 4013373,
-            colorGray25 = 4210752,
-            colorGray26 = 4342338,
-            colorGray27 = 4539717,
-            colorGray28 = 4671303,
-            colorGray29 = 4868682,
-            colorGray3 = 526344,
-            colorGray30 = 5066061,
-            colorGray31 = 5197647,
-            colorGray32 = 5395026,
-            colorGray33 = 5526612,
-            colorGray34 = 5723991,
-            colorGray35 = 5855577,
-            colorGray36 = 6052956,
-            colorGray37 = 6184542,
-            colorGray38 = 6381921,
-            colorGray39 = 6513507,
-            colorGray4 = 657930,
-            colorGray40 = 6710886,
-            colorGray41 = 6908265,
-            colorGray42 = 7039851,
-            colorGray43 = 7237230,
-            colorGray44 = 7368816,
-            colorGray45 = 7566195,
-            colorGray46 = 7697781,
-            colorGray47 = 7895160,
-            colorGray48 = 8026746,
-            colorGray49 = 8224125,
-            colorGray5 = 855309,
-            colorGray50 = 8355711,
-            colorGray51 = 8553090,
-            colorGray52 = 8750469,
-            colorGray53 = 8882055,
-            colorGray54 = 9079434,
-            colorGray55 = 9211020,
-            colorGray56 = 9408399,
-            colorGray57 = 9539985,
-            colorGray58 = 9737364,
-            colorGray59 = 9868950,
-            colorGray6 = 986895,
-            colorGray60 = 10066329,
-            colorGray61 = 10263708,
-            colorGray62 = 10395294,
-            colorGray63 = 10592673,
-            colorGray64 = 10724259,
-            colorGray65 = 10921638,
-            colorGray66 = 11053224,
-            colorGray67 = 11250603,
-            colorGray68 = 11382189,
-            colorGray69 = 11579568,
-            colorGray7 = 1184274,
-            colorGray70 = 11776947,
-            colorGray71 = 11908533,
-            colorGray72 = 12105912,
-            colorGray73 = 12237498,
-            colorGray74 = 12434877,
-            colorGray75 = 12566463,
-            colorGray76 = 12763842,
-            colorGray77 = 12895428,
-            colorGray78 = 13092807,
-            colorGray79 = 13224393,
-            colorGray8 = 1315860,
-            colorGray80 = 13421772,
-            colorGray81 = 13619151,
-            colorGray82 = 13750737,
-            colorGray83 = 13948116,
-            colorGray84 = 14079702,
-            colorGray85 = 14277081,
-            colorGray86 = 14408667,
-            colorGray87 = 14606046,
-            colorGray88 = 14737632,
-            colorGray89 = 14935011,
-            colorGray9 = 1513239,
-            colorGray90 = 15066597,
-            colorGray91 = 15263976,
-            colorGray92 = 15461355,
-            colorGray93 = 15592941,
-            colorGray94 = 15790320,
-            colorGray95 = 15921906,
-            colorGray96 = 16119285,
-            colorGray97 = 16250871,
-            colorGray98 = 16448250,
-            colorGray99 = 16579836,
+            colorGray1 = 1710618,
+            colorGray2 = 3355443,
+            colorGray3 = 5066061,
+            colorGray4 = 6710886,
+            colorGray5 = 8355711,
+            colorGray6 = 10066329,
+            colorGray7 = 11776947,
+            colorGray8 = 13421772,
+            colorGray9 = 15066597,
             colorGreen = 65280,
-            colorGreen1 = 65280,
-            colorGreen2 = 60928,
-            colorGreen3 = 52480,
-            colorGreen4 = 35584,
             colorGreenYellow = 11403055,
             colorHoneydew = 15794160,
-            colorHoneydew1 = 15794160,
-            colorHoneydew2 = 14741216,
-            colorHoneydew3 = 12701121,
-            colorHoneydew4 = 8620931,
             colorHotPink = 16738740,
-            colorHotPink1 = 16740020,
-            colorHotPink2 = 15624871,
-            colorHotPink3 = 13459600,
-            colorHotPink4 = 9124450,
             colorIndianRed = 13458524,
-            colorIndianRed1 = 16738922,
-            colorIndianRed2 = 15623011,
-            colorIndianRed3 = 13456725,
-            colorIndianRed4 = 9124410,
             colorIndigo = 4915330,
             colorIvory = 16777200,
-            colorIvory1 = 16777200,
-            colorIvory2 = 15658720,
-            colorIvory3 = 13487553,
-            colorIvory4 = 9145219,
             colorKhaki = 15787660,
-            colorKhaki1 = 16774799,
-            colorKhaki2 = 15656581,
-            colorKhaki3 = 13485683,
-            colorKhaki4 = 9143886,
             colorLavender = 15132410,
             colorLavenderBlush = 16773365,
-            colorLavenderBlush1 = 16773365,
-            colorLavenderBlush2 = 15655141,
-            colorLavenderBlush3 = 13484485,
-            colorLavenderBlush4 = 9143174,
             colorLawnGreen = 8190976,
             colorLemonChiffon = 16775885,
-            colorLemonChiffon1 = 16775885,
-            colorLemonChiffon2 = 15657407,
-            colorLemonChiffon3 = 13486501,
-            colorLemonChiffon4 = 9144688,
             colorLightBlue = 11393254,
-            colorLightBlue1 = 12578815,
-            colorLightBlue2 = 11722734,
-            colorLightBlue3 = 10141901,
-            colorLightBlue4 = 6849419,
             colorLightCoral = 15761536,
             colorLightCyan = 14745599,
-            colorLightCyan1 = 14745599,
-            colorLightCyan2 = 13758190,
-            colorLightCyan3 = 11849165,
-            colorLightCyan4 = 8031115,
             colorLightGoldenrod = 15654274,
-            colorLightGoldenrod1 = 16772235,
-            colorLightGoldenrod2 = 15654018,
-            colorLightGoldenrod3 = 13483632,
-            colorLightGoldenrod4 = 9142604,
             colorLightGoldenrodYellow = 16448210,
             colorLightGray = 13882323,
             colorLightGreen = 9498256,
             colorLightPink = 16758465,
-            colorLightPink1 = 16756409,
-            colorLightPink2 = 15639213,
-            colorLightPink3 = 13470869,
-            colorLightPink4 = 9133925,
             colorLightSalmon = 16752762,
-            colorLightSalmon1 = 16752762,
-            colorLightSalmon2 = 15635826,
-            colorLightSalmon3 = 13468002,
-            colorLightSalmon4 = 9131842,
             colorLightSeaGreen = 2142890,
             colorLightSkyBlue = 8900346,
-            colorLightSkyBlue1 = 11592447,
-            colorLightSkyBlue2 = 10802158,
-            colorLightSkyBlue3 = 9287373,
-            colorLightSkyBlue4 = 6323083,
             colorLightSlateBlue = 8679679,
             colorLightSlateGray = 7833753,
             colorLightSteelBlue = 11584734,
-            colorLightSteelBlue1 = 13296127,
-            colorLightSteelBlue2 = 12374766,
-            colorLightSteelBlue3 = 10663373,
-            colorLightSteelBlue4 = 7240587,
             colorLightYellow = 16777184,
-            colorLightYellow1 = 16777184,
-            colorLightYellow2 = 15658705,
-            colorLightYellow3 = 13487540,
-            colorLightYellow4 = 9145210,
             colorLime = 65280,
             colorLimeGreen = 3329330,
             colorLinen = 16445670,
             colorMagenta = 16711935,
-            colorMagenta1 = 16711935,
-            colorMagenta2 = 15597806,
-            colorMagenta3 = 13435085,
-            colorMagenta4 = 9109643,
             colorMaroon = 11546720,
-            colorMaroon1 = 16725171,
-            colorMaroon2 = 15610023,
-            colorMaroon3 = 13445520,
-            colorMaroon4 = 9116770,
             colorMediumAquamarine = 6737322,
             colorMediumBlue = 205,
             colorMediumOrchid = 12211667,
-            colorMediumOrchid1 = 14706431,
-            colorMediumOrchid2 = 13721582,
-            colorMediumOrchid3 = 11817677,
-            colorMediumOrchid4 = 8009611,
             colorMediumPurple = 9662683,
-            colorMediumPurple1 = 11240191,
-            colorMediumPurple2 = 10451438,
-            colorMediumPurple3 = 9005261,
-            colorMediumPurple4 = 6113163,
             colorMediumSeaGreen = 3978097,
             colorMediumSlateBlue = 8087790,
             colorMediumSpringGreen = 64154,
@@ -2520,195 +2475,55 @@ public enum HexColor : uint
             colorMidnightBlue = 1644912,
             colorMintCream = 16121850,
             colorMistyRose = 16770273,
-            colorMistyRose1 = 16770273,
-            colorMistyRose2 = 15652306,
-            colorMistyRose3 = 13481909,
-            colorMistyRose4 = 9141627,
             colorMoccasin = 16770229,
             colorNavajoWhite = 16768685,
-            colorNavajoWhite1 = 16768685,
-            colorNavajoWhite2 = 15650721,
-            colorNavajoWhite3 = 13480843,
-            colorNavajoWhite4 = 9140574,
             colorNavy = 128,
             colorNavyBlue = 128,
             colorOldLace = 16643558,
             colorOlive = 8421376,
             colorOliveDrab = 7048739,
-            colorOliveDrab1 = 12648254,
-            colorOliveDrab2 = 11791930,
-            colorOliveDrab3 = 10145074,
-            colorOliveDrab4 = 6916898,
             colorOrange = 16753920,
-            colorOrange1 = 16753920,
-            colorOrange2 = 15636992,
-            colorOrange3 = 13468928,
-            colorOrange4 = 9132544,
             colorOrangeRed = 16729344,
-            colorOrangeRed1 = 16729344,
-            colorOrangeRed2 = 15613952,
-            colorOrangeRed3 = 13448960,
-            colorOrangeRed4 = 9118976,
             colorOrchid = 14315734,
-            colorOrchid1 = 16745466,
-            colorOrchid2 = 15629033,
-            colorOrchid3 = 13461961,
-            colorOrchid4 = 9127817,
             colorPaleGoldenrod = 15657130,
             colorPaleGreen = 10025880,
-            colorPaleGreen1 = 10157978,
-            colorPaleGreen2 = 9498256,
-            colorPaleGreen3 = 8179068,
-            colorPaleGreen4 = 5540692,
             colorPaleTurquoise = 11529966,
-            colorPaleTurquoise1 = 12320767,
-            colorPaleTurquoise2 = 11464430,
-            colorPaleTurquoise3 = 9883085,
-            colorPaleTurquoise4 = 6720395,
             colorPaleVioletRed = 14381203,
-            colorPaleVioletRed1 = 16745131,
-            colorPaleVioletRed2 = 15628703,
-            colorPaleVioletRed3 = 13461641,
-            colorPaleVioletRed4 = 9127773,
             colorPapayaWhip = 16773077,
             colorPeachPuff = 16767673,
-            colorPeachPuff1 = 16767673,
-            colorPeachPuff2 = 15649709,
-            colorPeachPuff3 = 13479829,
-            colorPeachPuff4 = 9140069,
             colorPeru = 13468991,
             colorPink = 16761035,
-            colorPink1 = 16758213,
-            colorPink2 = 15641016,
-            colorPink3 = 13472158,
-            colorPink4 = 9134956,
             colorPlum = 14524637,
-            colorPlum1 = 16759807,
-            colorPlum2 = 15642350,
-            colorPlum3 = 13473485,
-            colorPlum4 = 9135755,
             colorPowderBlue = 11591910,
             colorPurple = 10494192,
-            colorPurple1 = 10170623,
-            colorPurple2 = 9514222,
-            colorPurple3 = 8201933,
-            colorPurple4 = 5577355,
             colorRebeccaPurple = 6697881,
             colorRed = 16711680,
-            colorRed1 = 16711680,
-            colorRed2 = 15597568,
-            colorRed3 = 13434880,
-            colorRed4 = 9109504,
             colorRosyBrown = 12357519,
-            colorRosyBrown1 = 16761281,
-            colorRosyBrown2 = 15643828,
-            colorRosyBrown3 = 13474715,
-            colorRosyBrown4 = 9136489,
             colorRoyalBlue = 4286945,
-            colorRoyalBlue1 = 4749055,
-            colorRoyalBlue2 = 4419310,
-            colorRoyalBlue3 = 3825613,
-            colorRoyalBlue4 = 2572427,
             colorSaddleBrown = 9127187,
             colorSalmon = 16416882,
-            colorSalmon1 = 16747625,
-            colorSalmon2 = 15630946,
-            colorSalmon3 = 13463636,
-            colorSalmon4 = 9129017,
             colorSandyBrown = 16032864,
             colorSeaGreen = 3050327,
-            colorSeaGreen1 = 5570463,
-            colorSeaGreen2 = 5172884,
-            colorSeaGreen3 = 4443520,
-            colorSeaGreen4 = 3050327,
             colorSeashell = 16774638,
-            colorSeashell1 = 16774638,
-            colorSeashell2 = 15656414,
-            colorSeashell3 = 13485503,
-            colorSeashell4 = 9143938,
             colorSienna = 10506797,
-            colorSienna1 = 16745031,
-            colorSienna2 = 15628610,
-            colorSienna3 = 13461561,
-            colorSienna4 = 9127718,
             colorSilver = 12632256,
             colorSkyBlue = 8900331,
-            colorSkyBlue1 = 8900351,
-            colorSkyBlue2 = 8306926,
-            colorSkyBlue3 = 7120589,
-            colorSkyBlue4 = 4878475,
             colorSlateBlue = 6970061,
-            colorSlateBlue1 = 8613887,
-            colorSlateBlue2 = 8021998,
-            colorSlateBlue3 = 6904269,
-            colorSlateBlue4 = 4668555,
             colorSlateGray = 7372944,
-            colorSlateGray1 = 13034239,
-            colorSlateGray2 = 12178414,
-            colorSlateGray3 = 10467021,
-            colorSlateGray4 = 7109515,
             colorSnow = 16775930,
-            colorSnow1 = 16775930,
-            colorSnow2 = 15657449,
-            colorSnow3 = 13486537,
-            colorSnow4 = 9144713,
             colorSpringGreen = 65407,
-            colorSpringGreen1 = 65407,
-            colorSpringGreen2 = 61046,
-            colorSpringGreen3 = 52582,
-            colorSpringGreen4 = 35653,
             colorSteelBlue = 4620980,
-            colorSteelBlue1 = 6535423,
-            colorSteelBlue2 = 6073582,
-            colorSteelBlue3 = 5215437,
-            colorSteelBlue4 = 3564683,
             colorTan = 13808780,
-            colorTan1 = 16753999,
-            colorTan2 = 15637065,
-            colorTan3 = 13468991,
-            colorTan4 = 9132587,
             colorTeal = 32896,
             colorThistle = 14204888,
-            colorThistle1 = 16769535,
-            colorThistle2 = 15651566,
-            colorThistle3 = 13481421,
-            colorThistle4 = 9141131,
             colorTomato = 16737095,
-            colorTomato1 = 16737095,
-            colorTomato2 = 15621186,
-            colorTomato3 = 13455161,
-            colorTomato4 = 9123366,
             colorTurquoise = 4251856,
-            colorTurquoise1 = 62975,
-            colorTurquoise2 = 58862,
-            colorTurquoise3 = 50637,
-            colorTurquoise4 = 34443,
             colorViolet = 15631086,
             colorVioletRed = 13639824,
-            colorVioletRed1 = 16727702,
-            colorVioletRed2 = 15612556,
-            colorVioletRed3 = 13447800,
-            colorVioletRed4 = 9118290,
-            colorWebGray = 8421504,
-            colorWebGreen = 32768,
-            colorWebMaroon = 8388608,
-            colorWebPurple = 8388736,
             colorWheat = 16113331,
-            colorWheat1 = 16771002,
-            colorWheat2 = 15653038,
-            colorWheat3 = 13482646,
-            colorWheat4 = 9141862,
             colorWhite = 16777215,
             colorWhiteSmoke = 16119285,
-            colorX11Gray = 12500670,
-            colorX11Green = 65280,
-            colorX11Maroon = 11546720,
-            colorX11Purple = 10494192,
             colorYellow = 16776960,
-            colorYellow1 = 16776960,
-            colorYellow2 = 15658496,
-            colorYellow3 = 13487360,
-            colorYellow4 = 9145088,
             colorYellowGreen = 10145074
         }
 
@@ -2754,272 +2569,88 @@ public enum TOIState : uint
 
         public const HexColor colorAntiqueWhite = HexColor.colorAntiqueWhite;
 
-        public const HexColor colorAntiqueWhite1 = HexColor.colorAntiqueWhite1;
-
-        public const HexColor colorAntiqueWhite2 = HexColor.colorAntiqueWhite2;
-
-        public const HexColor colorAntiqueWhite3 = HexColor.colorAntiqueWhite3;
-
-        public const HexColor colorAntiqueWhite4 = HexColor.colorAntiqueWhite4;
-
         public const HexColor colorAqua = HexColor.colorAqua;
 
         public const HexColor colorAquamarine = HexColor.colorAquamarine;
 
-        public const HexColor colorAquamarine1 = HexColor.colorAquamarine1;
-
-        public const HexColor colorAquamarine2 = HexColor.colorAquamarine2;
-
-        public const HexColor colorAquamarine3 = HexColor.colorAquamarine3;
-
-        public const HexColor colorAquamarine4 = HexColor.colorAquamarine4;
-
         public const HexColor colorAzure = HexColor.colorAzure;
 
-        public const HexColor colorAzure1 = HexColor.colorAzure1;
-
-        public const HexColor colorAzure2 = HexColor.colorAzure2;
-
-        public const HexColor colorAzure3 = HexColor.colorAzure3;
-
-        public const HexColor colorAzure4 = HexColor.colorAzure4;
-
         public const HexColor colorBeige = HexColor.colorBeige;
 
         public const HexColor colorBisque = HexColor.colorBisque;
 
-        public const HexColor colorBisque1 = HexColor.colorBisque1;
-
-        public const HexColor colorBisque2 = HexColor.colorBisque2;
-
-        public const HexColor colorBisque3 = HexColor.colorBisque3;
-
-        public const HexColor colorBisque4 = HexColor.colorBisque4;
-
         public const HexColor colorBlack = HexColor.colorBlack;
 
         public const HexColor colorBlanchedAlmond = HexColor.colorBlanchedAlmond;
 
         public const HexColor colorBlue = HexColor.colorBlue;
 
-        public const HexColor colorBlue1 = HexColor.colorBlue1;
-
-        public const HexColor colorBlue2 = HexColor.colorBlue2;
-
-        public const HexColor colorBlue3 = HexColor.colorBlue3;
-
-        public const HexColor colorBlue4 = HexColor.colorBlue4;
-
         public const HexColor colorBlueViolet = HexColor.colorBlueViolet;
 
         public const HexColor colorBrown = HexColor.colorBrown;
 
-        public const HexColor colorBrown1 = HexColor.colorBrown1;
+        public const HexColor colorBurlywood = HexColor.colorBurlywood;
 
-        public const HexColor colorBrown2 = HexColor.colorBrown2;
+        public const HexColor colorCadetBlue = HexColor.colorCadetBlue;
 
-        public const HexColor colorBrown3 = HexColor.colorBrown3;
+        public const HexColor colorChartreuse = HexColor.colorChartreuse;
 
-        public const HexColor colorBrown4 = HexColor.colorBrown4;
+        public const HexColor colorChocolate = HexColor.colorChocolate;
 
-        public const HexColor colorBurlywood = HexColor.colorBurlywood;
+        public const HexColor colorCoral = HexColor.colorCoral;
 
-        public const HexColor colorBurlywood1 = HexColor.colorBurlywood1;
+        public const HexColor colorCornflowerBlue = HexColor.colorCornflowerBlue;
 
-        public const HexColor colorBurlywood2 = HexColor.colorBurlywood2;
+        public const HexColor colorCornsilk = HexColor.colorCornsilk;
 
-        public const HexColor colorBurlywood3 = HexColor.colorBurlywood3;
+        public const HexColor colorCrimson = HexColor.colorCrimson;
 
-        public const HexColor colorBurlywood4 = HexColor.colorBurlywood4;
+        public const HexColor colorCyan = HexColor.colorCyan;
 
-        public const HexColor colorCadetBlue = HexColor.colorCadetBlue;
+        public const HexColor colorDarkBlue = HexColor.colorDarkBlue;
 
-        public const HexColor colorCadetBlue1 = HexColor.colorCadetBlue1;
+        public const HexColor colorDarkCyan = HexColor.colorDarkCyan;
 
-        public const HexColor colorCadetBlue2 = HexColor.colorCadetBlue2;
+        public const HexColor colorDarkGoldenrod = HexColor.colorDarkGoldenrod;
 
-        public const HexColor colorCadetBlue3 = HexColor.colorCadetBlue3;
+        public const HexColor colorDarkGray = HexColor.colorDarkGray;
 
-        public const HexColor colorCadetBlue4 = HexColor.colorCadetBlue4;
+        public const HexColor colorDarkGreen = HexColor.colorDarkGreen;
 
-        public const HexColor colorChartreuse = HexColor.colorChartreuse;
+        public const HexColor colorDarkKhaki = HexColor.colorDarkKhaki;
 
-        public const HexColor colorChartreuse1 = HexColor.colorChartreuse1;
+        public const HexColor colorDarkMagenta = HexColor.colorDarkMagenta;
 
-        public const HexColor colorChartreuse2 = HexColor.colorChartreuse2;
+        public const HexColor colorDarkOliveGreen = HexColor.colorDarkOliveGreen;
 
-        public const HexColor colorChartreuse3 = HexColor.colorChartreuse3;
+        public const HexColor colorDarkOrange = HexColor.colorDarkOrange;
 
-        public const HexColor colorChartreuse4 = HexColor.colorChartreuse4;
+        public const HexColor colorDarkOrchid = HexColor.colorDarkOrchid;
 
-        public const HexColor colorChocolate = HexColor.colorChocolate;
+        public const HexColor colorDarkRed = HexColor.colorDarkRed;
 
-        public const HexColor colorChocolate1 = HexColor.colorChocolate1;
+        public const HexColor colorDarkSalmon = HexColor.colorDarkSalmon;
 
-        public const HexColor colorChocolate2 = HexColor.colorChocolate2;
+        public const HexColor colorDarkSeaGreen = HexColor.colorDarkSeaGreen;
 
-        public const HexColor colorChocolate3 = HexColor.colorChocolate3;
+        public const HexColor colorDarkSlateBlue = HexColor.colorDarkSlateBlue;
 
-        public const HexColor colorChocolate4 = HexColor.colorChocolate4;
+        public const HexColor colorDarkSlateGray = HexColor.colorDarkSlateGray;
 
-        public const HexColor colorCoral = HexColor.colorCoral;
+        public const HexColor colorDarkTurquoise = HexColor.colorDarkTurquoise;
 
-        public const HexColor colorCoral1 = HexColor.colorCoral1;
+        public const HexColor colorDarkViolet = HexColor.colorDarkViolet;
 
-        public const HexColor colorCoral2 = HexColor.colorCoral2;
+        public const HexColor colorDeepPink = HexColor.colorDeepPink;
 
-        public const HexColor colorCoral3 = HexColor.colorCoral3;
+        public const HexColor colorDeepSkyBlue = HexColor.colorDeepSkyBlue;
 
-        public const HexColor colorCoral4 = HexColor.colorCoral4;
-
-        public const HexColor colorCornflowerBlue = HexColor.colorCornflowerBlue;
-
-        public const HexColor colorCornsilk = HexColor.colorCornsilk;
-
-        public const HexColor colorCornsilk1 = HexColor.colorCornsilk1;
-
-        public const HexColor colorCornsilk2 = HexColor.colorCornsilk2;
-
-        public const HexColor colorCornsilk3 = HexColor.colorCornsilk3;
-
-        public const HexColor colorCornsilk4 = HexColor.colorCornsilk4;
-
-        public const HexColor colorCrimson = HexColor.colorCrimson;
-
-        public const HexColor colorCyan = HexColor.colorCyan;
-
-        public const HexColor colorCyan1 = HexColor.colorCyan1;
-
-        public const HexColor colorCyan2 = HexColor.colorCyan2;
-
-        public const HexColor colorCyan3 = HexColor.colorCyan3;
-
-        public const HexColor colorCyan4 = HexColor.colorCyan4;
-
-        public const HexColor colorDarkBlue = HexColor.colorDarkBlue;
-
-        public const HexColor colorDarkCyan = HexColor.colorDarkCyan;
-
-        public const HexColor colorDarkGoldenrod = HexColor.colorDarkGoldenrod;
-
-        public const HexColor colorDarkGoldenrod1 = HexColor.colorDarkGoldenrod1;
-
-        public const HexColor colorDarkGoldenrod2 = HexColor.colorDarkGoldenrod2;
-
-        public const HexColor colorDarkGoldenrod3 = HexColor.colorDarkGoldenrod3;
-
-        public const HexColor colorDarkGoldenrod4 = HexColor.colorDarkGoldenrod4;
-
-        public const HexColor colorDarkGray = HexColor.colorDarkGray;
-
-        public const HexColor colorDarkGreen = HexColor.colorDarkGreen;
-
-        public const HexColor colorDarkKhaki = HexColor.colorDarkKhaki;
-
-        public const HexColor colorDarkMagenta = HexColor.colorDarkMagenta;
-
-        public const HexColor colorDarkOliveGreen = HexColor.colorDarkOliveGreen;
-
-        public const HexColor colorDarkOliveGreen1 = HexColor.colorDarkOliveGreen1;
-
-        public const HexColor colorDarkOliveGreen2 = HexColor.colorDarkOliveGreen2;
-
-        public const HexColor colorDarkOliveGreen3 = HexColor.colorDarkOliveGreen3;
-
-        public const HexColor colorDarkOliveGreen4 = HexColor.colorDarkOliveGreen4;
-
-        public const HexColor colorDarkOrange = HexColor.colorDarkOrange;
-
-        public const HexColor colorDarkOrange1 = HexColor.colorDarkOrange1;
-
-        public const HexColor colorDarkOrange2 = HexColor.colorDarkOrange2;
-
-        public const HexColor colorDarkOrange3 = HexColor.colorDarkOrange3;
-
-        public const HexColor colorDarkOrange4 = HexColor.colorDarkOrange4;
-
-        public const HexColor colorDarkOrchid = HexColor.colorDarkOrchid;
-
-        public const HexColor colorDarkOrchid1 = HexColor.colorDarkOrchid1;
-
-        public const HexColor colorDarkOrchid2 = HexColor.colorDarkOrchid2;
-
-        public const HexColor colorDarkOrchid3 = HexColor.colorDarkOrchid3;
-
-        public const HexColor colorDarkOrchid4 = HexColor.colorDarkOrchid4;
-
-        public const HexColor colorDarkRed = HexColor.colorDarkRed;
-
-        public const HexColor colorDarkSalmon = HexColor.colorDarkSalmon;
-
-        public const HexColor colorDarkSeaGreen = HexColor.colorDarkSeaGreen;
-
-        public const HexColor colorDarkSeaGreen1 = HexColor.colorDarkSeaGreen1;
-
-        public const HexColor colorDarkSeaGreen2 = HexColor.colorDarkSeaGreen2;
-
-        public const HexColor colorDarkSeaGreen3 = HexColor.colorDarkSeaGreen3;
-
-        public const HexColor colorDarkSeaGreen4 = HexColor.colorDarkSeaGreen4;
-
-        public const HexColor colorDarkSlateBlue = HexColor.colorDarkSlateBlue;
-
-        public const HexColor colorDarkSlateGray = HexColor.colorDarkSlateGray;
-
-        public const HexColor colorDarkSlateGray1 = HexColor.colorDarkSlateGray1;
-
-        public const HexColor colorDarkSlateGray2 = HexColor.colorDarkSlateGray2;
-
-        public const HexColor colorDarkSlateGray3 = HexColor.colorDarkSlateGray3;
-
-        public const HexColor colorDarkSlateGray4 = HexColor.colorDarkSlateGray4;
-
-        public const HexColor colorDarkTurquoise = HexColor.colorDarkTurquoise;
-
-        public const HexColor colorDarkViolet = HexColor.colorDarkViolet;
-
-        public const HexColor colorDeepPink = HexColor.colorDeepPink;
-
-        public const HexColor colorDeepPink1 = HexColor.colorDeepPink1;
-
-        public const HexColor colorDeepPink2 = HexColor.colorDeepPink2;
-
-        public const HexColor colorDeepPink3 = HexColor.colorDeepPink3;
-
-        public const HexColor colorDeepPink4 = HexColor.colorDeepPink4;
-
-        public const HexColor colorDeepSkyBlue = HexColor.colorDeepSkyBlue;
-
-        public const HexColor colorDeepSkyBlue1 = HexColor.colorDeepSkyBlue1;
-
-        public const HexColor colorDeepSkyBlue2 = HexColor.colorDeepSkyBlue2;
-
-        public const HexColor colorDeepSkyBlue3 = HexColor.colorDeepSkyBlue3;
-
-        public const HexColor colorDeepSkyBlue4 = HexColor.colorDeepSkyBlue4;
-
-        public const HexColor colorDimGray = HexColor.colorDimGray;
+        public const HexColor colorDimGray = HexColor.colorDimGray;
 
         public const HexColor colorDodgerBlue = HexColor.colorDodgerBlue;
 
-        public const HexColor colorDodgerBlue1 = HexColor.colorDodgerBlue1;
-
-        public const HexColor colorDodgerBlue2 = HexColor.colorDodgerBlue2;
-
-        public const HexColor colorDodgerBlue3 = HexColor.colorDodgerBlue3;
-
-        public const HexColor colorDodgerBlue4 = HexColor.colorDodgerBlue4;
-
         public const HexColor colorFirebrick = HexColor.colorFirebrick;
 
-        public const HexColor colorFirebrick1 = HexColor.colorFirebrick1;
-
-        public const HexColor colorFirebrick2 = HexColor.colorFirebrick2;
-
-        public const HexColor colorFirebrick3 = HexColor.colorFirebrick3;
-
-        public const HexColor colorFirebrick4 = HexColor.colorFirebrick4;
-
         public const HexColor colorFloralWhite = HexColor.colorFloralWhite;
 
         public const HexColor colorForestGreen = HexColor.colorForestGreen;
@@ -3032,348 +2663,60 @@ public enum TOIState : uint
 
         public const HexColor colorGold = HexColor.colorGold;
 
-        public const HexColor colorGold1 = HexColor.colorGold1;
-
-        public const HexColor colorGold2 = HexColor.colorGold2;
-
-        public const HexColor colorGold3 = HexColor.colorGold3;
-
-        public const HexColor colorGold4 = HexColor.colorGold4;
-
         public const HexColor colorGoldenrod = HexColor.colorGoldenrod;
 
-        public const HexColor colorGoldenrod1 = HexColor.colorGoldenrod1;
-
-        public const HexColor colorGoldenrod2 = HexColor.colorGoldenrod2;
-
-        public const HexColor colorGoldenrod3 = HexColor.colorGoldenrod3;
-
-        public const HexColor colorGoldenrod4 = HexColor.colorGoldenrod4;
-
         public const HexColor colorGray = HexColor.colorGray;
 
-        public const HexColor colorGray0 = HexColor.colorGray0;
-
         public const HexColor colorGray1 = HexColor.colorGray1;
 
-        public const HexColor colorGray10 = HexColor.colorGray10;
-
-        public const HexColor colorGray100 = HexColor.colorGray100;
-
-        public const HexColor colorGray11 = HexColor.colorGray11;
-
-        public const HexColor colorGray12 = HexColor.colorGray12;
-
-        public const HexColor colorGray13 = HexColor.colorGray13;
-
-        public const HexColor colorGray14 = HexColor.colorGray14;
-
-        public const HexColor colorGray15 = HexColor.colorGray15;
-
-        public const HexColor colorGray16 = HexColor.colorGray16;
-
-        public const HexColor colorGray17 = HexColor.colorGray17;
-
-        public const HexColor colorGray18 = HexColor.colorGray18;
-
-        public const HexColor colorGray19 = HexColor.colorGray19;
-
         public const HexColor colorGray2 = HexColor.colorGray2;
 
-        public const HexColor colorGray20 = HexColor.colorGray20;
-
-        public const HexColor colorGray21 = HexColor.colorGray21;
-
-        public const HexColor colorGray22 = HexColor.colorGray22;
-
-        public const HexColor colorGray23 = HexColor.colorGray23;
-
-        public const HexColor colorGray24 = HexColor.colorGray24;
-
-        public const HexColor colorGray25 = HexColor.colorGray25;
-
-        public const HexColor colorGray26 = HexColor.colorGray26;
-
-        public const HexColor colorGray27 = HexColor.colorGray27;
-
-        public const HexColor colorGray28 = HexColor.colorGray28;
-
-        public const HexColor colorGray29 = HexColor.colorGray29;
-
         public const HexColor colorGray3 = HexColor.colorGray3;
 
-        public const HexColor colorGray30 = HexColor.colorGray30;
-
-        public const HexColor colorGray31 = HexColor.colorGray31;
-
-        public const HexColor colorGray32 = HexColor.colorGray32;
-
-        public const HexColor colorGray33 = HexColor.colorGray33;
-
-        public const HexColor colorGray34 = HexColor.colorGray34;
-
-        public const HexColor colorGray35 = HexColor.colorGray35;
-
-        public const HexColor colorGray36 = HexColor.colorGray36;
-
-        public const HexColor colorGray37 = HexColor.colorGray37;
-
-        public const HexColor colorGray38 = HexColor.colorGray38;
-
-        public const HexColor colorGray39 = HexColor.colorGray39;
-
         public const HexColor colorGray4 = HexColor.colorGray4;
 
-        public const HexColor colorGray40 = HexColor.colorGray40;
-
-        public const HexColor colorGray41 = HexColor.colorGray41;
-
-        public const HexColor colorGray42 = HexColor.colorGray42;
-
-        public const HexColor colorGray43 = HexColor.colorGray43;
-
-        public const HexColor colorGray44 = HexColor.colorGray44;
-
-        public const HexColor colorGray45 = HexColor.colorGray45;
-
-        public const HexColor colorGray46 = HexColor.colorGray46;
-
-        public const HexColor colorGray47 = HexColor.colorGray47;
-
-        public const HexColor colorGray48 = HexColor.colorGray48;
-
-        public const HexColor colorGray49 = HexColor.colorGray49;
-
         public const HexColor colorGray5 = HexColor.colorGray5;
 
-        public const HexColor colorGray50 = HexColor.colorGray50;
-
-        public const HexColor colorGray51 = HexColor.colorGray51;
-
-        public const HexColor colorGray52 = HexColor.colorGray52;
-
-        public const HexColor colorGray53 = HexColor.colorGray53;
-
-        public const HexColor colorGray54 = HexColor.colorGray54;
-
-        public const HexColor colorGray55 = HexColor.colorGray55;
-
-        public const HexColor colorGray56 = HexColor.colorGray56;
-
-        public const HexColor colorGray57 = HexColor.colorGray57;
-
-        public const HexColor colorGray58 = HexColor.colorGray58;
-
-        public const HexColor colorGray59 = HexColor.colorGray59;
-
         public const HexColor colorGray6 = HexColor.colorGray6;
 
-        public const HexColor colorGray60 = HexColor.colorGray60;
-
-        public const HexColor colorGray61 = HexColor.colorGray61;
-
-        public const HexColor colorGray62 = HexColor.colorGray62;
-
-        public const HexColor colorGray63 = HexColor.colorGray63;
-
-        public const HexColor colorGray64 = HexColor.colorGray64;
-
-        public const HexColor colorGray65 = HexColor.colorGray65;
-
-        public const HexColor colorGray66 = HexColor.colorGray66;
-
-        public const HexColor colorGray67 = HexColor.colorGray67;
-
-        public const HexColor colorGray68 = HexColor.colorGray68;
-
-        public const HexColor colorGray69 = HexColor.colorGray69;
-
         public const HexColor colorGray7 = HexColor.colorGray7;
 
-        public const HexColor colorGray70 = HexColor.colorGray70;
-
-        public const HexColor colorGray71 = HexColor.colorGray71;
-
-        public const HexColor colorGray72 = HexColor.colorGray72;
-
-        public const HexColor colorGray73 = HexColor.colorGray73;
-
-        public const HexColor colorGray74 = HexColor.colorGray74;
-
-        public const HexColor colorGray75 = HexColor.colorGray75;
-
-        public const HexColor colorGray76 = HexColor.colorGray76;
-
-        public const HexColor colorGray77 = HexColor.colorGray77;
-
-        public const HexColor colorGray78 = HexColor.colorGray78;
-
-        public const HexColor colorGray79 = HexColor.colorGray79;
-
         public const HexColor colorGray8 = HexColor.colorGray8;
 
-        public const HexColor colorGray80 = HexColor.colorGray80;
-
-        public const HexColor colorGray81 = HexColor.colorGray81;
-
-        public const HexColor colorGray82 = HexColor.colorGray82;
-
-        public const HexColor colorGray83 = HexColor.colorGray83;
-
-        public const HexColor colorGray84 = HexColor.colorGray84;
-
-        public const HexColor colorGray85 = HexColor.colorGray85;
-
-        public const HexColor colorGray86 = HexColor.colorGray86;
-
-        public const HexColor colorGray87 = HexColor.colorGray87;
-
-        public const HexColor colorGray88 = HexColor.colorGray88;
-
-        public const HexColor colorGray89 = HexColor.colorGray89;
-
         public const HexColor colorGray9 = HexColor.colorGray9;
 
-        public const HexColor colorGray90 = HexColor.colorGray90;
-
-        public const HexColor colorGray91 = HexColor.colorGray91;
-
-        public const HexColor colorGray92 = HexColor.colorGray92;
-
-        public const HexColor colorGray93 = HexColor.colorGray93;
-
-        public const HexColor colorGray94 = HexColor.colorGray94;
-
-        public const HexColor colorGray95 = HexColor.colorGray95;
-
-        public const HexColor colorGray96 = HexColor.colorGray96;
-
-        public const HexColor colorGray97 = HexColor.colorGray97;
-
-        public const HexColor colorGray98 = HexColor.colorGray98;
-
-        public const HexColor colorGray99 = HexColor.colorGray99;
-
         public const HexColor colorGreen = HexColor.colorGreen;
 
-        public const HexColor colorGreen1 = HexColor.colorGreen1;
-
-        public const HexColor colorGreen2 = HexColor.colorGreen2;
-
-        public const HexColor colorGreen3 = HexColor.colorGreen3;
-
-        public const HexColor colorGreen4 = HexColor.colorGreen4;
-
         public const HexColor colorGreenYellow = HexColor.colorGreenYellow;
 
         public const HexColor colorHoneydew = HexColor.colorHoneydew;
 
-        public const HexColor colorHoneydew1 = HexColor.colorHoneydew1;
-
-        public const HexColor colorHoneydew2 = HexColor.colorHoneydew2;
-
-        public const HexColor colorHoneydew3 = HexColor.colorHoneydew3;
-
-        public const HexColor colorHoneydew4 = HexColor.colorHoneydew4;
-
         public const HexColor colorHotPink = HexColor.colorHotPink;
 
-        public const HexColor colorHotPink1 = HexColor.colorHotPink1;
-
-        public const HexColor colorHotPink2 = HexColor.colorHotPink2;
-
-        public const HexColor colorHotPink3 = HexColor.colorHotPink3;
-
-        public const HexColor colorHotPink4 = HexColor.colorHotPink4;
-
         public const HexColor colorIndianRed = HexColor.colorIndianRed;
 
-        public const HexColor colorIndianRed1 = HexColor.colorIndianRed1;
-
-        public const HexColor colorIndianRed2 = HexColor.colorIndianRed2;
-
-        public const HexColor colorIndianRed3 = HexColor.colorIndianRed3;
-
-        public const HexColor colorIndianRed4 = HexColor.colorIndianRed4;
-
         public const HexColor colorIndigo = HexColor.colorIndigo;
 
         public const HexColor colorIvory = HexColor.colorIvory;
 
-        public const HexColor colorIvory1 = HexColor.colorIvory1;
-
-        public const HexColor colorIvory2 = HexColor.colorIvory2;
-
-        public const HexColor colorIvory3 = HexColor.colorIvory3;
-
-        public const HexColor colorIvory4 = HexColor.colorIvory4;
-
         public const HexColor colorKhaki = HexColor.colorKhaki;
 
-        public const HexColor colorKhaki1 = HexColor.colorKhaki1;
-
-        public const HexColor colorKhaki2 = HexColor.colorKhaki2;
-
-        public const HexColor colorKhaki3 = HexColor.colorKhaki3;
-
-        public const HexColor colorKhaki4 = HexColor.colorKhaki4;
-
         public const HexColor colorLavender = HexColor.colorLavender;
 
         public const HexColor colorLavenderBlush = HexColor.colorLavenderBlush;
 
-        public const HexColor colorLavenderBlush1 = HexColor.colorLavenderBlush1;
-
-        public const HexColor colorLavenderBlush2 = HexColor.colorLavenderBlush2;
-
-        public const HexColor colorLavenderBlush3 = HexColor.colorLavenderBlush3;
-
-        public const HexColor colorLavenderBlush4 = HexColor.colorLavenderBlush4;
-
         public const HexColor colorLawnGreen = HexColor.colorLawnGreen;
 
         public const HexColor colorLemonChiffon = HexColor.colorLemonChiffon;
 
-        public const HexColor colorLemonChiffon1 = HexColor.colorLemonChiffon1;
-
-        public const HexColor colorLemonChiffon2 = HexColor.colorLemonChiffon2;
-
-        public const HexColor colorLemonChiffon3 = HexColor.colorLemonChiffon3;
-
-        public const HexColor colorLemonChiffon4 = HexColor.colorLemonChiffon4;
-
         public const HexColor colorLightBlue = HexColor.colorLightBlue;
 
-        public const HexColor colorLightBlue1 = HexColor.colorLightBlue1;
-
-        public const HexColor colorLightBlue2 = HexColor.colorLightBlue2;
-
-        public const HexColor colorLightBlue3 = HexColor.colorLightBlue3;
-
-        public const HexColor colorLightBlue4 = HexColor.colorLightBlue4;
-
         public const HexColor colorLightCoral = HexColor.colorLightCoral;
 
         public const HexColor colorLightCyan = HexColor.colorLightCyan;
 
-        public const HexColor colorLightCyan1 = HexColor.colorLightCyan1;
-
-        public const HexColor colorLightCyan2 = HexColor.colorLightCyan2;
-
-        public const HexColor colorLightCyan3 = HexColor.colorLightCyan3;
-
-        public const HexColor colorLightCyan4 = HexColor.colorLightCyan4;
-
         public const HexColor colorLightGoldenrod = HexColor.colorLightGoldenrod;
 
-        public const HexColor colorLightGoldenrod1 = HexColor.colorLightGoldenrod1;
-
-        public const HexColor colorLightGoldenrod2 = HexColor.colorLightGoldenrod2;
-
-        public const HexColor colorLightGoldenrod3 = HexColor.colorLightGoldenrod3;
-
-        public const HexColor colorLightGoldenrod4 = HexColor.colorLightGoldenrod4;
-
         public const HexColor colorLightGoldenrodYellow = HexColor.colorLightGoldenrodYellow;
 
         public const HexColor colorLightGray = HexColor.colorLightGray;
@@ -3382,60 +2725,20 @@ public enum TOIState : uint
 
         public const HexColor colorLightPink = HexColor.colorLightPink;
 
-        public const HexColor colorLightPink1 = HexColor.colorLightPink1;
-
-        public const HexColor colorLightPink2 = HexColor.colorLightPink2;
-
-        public const HexColor colorLightPink3 = HexColor.colorLightPink3;
-
-        public const HexColor colorLightPink4 = HexColor.colorLightPink4;
-
         public const HexColor colorLightSalmon = HexColor.colorLightSalmon;
 
-        public const HexColor colorLightSalmon1 = HexColor.colorLightSalmon1;
-
-        public const HexColor colorLightSalmon2 = HexColor.colorLightSalmon2;
-
-        public const HexColor colorLightSalmon3 = HexColor.colorLightSalmon3;
-
-        public const HexColor colorLightSalmon4 = HexColor.colorLightSalmon4;
-
         public const HexColor colorLightSeaGreen = HexColor.colorLightSeaGreen;
 
         public const HexColor colorLightSkyBlue = HexColor.colorLightSkyBlue;
 
-        public const HexColor colorLightSkyBlue1 = HexColor.colorLightSkyBlue1;
-
-        public const HexColor colorLightSkyBlue2 = HexColor.colorLightSkyBlue2;
-
-        public const HexColor colorLightSkyBlue3 = HexColor.colorLightSkyBlue3;
-
-        public const HexColor colorLightSkyBlue4 = HexColor.colorLightSkyBlue4;
-
         public const HexColor colorLightSlateBlue = HexColor.colorLightSlateBlue;
 
         public const HexColor colorLightSlateGray = HexColor.colorLightSlateGray;
 
         public const HexColor colorLightSteelBlue = HexColor.colorLightSteelBlue;
 
-        public const HexColor colorLightSteelBlue1 = HexColor.colorLightSteelBlue1;
-
-        public const HexColor colorLightSteelBlue2 = HexColor.colorLightSteelBlue2;
-
-        public const HexColor colorLightSteelBlue3 = HexColor.colorLightSteelBlue3;
-
-        public const HexColor colorLightSteelBlue4 = HexColor.colorLightSteelBlue4;
-
         public const HexColor colorLightYellow = HexColor.colorLightYellow;
 
-        public const HexColor colorLightYellow1 = HexColor.colorLightYellow1;
-
-        public const HexColor colorLightYellow2 = HexColor.colorLightYellow2;
-
-        public const HexColor colorLightYellow3 = HexColor.colorLightYellow3;
-
-        public const HexColor colorLightYellow4 = HexColor.colorLightYellow4;
-
         public const HexColor colorLime = HexColor.colorLime;
 
         public const HexColor colorLimeGreen = HexColor.colorLimeGreen;
@@ -3444,48 +2747,16 @@ public enum TOIState : uint
 
         public const HexColor colorMagenta = HexColor.colorMagenta;
 
-        public const HexColor colorMagenta1 = HexColor.colorMagenta1;
-
-        public const HexColor colorMagenta2 = HexColor.colorMagenta2;
-
-        public const HexColor colorMagenta3 = HexColor.colorMagenta3;
-
-        public const HexColor colorMagenta4 = HexColor.colorMagenta4;
-
         public const HexColor colorMaroon = HexColor.colorMaroon;
 
-        public const HexColor colorMaroon1 = HexColor.colorMaroon1;
-
-        public const HexColor colorMaroon2 = HexColor.colorMaroon2;
-
-        public const HexColor colorMaroon3 = HexColor.colorMaroon3;
-
-        public const HexColor colorMaroon4 = HexColor.colorMaroon4;
-
         public const HexColor colorMediumAquamarine = HexColor.colorMediumAquamarine;
 
         public const HexColor colorMediumBlue = HexColor.colorMediumBlue;
 
         public const HexColor colorMediumOrchid = HexColor.colorMediumOrchid;
 
-        public const HexColor colorMediumOrchid1 = HexColor.colorMediumOrchid1;
-
-        public const HexColor colorMediumOrchid2 = HexColor.colorMediumOrchid2;
-
-        public const HexColor colorMediumOrchid3 = HexColor.colorMediumOrchid3;
-
-        public const HexColor colorMediumOrchid4 = HexColor.colorMediumOrchid4;
-
         public const HexColor colorMediumPurple = HexColor.colorMediumPurple;
 
-        public const HexColor colorMediumPurple1 = HexColor.colorMediumPurple1;
-
-        public const HexColor colorMediumPurple2 = HexColor.colorMediumPurple2;
-
-        public const HexColor colorMediumPurple3 = HexColor.colorMediumPurple3;
-
-        public const HexColor colorMediumPurple4 = HexColor.colorMediumPurple4;
-
         public const HexColor colorMediumSeaGreen = HexColor.colorMediumSeaGreen;
 
         public const HexColor colorMediumSlateBlue = HexColor.colorMediumSlateBlue;
@@ -3502,26 +2773,10 @@ public enum TOIState : uint
 
         public const HexColor colorMistyRose = HexColor.colorMistyRose;
 
-        public const HexColor colorMistyRose1 = HexColor.colorMistyRose1;
-
-        public const HexColor colorMistyRose2 = HexColor.colorMistyRose2;
-
-        public const HexColor colorMistyRose3 = HexColor.colorMistyRose3;
-
-        public const HexColor colorMistyRose4 = HexColor.colorMistyRose4;
-
         public const HexColor colorMoccasin = HexColor.colorMoccasin;
 
         public const HexColor colorNavajoWhite = HexColor.colorNavajoWhite;
 
-        public const HexColor colorNavajoWhite1 = HexColor.colorNavajoWhite1;
-
-        public const HexColor colorNavajoWhite2 = HexColor.colorNavajoWhite2;
-
-        public const HexColor colorNavajoWhite3 = HexColor.colorNavajoWhite3;
-
-        public const HexColor colorNavajoWhite4 = HexColor.colorNavajoWhite4;
-
         public const HexColor colorNavy = HexColor.colorNavy;
 
         public const HexColor colorNavyBlue = HexColor.colorNavyBlue;
@@ -3532,354 +2787,90 @@ public enum TOIState : uint
 
         public const HexColor colorOliveDrab = HexColor.colorOliveDrab;
 
-        public const HexColor colorOliveDrab1 = HexColor.colorOliveDrab1;
-
-        public const HexColor colorOliveDrab2 = HexColor.colorOliveDrab2;
-
-        public const HexColor colorOliveDrab3 = HexColor.colorOliveDrab3;
-
-        public const HexColor colorOliveDrab4 = HexColor.colorOliveDrab4;
-
         public const HexColor colorOrange = HexColor.colorOrange;
 
-        public const HexColor colorOrange1 = HexColor.colorOrange1;
-
-        public const HexColor colorOrange2 = HexColor.colorOrange2;
-
-        public const HexColor colorOrange3 = HexColor.colorOrange3;
-
-        public const HexColor colorOrange4 = HexColor.colorOrange4;
-
         public const HexColor colorOrangeRed = HexColor.colorOrangeRed;
 
-        public const HexColor colorOrangeRed1 = HexColor.colorOrangeRed1;
-
-        public const HexColor colorOrangeRed2 = HexColor.colorOrangeRed2;
-
-        public const HexColor colorOrangeRed3 = HexColor.colorOrangeRed3;
-
-        public const HexColor colorOrangeRed4 = HexColor.colorOrangeRed4;
-
         public const HexColor colorOrchid = HexColor.colorOrchid;
 
-        public const HexColor colorOrchid1 = HexColor.colorOrchid1;
-
-        public const HexColor colorOrchid2 = HexColor.colorOrchid2;
-
-        public const HexColor colorOrchid3 = HexColor.colorOrchid3;
-
-        public const HexColor colorOrchid4 = HexColor.colorOrchid4;
-
         public const HexColor colorPaleGoldenrod = HexColor.colorPaleGoldenrod;
 
         public const HexColor colorPaleGreen = HexColor.colorPaleGreen;
 
-        public const HexColor colorPaleGreen1 = HexColor.colorPaleGreen1;
-
-        public const HexColor colorPaleGreen2 = HexColor.colorPaleGreen2;
-
-        public const HexColor colorPaleGreen3 = HexColor.colorPaleGreen3;
-
-        public const HexColor colorPaleGreen4 = HexColor.colorPaleGreen4;
-
         public const HexColor colorPaleTurquoise = HexColor.colorPaleTurquoise;
 
-        public const HexColor colorPaleTurquoise1 = HexColor.colorPaleTurquoise1;
-
-        public const HexColor colorPaleTurquoise2 = HexColor.colorPaleTurquoise2;
-
-        public const HexColor colorPaleTurquoise3 = HexColor.colorPaleTurquoise3;
-
-        public const HexColor colorPaleTurquoise4 = HexColor.colorPaleTurquoise4;
-
         public const HexColor colorPaleVioletRed = HexColor.colorPaleVioletRed;
 
-        public const HexColor colorPaleVioletRed1 = HexColor.colorPaleVioletRed1;
-
-        public const HexColor colorPaleVioletRed2 = HexColor.colorPaleVioletRed2;
-
-        public const HexColor colorPaleVioletRed3 = HexColor.colorPaleVioletRed3;
-
-        public const HexColor colorPaleVioletRed4 = HexColor.colorPaleVioletRed4;
-
         public const HexColor colorPapayaWhip = HexColor.colorPapayaWhip;
 
         public const HexColor colorPeachPuff = HexColor.colorPeachPuff;
 
-        public const HexColor colorPeachPuff1 = HexColor.colorPeachPuff1;
-
-        public const HexColor colorPeachPuff2 = HexColor.colorPeachPuff2;
-
-        public const HexColor colorPeachPuff3 = HexColor.colorPeachPuff3;
-
-        public const HexColor colorPeachPuff4 = HexColor.colorPeachPuff4;
-
         public const HexColor colorPeru = HexColor.colorPeru;
 
         public const HexColor colorPink = HexColor.colorPink;
 
-        public const HexColor colorPink1 = HexColor.colorPink1;
-
-        public const HexColor colorPink2 = HexColor.colorPink2;
-
-        public const HexColor colorPink3 = HexColor.colorPink3;
-
-        public const HexColor colorPink4 = HexColor.colorPink4;
-
         public const HexColor colorPlum = HexColor.colorPlum;
 
-        public const HexColor colorPlum1 = HexColor.colorPlum1;
-
-        public const HexColor colorPlum2 = HexColor.colorPlum2;
-
-        public const HexColor colorPlum3 = HexColor.colorPlum3;
-
-        public const HexColor colorPlum4 = HexColor.colorPlum4;
-
         public const HexColor colorPowderBlue = HexColor.colorPowderBlue;
 
         public const HexColor colorPurple = HexColor.colorPurple;
 
-        public const HexColor colorPurple1 = HexColor.colorPurple1;
-
-        public const HexColor colorPurple2 = HexColor.colorPurple2;
-
-        public const HexColor colorPurple3 = HexColor.colorPurple3;
-
-        public const HexColor colorPurple4 = HexColor.colorPurple4;
-
         public const HexColor colorRebeccaPurple = HexColor.colorRebeccaPurple;
 
         public const HexColor colorRed = HexColor.colorRed;
 
-        public const HexColor colorRed1 = HexColor.colorRed1;
-
-        public const HexColor colorRed2 = HexColor.colorRed2;
-
-        public const HexColor colorRed3 = HexColor.colorRed3;
-
-        public const HexColor colorRed4 = HexColor.colorRed4;
-
         public const HexColor colorRosyBrown = HexColor.colorRosyBrown;
 
-        public const HexColor colorRosyBrown1 = HexColor.colorRosyBrown1;
-
-        public const HexColor colorRosyBrown2 = HexColor.colorRosyBrown2;
-
-        public const HexColor colorRosyBrown3 = HexColor.colorRosyBrown3;
-
-        public const HexColor colorRosyBrown4 = HexColor.colorRosyBrown4;
-
         public const HexColor colorRoyalBlue = HexColor.colorRoyalBlue;
 
-        public const HexColor colorRoyalBlue1 = HexColor.colorRoyalBlue1;
-
-        public const HexColor colorRoyalBlue2 = HexColor.colorRoyalBlue2;
-
-        public const HexColor colorRoyalBlue3 = HexColor.colorRoyalBlue3;
-
-        public const HexColor colorRoyalBlue4 = HexColor.colorRoyalBlue4;
-
         public const HexColor colorSaddleBrown = HexColor.colorSaddleBrown;
 
         public const HexColor colorSalmon = HexColor.colorSalmon;
 
-        public const HexColor colorSalmon1 = HexColor.colorSalmon1;
-
-        public const HexColor colorSalmon2 = HexColor.colorSalmon2;
-
-        public const HexColor colorSalmon3 = HexColor.colorSalmon3;
-
-        public const HexColor colorSalmon4 = HexColor.colorSalmon4;
-
         public const HexColor colorSandyBrown = HexColor.colorSandyBrown;
 
         public const HexColor colorSeaGreen = HexColor.colorSeaGreen;
 
-        public const HexColor colorSeaGreen1 = HexColor.colorSeaGreen1;
-
-        public const HexColor colorSeaGreen2 = HexColor.colorSeaGreen2;
-
-        public const HexColor colorSeaGreen3 = HexColor.colorSeaGreen3;
-
-        public const HexColor colorSeaGreen4 = HexColor.colorSeaGreen4;
-
         public const HexColor colorSeashell = HexColor.colorSeashell;
 
-        public const HexColor colorSeashell1 = HexColor.colorSeashell1;
-
-        public const HexColor colorSeashell2 = HexColor.colorSeashell2;
-
-        public const HexColor colorSeashell3 = HexColor.colorSeashell3;
-
-        public const HexColor colorSeashell4 = HexColor.colorSeashell4;
-
         public const HexColor colorSienna = HexColor.colorSienna;
 
-        public const HexColor colorSienna1 = HexColor.colorSienna1;
-
-        public const HexColor colorSienna2 = HexColor.colorSienna2;
-
-        public const HexColor colorSienna3 = HexColor.colorSienna3;
-
-        public const HexColor colorSienna4 = HexColor.colorSienna4;
-
         public const HexColor colorSilver = HexColor.colorSilver;
 
         public const HexColor colorSkyBlue = HexColor.colorSkyBlue;
 
-        public const HexColor colorSkyBlue1 = HexColor.colorSkyBlue1;
-
-        public const HexColor colorSkyBlue2 = HexColor.colorSkyBlue2;
-
-        public const HexColor colorSkyBlue3 = HexColor.colorSkyBlue3;
-
-        public const HexColor colorSkyBlue4 = HexColor.colorSkyBlue4;
-
         public const HexColor colorSlateBlue = HexColor.colorSlateBlue;
 
-        public const HexColor colorSlateBlue1 = HexColor.colorSlateBlue1;
-
-        public const HexColor colorSlateBlue2 = HexColor.colorSlateBlue2;
-
-        public const HexColor colorSlateBlue3 = HexColor.colorSlateBlue3;
-
-        public const HexColor colorSlateBlue4 = HexColor.colorSlateBlue4;
-
         public const HexColor colorSlateGray = HexColor.colorSlateGray;
 
-        public const HexColor colorSlateGray1 = HexColor.colorSlateGray1;
-
-        public const HexColor colorSlateGray2 = HexColor.colorSlateGray2;
-
-        public const HexColor colorSlateGray3 = HexColor.colorSlateGray3;
-
-        public const HexColor colorSlateGray4 = HexColor.colorSlateGray4;
-
         public const HexColor colorSnow = HexColor.colorSnow;
 
-        public const HexColor colorSnow1 = HexColor.colorSnow1;
-
-        public const HexColor colorSnow2 = HexColor.colorSnow2;
-
-        public const HexColor colorSnow3 = HexColor.colorSnow3;
-
-        public const HexColor colorSnow4 = HexColor.colorSnow4;
-
         public const HexColor colorSpringGreen = HexColor.colorSpringGreen;
 
-        public const HexColor colorSpringGreen1 = HexColor.colorSpringGreen1;
-
-        public const HexColor colorSpringGreen2 = HexColor.colorSpringGreen2;
-
-        public const HexColor colorSpringGreen3 = HexColor.colorSpringGreen3;
-
-        public const HexColor colorSpringGreen4 = HexColor.colorSpringGreen4;
-
         public const HexColor colorSteelBlue = HexColor.colorSteelBlue;
 
-        public const HexColor colorSteelBlue1 = HexColor.colorSteelBlue1;
-
-        public const HexColor colorSteelBlue2 = HexColor.colorSteelBlue2;
-
-        public const HexColor colorSteelBlue3 = HexColor.colorSteelBlue3;
-
-        public const HexColor colorSteelBlue4 = HexColor.colorSteelBlue4;
-
         public const HexColor colorTan = HexColor.colorTan;
 
-        public const HexColor colorTan1 = HexColor.colorTan1;
-
-        public const HexColor colorTan2 = HexColor.colorTan2;
-
-        public const HexColor colorTan3 = HexColor.colorTan3;
-
-        public const HexColor colorTan4 = HexColor.colorTan4;
-
         public const HexColor colorTeal = HexColor.colorTeal;
 
         public const HexColor colorThistle = HexColor.colorThistle;
 
-        public const HexColor colorThistle1 = HexColor.colorThistle1;
-
-        public const HexColor colorThistle2 = HexColor.colorThistle2;
-
-        public const HexColor colorThistle3 = HexColor.colorThistle3;
-
-        public const HexColor colorThistle4 = HexColor.colorThistle4;
-
         public const HexColor colorTomato = HexColor.colorTomato;
 
-        public const HexColor colorTomato1 = HexColor.colorTomato1;
-
-        public const HexColor colorTomato2 = HexColor.colorTomato2;
-
-        public const HexColor colorTomato3 = HexColor.colorTomato3;
-
-        public const HexColor colorTomato4 = HexColor.colorTomato4;
-
         public const HexColor colorTurquoise = HexColor.colorTurquoise;
 
-        public const HexColor colorTurquoise1 = HexColor.colorTurquoise1;
-
-        public const HexColor colorTurquoise2 = HexColor.colorTurquoise2;
-
-        public const HexColor colorTurquoise3 = HexColor.colorTurquoise3;
-
-        public const HexColor colorTurquoise4 = HexColor.colorTurquoise4;
-
         public const HexColor colorViolet = HexColor.colorViolet;
 
         public const HexColor colorVioletRed = HexColor.colorVioletRed;
 
-        public const HexColor colorVioletRed1 = HexColor.colorVioletRed1;
-
-        public const HexColor colorVioletRed2 = HexColor.colorVioletRed2;
-
-        public const HexColor colorVioletRed3 = HexColor.colorVioletRed3;
-
-        public const HexColor colorVioletRed4 = HexColor.colorVioletRed4;
-
-        public const HexColor colorWebGray = HexColor.colorWebGray;
-
-        public const HexColor colorWebGreen = HexColor.colorWebGreen;
-
-        public const HexColor colorWebMaroon = HexColor.colorWebMaroon;
-
-        public const HexColor colorWebPurple = HexColor.colorWebPurple;
-
         public const HexColor colorWheat = HexColor.colorWheat;
 
-        public const HexColor colorWheat1 = HexColor.colorWheat1;
-
-        public const HexColor colorWheat2 = HexColor.colorWheat2;
-
-        public const HexColor colorWheat3 = HexColor.colorWheat3;
-
-        public const HexColor colorWheat4 = HexColor.colorWheat4;
-
         public const HexColor colorWhite = HexColor.colorWhite;
 
         public const HexColor colorWhiteSmoke = HexColor.colorWhiteSmoke;
 
-        public const HexColor colorX11Gray = HexColor.colorX11Gray;
-
-        public const HexColor colorX11Green = HexColor.colorX11Green;
-
-        public const HexColor colorX11Maroon = HexColor.colorX11Maroon;
-
-        public const HexColor colorX11Purple = HexColor.colorX11Purple;
-
         public const HexColor colorYellow = HexColor.colorYellow;
 
-        public const HexColor colorYellow1 = HexColor.colorYellow1;
-
-        public const HexColor colorYellow2 = HexColor.colorYellow2;
-
-        public const HexColor colorYellow3 = HexColor.colorYellow3;
-
-        public const HexColor colorYellow4 = HexColor.colorYellow4;
-
         public const HexColor colorYellowGreen = HexColor.colorYellowGreen;
 
         public const JointType distanceJoint = JointType.distanceJoint;
@@ -3918,42 +2909,14 @@ public enum TOIState : uint
 
         public const TOIState toiStateSeparated = TOIState.toiStateSeparated;
 
-        public const float aabbMargin = 0.1f;
-
-        public const float angularSleepTolerance = 0.03490659f;
-
-        public const float angularSlop = 0.03490659f;
-
         public const int defaultCategoryBits = 1;
 
         public const uint defaultMaskBits = 4294967295;
 
-        public const int graphColorCount = 12;
-
-        public const float huge = 100000f;
-
-        public const float lengthUnitsPerMeter = 1f;
-
-        public const float linearSleepTolerance = 0.01f;
-
-        public const float linearSlop = 0.005f;
-
         public const int maxPolygonVertices = 8;
 
-        public const float maxRotation = 0.7853982f;
-
-        public const float maxTranslation = 4f;
-
-        public const int maxWorkers = 64;
-
-        public const int maxWorlds = 128;
-
         public const float pi = 3.1415927f;
 
-        public const float speculativeDistance = 0.02f;
-
-        public const float timeToSleep = 0.5f;
-
         public partial class BindgenInternal
         {
             public const string DllImportPath = "box2c";
@@ -3978,7 +2941,9 @@ public partial class BindgenInternal
         {
             public static readonly System.Collections.Generic.List<string> DllFilePaths;
 
-            public static System.IntPtr _libraryHandle = System.IntPtr.Zero;
+            public static System.IntPtr LibraryHandle = System.IntPtr.Zero;
+
+            public static readonly object Lock = new object ();
 
             public static bool IsLinux => System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Linux);
 
@@ -4035,12 +3000,12 @@ public static bool TryLoad(string path, out System.IntPtr handle)
             public static System.IntPtr GetExport(string symbol)
             {
 #if NET5_0_OR_GREATER
-            return System.Runtime.InteropServices.NativeLibrary.GetExport(_libraryHandle, symbol);
+            return System.Runtime.InteropServices.NativeLibrary.GetExport(LibraryHandle, symbol);
 #else
                 if (IsLinux)
                 {
                     GetLastErrorLinux();
-                    System.IntPtr handle = GetExportLinux(_libraryHandle, symbol);
+                    System.IntPtr handle = GetExportLinux(LibraryHandle, symbol);
                     if (handle != System.IntPtr.Zero)
                         return handle;
                     byte* errorResult = GetLastErrorLinux();
@@ -4053,7 +3018,7 @@ public static System.IntPtr GetExport(string symbol)
                 if (IsOsx)
                 {
                     GetLastErrorOsx();
-                    System.IntPtr handle = GetExportOsx(_libraryHandle, symbol);
+                    System.IntPtr handle = GetExportOsx(LibraryHandle, symbol);
                     if (handle != System.IntPtr.Zero)
                         return handle;
                     byte* errorResult = GetLastErrorOsx();
@@ -4065,7 +3030,7 @@ public static System.IntPtr GetExport(string symbol)
 
                 if (IsWindows)
                 {
-                    System.IntPtr handle = GetExportWindows(_libraryHandle, symbol);
+                    System.IntPtr handle = GetExportWindows(LibraryHandle, symbol);
                     if (handle != System.IntPtr.Zero)
                         return handle;
                     int errorCode = GetLastErrorWindows();
@@ -4088,45 +3053,51 @@ public static void ResolveLibrary()
                     fileExtension = ".dll";
                 else
                     throw new System.InvalidOperationException("Can't determine native library file extension for the current system.");
+                System.IntPtr handle = default;
                 foreach (string dllFilePath in DllFilePaths)
                 {
                     string fileName = System.IO.Path.GetFileName(dllFilePath);
                     string parentDir = $"{dllFilePath}/..";
                     string searchDir = System.IO.Path.IsPathRooted(dllFilePath) ? System.IO.Path.GetFullPath(parentDir) + "/" : System.IO.Path.GetFullPath(System.AppDomain.CurrentDomain.BaseDirectory + parentDir) + "/";
-                    if (TryLoad($"{searchDir}{fileName}", out _libraryHandle))
-                        return;
-                    if (TryLoad($"{searchDir}{fileName}{fileExtension}", out _libraryHandle))
-                        return;
-                    if (TryLoad($"{searchDir}lib{fileName}", out _libraryHandle))
-                        return;
-                    if (TryLoad($"{searchDir}lib{fileName}{fileExtension}", out _libraryHandle))
-                        return;
+                    if (TryLoad($"{searchDir}{fileName}", out handle))
+                        goto Return;
+                    if (TryLoad($"{searchDir}{fileName}{fileExtension}", out handle))
+                        goto Return;
+                    if (TryLoad($"{searchDir}lib{fileName}", out handle))
+                        goto Return;
+                    if (TryLoad($"{searchDir}lib{fileName}{fileExtension}", out handle))
+                        goto Return;
                     if (!fileName.StartsWith("lib") || fileName == "lib")
                         continue;
                     string unprefixed = fileName.Substring(4);
-                    if (TryLoad($"{searchDir}{unprefixed}", out _libraryHandle))
-                        return;
-                    if (TryLoad($"{searchDir}{unprefixed}{fileExtension}", out _libraryHandle))
-                        return;
+                    if (TryLoad($"{searchDir}{unprefixed}", out handle))
+                        goto Return;
+                    if (TryLoad($"{searchDir}{unprefixed}{fileExtension}", out handle))
+                        goto Return;
                 }
 
 #if NET7_0_OR_GREATER
-                _libraryHandle = System.Runtime.InteropServices.NativeLibrary.GetMainProgramHandle();
+                handle = System.Runtime.InteropServices.NativeLibrary.GetMainProgramHandle();
 #else
                 if (IsLinux)
-                    _libraryHandle = LoadLibraryLinux(null, 0x101);
+                    handle = LoadLibraryLinux(null, 0x101);
                 else if (IsOsx)
-                    _libraryHandle = LoadLibraryOsx(null, 0x101);
+                    handle = LoadLibraryOsx(null, 0x101);
                 else if (IsWindows)
-                    _libraryHandle = GetModuleHandle(null);
+                    handle = GetModuleHandle(null);
 #endif
+                Return:
+                    LibraryHandle = handle;
             }
 
             public static void* LoadDllSymbol(string variableSymbol, out void* field)
             {
-                if (_libraryHandle == System.IntPtr.Zero)
-                    ResolveLibrary();
-                return field = (void*)GetExport(variableSymbol);
+                lock (Lock)
+                {
+                    if (LibraryHandle == System.IntPtr.Zero)
+                        ResolveLibrary();
+                    return field = (void*)GetExport(variableSymbol);
+                }
             }
         }
     }
diff --git a/Box2D.NET.Bindings/Box2D.NET.Bindings.csproj b/Box2D.NET.Bindings/Box2D.NET.Bindings.csproj
index 77af8a5..7559210 100644
--- a/Box2D.NET.Bindings/Box2D.NET.Bindings.csproj
+++ b/Box2D.NET.Bindings/Box2D.NET.Bindings.csproj
@@ -9,7 +9,7 @@
         <IsPackable>true</IsPackable>
         <IncludeContentInPack>true</IncludeContentInPack>
 
-        <Version>0.0.7</Version>
+        <Version>0.0.8</Version>
         <Title Condition="'$(Configuration)' == 'Debug'">Box2D.NET.Bindings.Debug</Title>
         <Title Condition="'$(Configuration)' == 'Release'">Box2D.NET.Bindings.Release</Title>
         <Authors>BeanCheeseBurrito</Authors>
diff --git a/Box2D.NET.Native/Box2D.NET.Native.csproj b/Box2D.NET.Native/Box2D.NET.Native.csproj
index e74eb78..391c30c 100644
--- a/Box2D.NET.Native/Box2D.NET.Native.csproj
+++ b/Box2D.NET.Native/Box2D.NET.Native.csproj
@@ -10,7 +10,7 @@
         <IsPackable>true</IsPackable>
         <IncludeContentInPack>true</IncludeContentInPack>
 
-        <Version>0.0.7</Version>
+        <Version>0.0.8</Version>
         <Title Condition="'$(Configuration)' == 'Debug'">Box2D.NET.Native.Debug</Title>
         <Title Condition="'$(Configuration)' == 'Release'">Box2D.NET.Native.Release</Title>
         <Authors>BeanCheeseBurrito</Authors>
diff --git a/Box2D.NET.Native/build.zig b/Box2D.NET.Native/build.zig
index 3214286..df8d6d8 100644
--- a/Box2D.NET.Native/build.zig
+++ b/Box2D.NET.Native/build.zig
@@ -19,7 +19,7 @@ pub fn compileLibrary(b: *Build, lib: *Build.Step.Compile) void {
         "../native/box2c/src/allocate.c",
         "../native/box2c/src/array.c",
         "../native/box2c/src/bitset.c",
-        "../native/box2c/src/block_allocator.c",
+        "../native/box2c/src/block_array.c",
         "../native/box2c/src/body.c",
         "../native/box2c/src/broad_phase.c",
         "../native/box2c/src/constraint_graph.c",
@@ -31,18 +31,18 @@ pub fn compileLibrary(b: *Build, lib: *Build.Step.Compile) void {
         "../native/box2c/src/dynamic_tree.c",
         "../native/box2c/src/geometry.c",
         "../native/box2c/src/hull.c",
-        "../native/box2c/src/implementation.c",
+        "../native/box2c/src/id_pool.c",
         "../native/box2c/src/island.c",
         "../native/box2c/src/joint.c",
         "../native/box2c/src/manifold.c",
-        "../native/box2c/src/math.c",
+        "../native/box2c/src/math_functions.c",
         "../native/box2c/src/motor_joint.c",
         "../native/box2c/src/mouse_joint.c",
-        "../native/box2c/src/pool.c",
         "../native/box2c/src/prismatic_joint.c",
         "../native/box2c/src/revolute_joint.c",
         "../native/box2c/src/shape.c",
         "../native/box2c/src/solver.c",
+        "../native/box2c/src/solver_set.c",
         "../native/box2c/src/stack_allocator.c",
         "../native/box2c/src/table.c",
         "../native/box2c/src/timer.c",
diff --git a/Box2D.NET.Tests/WorldTests.cs b/Box2D.NET.Tests/WorldTests.cs
index ce1b44a..8b1b918 100644
--- a/Box2D.NET.Tests/WorldTests.cs
+++ b/Box2D.NET.Tests/WorldTests.cs
@@ -9,14 +9,12 @@ public unsafe class WorldTests
         [Fact]
         public void HelloWorld()
         {
-			// Define the gravity vector.
-			B2.Vec2 gravity = new B2.Vec2 { x = 0.0f, y = -10.0f };
-
 			// Construct a world object, which will hold and simulate the rigid bodies.
 			B2.WorldDef worldDef = B2.DefaultWorldDef();
-			worldDef.gravity = gravity;
+			worldDef.gravity = new B2.Vec2 { x = 0.0f, y = -10.0f };
 
 			B2.WorldId worldId = B2.CreateWorld(&worldDef);
+			Assert.True(B2.WorldIsValid(worldId) != 0);
 
 			// Define the ground body.
 			B2.BodyDef groundBodyDef = B2.DefaultBodyDef();
@@ -25,14 +23,15 @@ public void HelloWorld()
 			// Call the body factory which allocates memory for the ground body
 			// from a pool and creates the ground box shape (also from a pool).
 			// The body is also added to the world.
-			B2.BodyId groundBodyId = B2.CreateBody(worldId, &groundBodyDef);
+			B2.BodyId groundId = B2.CreateBody(worldId, &groundBodyDef);
+			Assert.True(B2.BodyIsValid(groundId) != 0);
 
 			// Define the ground box shape. The extents are the half-widths of the box.
 			B2.Polygon groundBox = B2.MakeBox(50.0f, 10.0f);
 
 			// Add the box shape to the ground body.
 			B2.ShapeDef groundShapeDef = B2.DefaultShapeDef();
-			B2.CreatePolygonShape(groundBodyId, &groundShapeDef, &groundBox);
+			B2.CreatePolygonShape(groundId, &groundShapeDef, &groundBox);
 
 			// Define the dynamic body. We set its position and call the body factory.
 			B2.BodyDef bodyDef = B2.DefaultBodyDef();
diff --git a/Box2D.NET/Box2D.NET.csproj b/Box2D.NET/Box2D.NET.csproj
index a8578e2..4fc3a45 100644
--- a/Box2D.NET/Box2D.NET.csproj
+++ b/Box2D.NET/Box2D.NET.csproj
@@ -9,7 +9,7 @@
         <IsPackable>true</IsPackable>
         <IncludeContentInPack>true</IncludeContentInPack>
 
-        <Version>0.0.7</Version>
+        <Version>0.0.8</Version>
         <Title Condition="'$(Configuration)' == 'Debug'">Box2D.NET.Debug</Title>
         <Title Condition="'$(Configuration)' == 'Release'">Box2D.NET.Release</Title>
         <Authors>BeanCheeseBurrito</Authors>
diff --git a/native/box2c b/native/box2c
index 29adfcf..1d7d1cf 160000
--- a/native/box2c
+++ b/native/box2c
@@ -1 +1 @@
-Subproject commit 29adfcfb4dbc371a50e37d8e17b072d990ad7ae6
+Subproject commit 1d7d1cf14722a06f6a7b1c3b0850e70bcbec8558