diff --git a/Projects/Server/Geometry/Rectangle2D.cs b/Projects/Server/Geometry/Rectangle2D.cs
index ccd051760..901cea1c2 100644
--- a/Projects/Server/Geometry/Rectangle2D.cs
+++ b/Projects/Server/Geometry/Rectangle2D.cs
@@ -15,7 +15,9 @@
 
 namespace Server
 {
-    [NoSort, Parsable, PropertyObject]
+    [NoSort]
+    [Parsable]
+    [PropertyObject]
     public struct Rectangle2D
     {
         private Point2D m_Start;
diff --git a/Projects/Server/Geometry/Rectangle3D.cs b/Projects/Server/Geometry/Rectangle3D.cs
index a81a24576..48ee66b75 100644
--- a/Projects/Server/Geometry/Rectangle3D.cs
+++ b/Projects/Server/Geometry/Rectangle3D.cs
@@ -15,7 +15,8 @@
 
 namespace Server
 {
-    [NoSort, PropertyObject]
+    [NoSort]
+    [PropertyObject]
     public struct Rectangle3D
     {
         private Point3D m_Start;
diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs
index 417ce769b..5bd6eb253 100644
--- a/Projects/Server/Items/Item.cs
+++ b/Projects/Server/Items/Item.cs
@@ -486,7 +486,8 @@ namespace Server
         [CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)]
         public int PileWeight => (int)Math.Ceiling(Weight * Amount);
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public virtual int Hue
         {
             get => m_Hue;
diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs
index cfa1de607..751518a26 100644
--- a/Projects/Server/Mobiles/Mobile.cs
+++ b/Projects/Server/Mobiles/Mobile.cs
@@ -1281,7 +1281,8 @@ namespace Server
 
         public virtual int Luck => 0;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public int HueMod
         {
             get => m_HueMod;
@@ -1296,7 +1297,8 @@ namespace Server
             }
         }
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public virtual int Hue
         {
             get => m_HueMod != -1 ? m_HueMod : m_Hue;
@@ -1700,18 +1702,11 @@ namespace Server
             }
         }
 
-        [Body, CommandProperty(AccessLevel.GameMaster)]
+        [Body]
+        [CommandProperty(AccessLevel.GameMaster)]
         public Body Body
         {
-            get
-            {
-                if (IsBodyMod)
-                {
-                    return m_BodyMod;
-                }
-
-                return m_Body;
-            }
+            get => IsBodyMod ? m_BodyMod : m_Body;
             set
             {
                 if (m_Body != value && !IsBodyMod)
@@ -1726,7 +1721,8 @@ namespace Server
             }
         }
 
-        [Body, CommandProperty(AccessLevel.GameMaster)]
+        [Body]
+        [CommandProperty(AccessLevel.GameMaster)]
         public int BodyValue
         {
             get => Body.BodyID;
diff --git a/Projects/UOContent/Items/Addons/AddonComponent.cs b/Projects/UOContent/Items/Addons/AddonComponent.cs
index c63154870..e7b58f8d6 100644
--- a/Projects/UOContent/Items/Addons/AddonComponent.cs
+++ b/Projects/UOContent/Items/Addons/AddonComponent.cs
@@ -110,7 +110,8 @@ namespace Server.Items
         [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
         public Point3D _offset;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
diff --git a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs
index b990c2999..7baf0bb64 100644
--- a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs
+++ b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs
@@ -25,7 +25,8 @@ namespace Server.Items
         [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
         public Point3D _offset;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
diff --git a/Projects/UOContent/Items/Addons/BaseAddon.cs b/Projects/UOContent/Items/Addons/BaseAddon.cs
index 6f328fd8b..9720deff9 100644
--- a/Projects/UOContent/Items/Addons/BaseAddon.cs
+++ b/Projects/UOContent/Items/Addons/BaseAddon.cs
@@ -42,7 +42,8 @@ namespace Server.Items
 
         public virtual bool ShareHue => true;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
diff --git a/Projects/UOContent/Items/Addons/BaseAddonContainer.cs b/Projects/UOContent/Items/Addons/BaseAddonContainer.cs
index abeb3200b..c812ac3c5 100644
--- a/Projects/UOContent/Items/Addons/BaseAddonContainer.cs
+++ b/Projects/UOContent/Items/Addons/BaseAddonContainer.cs
@@ -20,7 +20,8 @@ namespace Server.Items
 
         public override bool DisplayWeight => false;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
diff --git a/Projects/UOContent/Items/Armor/BaseArmor.cs b/Projects/UOContent/Items/Armor/BaseArmor.cs
index aa929af57..490745f21 100644
--- a/Projects/UOContent/Items/Armor/BaseArmor.cs
+++ b/Projects/UOContent/Items/Armor/BaseArmor.cs
@@ -566,7 +566,8 @@ namespace Server.Items
 
         public virtual Race RequiredRace => null;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
diff --git a/Projects/UOContent/Items/Construction/Ankhs.cs b/Projects/UOContent/Items/Construction/Ankhs.cs
index 714b84ae1..2e3202048 100644
--- a/Projects/UOContent/Items/Construction/Ankhs.cs
+++ b/Projects/UOContent/Items/Construction/Ankhs.cs
@@ -130,7 +130,8 @@ namespace Server.Items
 
         public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
@@ -221,7 +222,8 @@ namespace Server.Items
 
             public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
 
-            [Hue, CommandProperty(AccessLevel.GameMaster)]
+            [Hue]
+            [CommandProperty(AccessLevel.GameMaster)]
             public override int Hue
             {
                 get => base.Hue;
@@ -317,7 +319,8 @@ namespace Server.Items
 
         public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
@@ -410,7 +413,8 @@ namespace Server.Items
 
             public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
 
-            [Hue, CommandProperty(AccessLevel.GameMaster)]
+            [Hue]
+            [CommandProperty(AccessLevel.GameMaster)]
             public override int Hue
             {
                 get => base.Hue;
diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
index b23733a3b..417147bba 100644
--- a/Projects/UOContent/Items/Weapons/BaseWeapon.cs
+++ b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
@@ -123,7 +123,8 @@ namespace Server.Items
 
         public virtual int VirtualDamageBonus => 0;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;
diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs
index ecf8696d9..944ef0272 100644
--- a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs
+++ b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs
@@ -43,7 +43,8 @@ namespace Server.Mobiles
         public virtual bool AllowMaleRider => true;
         public virtual bool AllowFemaleRider => true;
 
-        [Hue, CommandProperty(AccessLevel.GameMaster)]
+        [Hue]
+        [CommandProperty(AccessLevel.GameMaster)]
         public override int Hue
         {
             get => base.Hue;