diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
index ee07ba62..6271aeb5 100644
--- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
+++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj
@@ -63,6 +63,7 @@
     <Compile Include="ReflectionLearningTests.cs" />
     <Compile Include="Strukturen\CurveKeyCollectionTest.cs" />
     <Compile Include="Strukturen\CurveKeyTest.cs" />
+    <Compile Include="Strukturen\EnumValidationTest.cs" />
     <Compile Include="Strukturen\EventArgsTest.cs" />
     <Compile Include="Strukturen\GameServiceContainerTest.cs" />
     <Compile Include="Strukturen\Graphics\PackedVector\Alpha8Test.cs" />
diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_Linux.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_Linux.csproj
index bc91a20c..c97394e4 100644
--- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_Linux.csproj
+++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_Linux.csproj
@@ -63,6 +63,7 @@
     <Compile Include="ReflectionLearningTests.cs" />
     <Compile Include="Strukturen\CurveKeyCollectionTest.cs" />
     <Compile Include="Strukturen\CurveKeyTest.cs" />
+    <Compile Include="Strukturen\EnumValidationTest.cs" />
     <Compile Include="Strukturen\EventArgsTest.cs" />
     <Compile Include="Strukturen\GameServiceContainerTest.cs" />
     <Compile Include="Strukturen\Graphics\PackedVector\Alpha8Test.cs" />
diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_PSVita.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_PSVita.csproj
index 05af639a..7b7111b0 100644
--- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_PSVita.csproj
+++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_PSVita.csproj
@@ -64,6 +64,7 @@
     <Compile Include="ReflectionLearningTests.cs" />
     <Compile Include="Strukturen\CurveKeyCollectionTest.cs" />
     <Compile Include="Strukturen\CurveKeyTest.cs" />
+    <Compile Include="Strukturen\EnumValidationTest.cs" />
     <Compile Include="Strukturen\EventArgsTest.cs" />
     <Compile Include="Strukturen\GameServiceContainerTest.cs" />
     <Compile Include="Strukturen\Graphics\PackedVector\Alpha8Test.cs" />
diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj
index 30813943..b7eabe22 100644
--- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj
+++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj
@@ -65,6 +65,7 @@
     <Compile Include="ReflectionLearningTests.cs" />
     <Compile Include="Strukturen\CurveKeyCollectionTest.cs" />
     <Compile Include="Strukturen\CurveKeyTest.cs" />
+    <Compile Include="Strukturen\EnumValidationTest.cs" />
     <Compile Include="Strukturen\EventArgsTest.cs" />
     <Compile Include="Strukturen\GameServiceContainerTest.cs" />
     <Compile Include="Strukturen\Graphics\PackedVector\Alpha8Test.cs" />
diff --git a/ANX.Framework.TestCenter/Strukturen/EnumValidationTest.cs b/ANX.Framework.TestCenter/Strukturen/EnumValidationTest.cs
new file mode 100644
index 00000000..f49a4fdc
--- /dev/null
+++ b/ANX.Framework.TestCenter/Strukturen/EnumValidationTest.cs
@@ -0,0 +1,89 @@
+using System;
+using ANX.Framework.Audio;
+using ANX.Framework.Graphics;
+using NUnit.Framework;
+using ANX.Framework.Input;
+using ANX.Framework.Media;
+
+// This file is part of the ANX.Framework created by the
+// "ANX.Framework developer group" and released under the Ms-PL license.
+// For details see: http://anxframework.codeplex.com/license
+
+namespace ANX.Framework.TestCenter.Strukturen
+{
+    class EnumValidationTest
+    {
+        private static readonly object[] EnumPairs =
+        {
+            new object[] { typeof(Microsoft.Xna.Framework.ContainmentType), typeof(ContainmentType) },
+            new object[] { typeof(Microsoft.Xna.Framework.CurveContinuity), typeof(CurveContinuity) },
+            new object[] { typeof(Microsoft.Xna.Framework.CurveLoopType), typeof(CurveLoopType) },
+            new object[] { typeof(Microsoft.Xna.Framework.CurveTangent), typeof(CurveTangent) },
+            new object[] { typeof(Microsoft.Xna.Framework.DisplayOrientation), typeof(DisplayOrientation) },
+            new object[] { typeof(Microsoft.Xna.Framework.PlaneIntersectionType), typeof(PlaneIntersectionType) },
+            new object[] { typeof(Microsoft.Xna.Framework.PlayerIndex), typeof(PlayerIndex) },
+            
+            new object[] { typeof(Microsoft.Xna.Framework.Audio.AudioChannels), typeof(AudioChannels) },
+            new object[] { typeof(Microsoft.Xna.Framework.Audio.MicrophoneState), typeof(MicrophoneState) },
+            new object[] { typeof(Microsoft.Xna.Framework.Audio.SoundState), typeof(SoundState) },
+            
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.Blend), typeof(Blend) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.BlendFunction), typeof(BlendFunction) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.BufferUsage), typeof(BufferUsage) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.ClearOptions), typeof(ClearOptions) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.ColorWriteChannels), typeof(ColorWriteChannels) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.CompareFunction), typeof(CompareFunction) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.CubeMapFace), typeof(CubeMapFace) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.CullMode), typeof(CullMode) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.DepthFormat), typeof(DepthFormat) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.EffectParameterClass), typeof(EffectParameterClass) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.EffectParameterType), typeof(EffectParameterType) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.FillMode), typeof(FillMode) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.GraphicsDeviceStatus), typeof(GraphicsDeviceStatus) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.GraphicsProfile), typeof(GraphicsProfile) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.IndexElementSize), typeof(IndexElementSize) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.PresentInterval), typeof(PresentInterval) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.PrimitiveType), typeof(PrimitiveType) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.RenderTargetUsage), typeof(RenderTargetUsage) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.SetDataOptions), typeof(SetDataOptions) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.SpriteEffects), typeof(SpriteEffects) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.SpriteSortMode), typeof(SpriteSortMode) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.StencilOperation), typeof(StencilOperation) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.SurfaceFormat), typeof(SurfaceFormat) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.TextureAddressMode), typeof(TextureAddressMode) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.TextureFilter), typeof(TextureFilter) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.VertexElementFormat), typeof(VertexElementFormat) },
+            new object[] { typeof(Microsoft.Xna.Framework.Graphics.VertexElementUsage), typeof(VertexElementUsage) },
+            
+            new object[] { typeof(Microsoft.Xna.Framework.Input.ButtonState), typeof(ButtonState) },
+            new object[] { typeof(Microsoft.Xna.Framework.Input.Buttons), typeof(Buttons) },
+            new object[] { typeof(Microsoft.Xna.Framework.Input.GamePadType), typeof(GamePadType) },
+            new object[] { typeof(Microsoft.Xna.Framework.Input.KeyState), typeof(KeyState) },
+            new object[] { typeof(Microsoft.Xna.Framework.Input.Keys), typeof(Keys) },
+            new object[] { typeof(Microsoft.Xna.Framework.Media.MediaSourceType), typeof(MediaSourceType) },
+            new object[] { typeof(Microsoft.Xna.Framework.Media.MediaState), typeof(MediaState) },
+        };
+        
+        [TestCaseSource("EnumPairs")]
+        public void CompareEnums(Type first, Type second)
+        {
+            string[] xnaNames = Enum.GetNames(first);
+            string[] anxNames = Enum.GetNames(second);
+
+            for(int index = 0; index < xnaNames.Length; index++)
+            {
+                Assert.AreEqual(xnaNames[index], anxNames[index]);
+                Type xnaUnderlyingType = Enum.GetUnderlyingType(first);
+                Type anxUnderlyingType = Enum.GetUnderlyingType(second);
+                Assert.AreEqual(xnaUnderlyingType, anxUnderlyingType);
+
+                object xnaValue = Enum.Parse(first, xnaNames[index]);
+                object anxValue = Enum.Parse(second, anxNames[index]);
+                if (xnaUnderlyingType == typeof(byte))
+                    Assert.AreEqual((byte)xnaValue, (byte)anxValue);
+                else
+                    Assert.AreEqual((int)xnaValue, (int)anxValue);
+            }
+        }
+    }
+}
diff --git a/ANX.Framework/BoundingBox.cs b/ANX.Framework/BoundingBox.cs
index d4c26e26..0ce067f3 100644
--- a/ANX.Framework/BoundingBox.cs
+++ b/ANX.Framework/BoundingBox.cs
@@ -490,7 +490,7 @@ namespace ANX.Framework
         #region IEquatable implementation
         public override bool Equals(Object obj)
         {
-            return (obj is BoundingBox) ? this.Equals((BoundingBox)obj) : false;
+            return obj is BoundingBox && Equals((BoundingBox)obj);
         }
         public bool Equals(BoundingBox other)
         {
diff --git a/ANX.Framework/BoundingFrustum.cs b/ANX.Framework/BoundingFrustum.cs
index 05fcda47..508be081 100644
--- a/ANX.Framework/BoundingFrustum.cs
+++ b/ANX.Framework/BoundingFrustum.cs
@@ -2,7 +2,6 @@
 using System;
 using ANX.Framework.NonXNA.Development;
 
-
 #endregion // Using Statements
 
 // This file is part of the ANX.Framework created by the
@@ -756,19 +755,12 @@ namespace ANX.Framework
         public override bool Equals(Object obj)
         {
             var frustum = obj as BoundingFrustum;
-            if (frustum != null)
-            {
-                return this.Matrix == frustum.Matrix;
-            }
-            return false;
+            return frustum != null && this.Matrix == frustum.Matrix;
         }
+
         public bool Equals(BoundingFrustum other)
         {
-            if (other != null)
-            {
-                return this.Matrix == other.Matrix;
-            }
-            return false;
+            return other != null && this.Matrix == other.Matrix;
         }
         #endregion
 
diff --git a/ANX.Framework/BoundingSphere.cs b/ANX.Framework/BoundingSphere.cs
index bcf058c1..07eaff2b 100644
--- a/ANX.Framework/BoundingSphere.cs
+++ b/ANX.Framework/BoundingSphere.cs
@@ -428,7 +428,7 @@ namespace ANX.Framework
         #region IEquatable implementation
         public override bool Equals(Object obj)
         {
-            return (obj is BoundingSphere) ? this.Equals((BoundingSphere)obj) : false;
+            return obj is BoundingSphere && Equals((BoundingSphere)obj);
         }
         public bool Equals(BoundingSphere other)
         {
diff --git a/ANX.Framework/Graphics/Blend.cs b/ANX.Framework/Graphics/Blend.cs
index 19835fe9..e8bb953c 100644
--- a/ANX.Framework/Graphics/Blend.cs
+++ b/ANX.Framework/Graphics/Blend.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum Blend
     {
         One,
diff --git a/ANX.Framework/Graphics/BlendFunction.cs b/ANX.Framework/Graphics/BlendFunction.cs
index 8ea85139..a51f5752 100644
--- a/ANX.Framework/Graphics/BlendFunction.cs
+++ b/ANX.Framework/Graphics/BlendFunction.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum BlendFunction
     {
         Add,
diff --git a/ANX.Framework/Graphics/BufferUSage.cs b/ANX.Framework/Graphics/BufferUSage.cs
index 1ce9d0cf..6a06d678 100644
--- a/ANX.Framework/Graphics/BufferUSage.cs
+++ b/ANX.Framework/Graphics/BufferUSage.cs
@@ -10,7 +10,7 @@ namespace ANX.Framework.Graphics
     [Flags]
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum BufferUsage
     {
         None,
diff --git a/ANX.Framework/Graphics/ClearOptions.cs b/ANX.Framework/Graphics/ClearOptions.cs
index d7efec98..54ba5212 100644
--- a/ANX.Framework/Graphics/ClearOptions.cs
+++ b/ANX.Framework/Graphics/ClearOptions.cs
@@ -10,7 +10,7 @@ namespace ANX.Framework.Graphics
     [Flags]
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum ClearOptions
     {
         DepthBuffer = 2,
diff --git a/ANX.Framework/Graphics/ColorWriteChannels.cs b/ANX.Framework/Graphics/ColorWriteChannels.cs
index 15e77181..81e6f054 100644
--- a/ANX.Framework/Graphics/ColorWriteChannels.cs
+++ b/ANX.Framework/Graphics/ColorWriteChannels.cs
@@ -10,7 +10,7 @@ namespace ANX.Framework.Graphics
     [Flags]
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum ColorWriteChannels
     {
         All = 15,
diff --git a/ANX.Framework/Graphics/CompareFunction.cs b/ANX.Framework/Graphics/CompareFunction.cs
index 61d59757..1dd637af 100644
--- a/ANX.Framework/Graphics/CompareFunction.cs
+++ b/ANX.Framework/Graphics/CompareFunction.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum CompareFunction
     {
         Always,
diff --git a/ANX.Framework/Graphics/CubeMapFace.cs b/ANX.Framework/Graphics/CubeMapFace.cs
index 0afa5e40..4fae64eb 100644
--- a/ANX.Framework/Graphics/CubeMapFace.cs
+++ b/ANX.Framework/Graphics/CubeMapFace.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum CubeMapFace
     {
         PositiveX,
diff --git a/ANX.Framework/Graphics/CullMode.cs b/ANX.Framework/Graphics/CullMode.cs
index 26332e7c..ffc11904 100644
--- a/ANX.Framework/Graphics/CullMode.cs
+++ b/ANX.Framework/Graphics/CullMode.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum CullMode
     {
         None,
diff --git a/ANX.Framework/Graphics/DepthFormat.cs b/ANX.Framework/Graphics/DepthFormat.cs
index b57b41ef..7f1bfbe2 100644
--- a/ANX.Framework/Graphics/DepthFormat.cs
+++ b/ANX.Framework/Graphics/DepthFormat.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum DepthFormat
     {
         None,
diff --git a/ANX.Framework/Graphics/EffectParameterType.cs b/ANX.Framework/Graphics/EffectParameterType.cs
index 635b4318..6c6e78e0 100644
--- a/ANX.Framework/Graphics/EffectParameterType.cs
+++ b/ANX.Framework/Graphics/EffectParameterType.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum EffectParameterType
     {
         Void,
diff --git a/ANX.Framework/Graphics/FillMode.cs b/ANX.Framework/Graphics/FillMode.cs
index b1f831ea..a3a5ac3a 100644
--- a/ANX.Framework/Graphics/FillMode.cs
+++ b/ANX.Framework/Graphics/FillMode.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum FillMode
     {
         Solid,
diff --git a/ANX.Framework/Graphics/GraphicsDeviceStatus.cs b/ANX.Framework/Graphics/GraphicsDeviceStatus.cs
index 5086fcc8..6968f7f0 100644
--- a/ANX.Framework/Graphics/GraphicsDeviceStatus.cs
+++ b/ANX.Framework/Graphics/GraphicsDeviceStatus.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum GraphicsDeviceStatus
     {
         Normal,
diff --git a/ANX.Framework/Graphics/GraphicsProfile.cs b/ANX.Framework/Graphics/GraphicsProfile.cs
index fb27e2e5..c2479ea0 100644
--- a/ANX.Framework/Graphics/GraphicsProfile.cs
+++ b/ANX.Framework/Graphics/GraphicsProfile.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum GraphicsProfile
     {
         Reach,
diff --git a/ANX.Framework/Graphics/IndexElementSize.cs b/ANX.Framework/Graphics/IndexElementSize.cs
index f7b6b220..8635b3f0 100644
--- a/ANX.Framework/Graphics/IndexElementSize.cs
+++ b/ANX.Framework/Graphics/IndexElementSize.cs
@@ -7,7 +7,7 @@ namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
     [Developer("Glatzemann")]
-    [TestState(TestStateAttribute.TestState.Untested)]
+    [TestState(TestStateAttribute.TestState.Tested)]
     public enum IndexElementSize
     {
         SixteenBits,
diff --git a/ANX.Framework/Graphics/RenderTargetUsage.cs b/ANX.Framework/Graphics/RenderTargetUsage.cs
index 1c3ea445..1bc65604 100644
--- a/ANX.Framework/Graphics/RenderTargetUsage.cs
+++ b/ANX.Framework/Graphics/RenderTargetUsage.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum RenderTargetUsage
     {
diff --git a/ANX.Framework/Graphics/SetDataOptions.cs b/ANX.Framework/Graphics/SetDataOptions.cs
index 98ee7c6b..2851673b 100644
--- a/ANX.Framework/Graphics/SetDataOptions.cs
+++ b/ANX.Framework/Graphics/SetDataOptions.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SetDataOptions
     {
diff --git a/ANX.Framework/Graphics/SpriteEffects.cs b/ANX.Framework/Graphics/SpriteEffects.cs
index a9228082..d9a3f896 100644
--- a/ANX.Framework/Graphics/SpriteEffects.cs
+++ b/ANX.Framework/Graphics/SpriteEffects.cs
@@ -9,6 +9,7 @@ namespace ANX.Framework.Graphics
 {
     [Flags]
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SpriteEffects
     {
diff --git a/ANX.Framework/Graphics/SpriteSortMode.cs b/ANX.Framework/Graphics/SpriteSortMode.cs
index b2bd0f3c..5f1895eb 100644
--- a/ANX.Framework/Graphics/SpriteSortMode.cs
+++ b/ANX.Framework/Graphics/SpriteSortMode.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SpriteSortMode
     {
diff --git a/ANX.Framework/Graphics/StencilOperation.cs b/ANX.Framework/Graphics/StencilOperation.cs
index 01ea3713..bacc0656 100644
--- a/ANX.Framework/Graphics/StencilOperation.cs
+++ b/ANX.Framework/Graphics/StencilOperation.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
 	public enum StencilOperation
 	{
diff --git a/ANX.Framework/Graphics/SurfaceFormat.cs b/ANX.Framework/Graphics/SurfaceFormat.cs
index 525d0696..41a36f2b 100644
--- a/ANX.Framework/Graphics/SurfaceFormat.cs
+++ b/ANX.Framework/Graphics/SurfaceFormat.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SurfaceFormat
     {
diff --git a/ANX.Framework/Graphics/TextureAddressMode.cs b/ANX.Framework/Graphics/TextureAddressMode.cs
index 02a34659..a475c6ca 100644
--- a/ANX.Framework/Graphics/TextureAddressMode.cs
+++ b/ANX.Framework/Graphics/TextureAddressMode.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum TextureAddressMode
     {
diff --git a/ANX.Framework/Graphics/TextureFilter.cs b/ANX.Framework/Graphics/TextureFilter.cs
index 9614ec95..441975ce 100644
--- a/ANX.Framework/Graphics/TextureFilter.cs
+++ b/ANX.Framework/Graphics/TextureFilter.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum TextureFilter
     {
diff --git a/ANX.Framework/Graphics/VertexElementFormat.cs b/ANX.Framework/Graphics/VertexElementFormat.cs
index 7d7ded62..ef4303e8 100644
--- a/ANX.Framework/Graphics/VertexElementFormat.cs
+++ b/ANX.Framework/Graphics/VertexElementFormat.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum VertexElementFormat
     {
diff --git a/ANX.Framework/Graphics/VertexElementUsage.cs b/ANX.Framework/Graphics/VertexElementUsage.cs
index e435c46d..cd919075 100644
--- a/ANX.Framework/Graphics/VertexElementUsage.cs
+++ b/ANX.Framework/Graphics/VertexElementUsage.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum VertexElementUsage
     {
diff --git a/ANX.Framework/Input/ButtonState.cs b/ANX.Framework/Input/ButtonState.cs
index 110ac0a1..9bcf6969 100644
--- a/ANX.Framework/Input/ButtonState.cs
+++ b/ANX.Framework/Input/ButtonState.cs
@@ -7,8 +7,9 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Input
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
-    public enum ButtonState : byte
+    public enum ButtonState
     {
         Released,
         Pressed
diff --git a/ANX.Framework/Input/Buttons.cs b/ANX.Framework/Input/Buttons.cs
index e5bd426d..4868e181 100644
--- a/ANX.Framework/Input/Buttons.cs
+++ b/ANX.Framework/Input/Buttons.cs
@@ -8,6 +8,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Input
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     [Flags]
     public enum Buttons
diff --git a/ANX.Framework/Input/GamePadType.cs b/ANX.Framework/Input/GamePadType.cs
index 2bea73d6..db393825 100644
--- a/ANX.Framework/Input/GamePadType.cs
+++ b/ANX.Framework/Input/GamePadType.cs
@@ -7,8 +7,9 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Input
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
-	public enum GamePadType : short
+	public enum GamePadType
 	{
 		Unknown,
 		GamePad,
diff --git a/ANX.Framework/Input/KeyState.cs b/ANX.Framework/Input/KeyState.cs
index e01c2092..a8798cb5 100644
--- a/ANX.Framework/Input/KeyState.cs
+++ b/ANX.Framework/Input/KeyState.cs
@@ -7,6 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Input
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
 	public enum KeyState
 	{
diff --git a/ANX.Framework/Input/Keys.cs b/ANX.Framework/Input/Keys.cs
index a2ba044e..f58e1d5d 100644
--- a/ANX.Framework/Input/Keys.cs
+++ b/ANX.Framework/Input/Keys.cs
@@ -7,8 +7,9 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Input
 {
     [PercentageComplete(100)]
+    [Developer("AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
-	public enum Keys : byte
+	public enum Keys
 	{
 		None = 0,
 		Back = 8,