diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/belt/assassin.ron
index c365499f9b..e6bb45044e 100644
--- a/assets/common/items/armor/belt/assassin.ron
+++ b/assets/common/items/armor/belt/assassin.ron
@@ -3,6 +3,6 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         kind: Belt(Assassin),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/belt/cloth_blue_0.ron
index 8daff395d4..8b62419ff7 100644
--- a/assets/common/items/armor/belt/cloth_blue_0.ron
+++ b/assets/common/items/armor/belt/cloth_blue_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Belt(ClothBlue0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/belt/cloth_green_0.ron
index a43723aaf6..c3424f7817 100644
--- a/assets/common/items/armor/belt/cloth_green_0.ron
+++ b/assets/common/items/armor/belt/cloth_green_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Belt(ClothGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/belt/cloth_purple_0.ron
index 71c81db88f..5f55a20c09 100644
--- a/assets/common/items/armor/belt/cloth_purple_0.ron
+++ b/assets/common/items/armor/belt/cloth_purple_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Belt(ClothPurple0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/belt/leather_0.ron b/assets/common/items/armor/belt/leather_0.ron
index 8aa2663bee..b3cf347584 100644
--- a/assets/common/items/armor/belt/leather_0.ron
+++ b/assets/common/items/armor/belt/leather_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         kind: Belt(Leather0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/belt/plate_0.ron b/assets/common/items/armor/belt/plate_0.ron
index 7246beb7a4..2c18113d1a 100644
--- a/assets/common/items/armor/belt/plate_0.ron
+++ b/assets/common/items/armor/belt/plate_0.ron
@@ -1,8 +1,8 @@
 Item(
     name: "Iron Belt",
-   description: "WIP",
+    description: "WIP",
     kind: Armor(
         kind: Belt(Plate0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/chest/assassin.ron
index 9df179fb06..66fc865695 100644
--- a/assets/common/items/armor/chest/assassin.ron
+++ b/assets/common/items/armor/chest/assassin.ron
@@ -3,6 +3,6 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         kind: Chest(Assassin),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/chest/cloth_blue_0.ron
index 4a15fdf2dd..289bf4bdc5 100644
--- a/assets/common/items/armor/chest/cloth_blue_0.ron
+++ b/assets/common/items/armor/chest/cloth_blue_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Chest(ClothBlue0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/chest/cloth_green_0.ron
index ab0c087a54..a52fc12a19 100644
--- a/assets/common/items/armor/chest/cloth_green_0.ron
+++ b/assets/common/items/armor/chest/cloth_green_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Chest(ClothGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/chest/cloth_purple_0.ron
index 65b2c2b338..728e5f5c85 100644
--- a/assets/common/items/armor/chest/cloth_purple_0.ron
+++ b/assets/common/items/armor/chest/cloth_purple_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Chest(ClothPurple0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/chest/leather_0.ron b/assets/common/items/armor/chest/leather_0.ron
index f96d7a01ac..48408e3674 100644
--- a/assets/common/items/armor/chest/leather_0.ron
+++ b/assets/common/items/armor/chest/leather_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         kind: Chest(Leather0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/chest/plate_green_0.ron b/assets/common/items/armor/chest/plate_green_0.ron
index a4d9916e63..92bb5fb664 100644
--- a/assets/common/items/armor/chest/plate_green_0.ron
+++ b/assets/common/items/armor/chest/plate_green_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "Arrows to the stomach are soooo last update.",
     kind: Armor(
         kind: Chest(PlateGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/foot/assassin.ron
index 58c2d0d824..13b587a306 100644
--- a/assets/common/items/armor/foot/assassin.ron
+++ b/assets/common/items/armor/foot/assassin.ron
@@ -3,6 +3,6 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         kind: Foot(Assassin),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/foot/cloth_blue_0.ron
index 5db06d6094..31b70750f9 100644
--- a/assets/common/items/armor/foot/cloth_blue_0.ron
+++ b/assets/common/items/armor/foot/cloth_blue_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Foot(ClothBlue0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/foot/cloth_green_0.ron
index 55c4f16a99..117b19aad9 100644
--- a/assets/common/items/armor/foot/cloth_green_0.ron
+++ b/assets/common/items/armor/foot/cloth_green_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Foot(ClothGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/foot/cloth_purple_0.ron
index a94dbd78ae..a80c44de89 100644
--- a/assets/common/items/armor/foot/cloth_purple_0.ron
+++ b/assets/common/items/armor/foot/cloth_purple_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "Soft and warm",
     kind: Armor(
         kind: Foot(ClothPurple0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/foot/leather_0.ron b/assets/common/items/armor/foot/leather_0.ron
index 051aa7f6fc..6ca6a07fc7 100644
--- a/assets/common/items/armor/foot/leather_0.ron
+++ b/assets/common/items/armor/foot/leather_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         kind: Foot(Leather0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/foot/plate_0.ron b/assets/common/items/armor/foot/plate_0.ron
index f4f221147f..12f95dcd4e 100644
--- a/assets/common/items/armor/foot/plate_0.ron
+++ b/assets/common/items/armor/foot/plate_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "WIP",
     kind: Armor(
         kind: Foot(Plate0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/hand/assassin.ron
index 1f80cc4ebc..19a09a3177 100644
--- a/assets/common/items/armor/hand/assassin.ron
+++ b/assets/common/items/armor/hand/assassin.ron
@@ -3,6 +3,6 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         kind: Hand(Assassin),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/hand/cloth_blue_0.ron
index eb759506c4..88496cbce3 100644
--- a/assets/common/items/armor/hand/cloth_blue_0.ron
+++ b/assets/common/items/armor/hand/cloth_blue_0.ron
@@ -1,8 +1,8 @@
 Item(
     name: "Blue Linen Wrists",
-   description: "WIP",
+    description: "WIP",
     kind: Armor(
         kind: Hand(ClothBlue0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/hand/cloth_green_0.ron
index 486e106b56..a3452335c4 100644
--- a/assets/common/items/armor/hand/cloth_green_0.ron
+++ b/assets/common/items/armor/hand/cloth_green_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Hand(ClothGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/hand/cloth_purple_0.ron
index 57dbe378d0..840694163c 100644
--- a/assets/common/items/armor/hand/cloth_purple_0.ron
+++ b/assets/common/items/armor/hand/cloth_purple_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Hand(ClothPurple0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/hand/leather_0.ron b/assets/common/items/armor/hand/leather_0.ron
index 8efe8a59f2..e4b62e3a72 100644
--- a/assets/common/items/armor/hand/leather_0.ron
+++ b/assets/common/items/armor/hand/leather_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         kind: Hand(Leather0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/hand/plate_0.ron b/assets/common/items/armor/hand/plate_0.ron
index 8e27eee491..1fdbb6d6da 100644
--- a/assets/common/items/armor/hand/plate_0.ron
+++ b/assets/common/items/armor/hand/plate_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "WIP",
     kind: Armor(
         kind: Hand(Plate0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/pants/assassin.ron
index 0d71d8548f..b5bb2c28ab 100644
--- a/assets/common/items/armor/pants/assassin.ron
+++ b/assets/common/items/armor/pants/assassin.ron
@@ -3,6 +3,6 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         kind: Pants(Assassin),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/pants/cloth_blue_0.ron
index b8642e11d9..9ef245a09a 100644
--- a/assets/common/items/armor/pants/cloth_blue_0.ron
+++ b/assets/common/items/armor/pants/cloth_blue_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Pants(ClothBlue0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/pants/cloth_green_0.ron
index bbb60b2220..3782ac2617 100644
--- a/assets/common/items/armor/pants/cloth_green_0.ron
+++ b/assets/common/items/armor/pants/cloth_green_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Pants(ClothGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/pants/cloth_purple_0.ron
index d1b73cb4b0..770961a1fe 100644
--- a/assets/common/items/armor/pants/cloth_purple_0.ron
+++ b/assets/common/items/armor/pants/cloth_purple_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Pants(ClothPurple0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/pants/green_0.ron b/assets/common/items/armor/pants/green_0.ron
index 0ef1d3339c..5fee632d92 100644
--- a/assets/common/items/armor/pants/green_0.ron
+++ b/assets/common/items/armor/pants/green_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "",
     kind: Armor(
         kind: Pants(Green),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/pants/leather_0.ron b/assets/common/items/armor/pants/leather_0.ron
index 301505818b..507ab116c0 100644
--- a/assets/common/items/armor/pants/leather_0.ron
+++ b/assets/common/items/armor/pants/leather_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "",
     kind: Armor(
         kind: Pants(Leather0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/pants/plate_green_0.ron b/assets/common/items/armor/pants/plate_green_0.ron
index 131d87be51..51c3620338 100644
--- a/assets/common/items/armor/pants/plate_green_0.ron
+++ b/assets/common/items/armor/pants/plate_green_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "WIP",
     kind: Armor(
         kind: Pants(PlateGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/shoulder/assassin.ron
index 819538cc5e..ea92efbec5 100644
--- a/assets/common/items/armor/shoulder/assassin.ron
+++ b/assets/common/items/armor/shoulder/assassin.ron
@@ -3,6 +3,6 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         kind: Shoulder(Assassin),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/shoulder/cloth_blue_0.ron
index 70bfcf1bb3..2ec65be894 100644
--- a/assets/common/items/armor/shoulder/cloth_blue_0.ron
+++ b/assets/common/items/armor/shoulder/cloth_blue_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Shoulder(ClothBlue0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/shoulder/cloth_green_0.ron
index 79ff879ecc..539b3a7063 100644
--- a/assets/common/items/armor/shoulder/cloth_green_0.ron
+++ b/assets/common/items/armor/shoulder/cloth_green_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Shoulder(ClothGreen0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/shoulder/cloth_purple_0.ron
index 130a52c5ab..308759e2b8 100644
--- a/assets/common/items/armor/shoulder/cloth_purple_0.ron
+++ b/assets/common/items/armor/shoulder/cloth_purple_0.ron
@@ -3,6 +3,6 @@ Item(
    description: "WIP",
     kind: Armor(
         kind: Shoulder(ClothPurple0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/shoulder/leather_0.ron b/assets/common/items/armor/shoulder/leather_0.ron
index 351beaff2a..a145debbeb 100644
--- a/assets/common/items/armor/shoulder/leather_0.ron
+++ b/assets/common/items/armor/shoulder/leather_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "",
     kind: Armor(
         kind: Shoulder(Leather0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/shoulder/leather_1.ron b/assets/common/items/armor/shoulder/leather_1.ron
index 990c15e135..ce066e63a0 100644
--- a/assets/common/items/armor/shoulder/leather_1.ron
+++ b/assets/common/items/armor/shoulder/leather_1.ron
@@ -3,6 +3,6 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         kind: Shoulder(Leather1),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/armor/shoulder/plate_0.ron b/assets/common/items/armor/shoulder/plate_0.ron
index 37bde3183d..3323278ecb 100644
--- a/assets/common/items/armor/shoulder/plate_0.ron
+++ b/assets/common/items/armor/shoulder/plate_0.ron
@@ -3,6 +3,6 @@ Item(
     description: "A strong shoulder to lean on.",
     kind: Armor(
         kind: Shoulder(Plate0),
-        stats: 20,
+        stats: (20),
     ),
 )
diff --git a/assets/common/items/weapons/hammer_1.ron b/assets/common/items/weapons/hammer_1.ron
index 3907ed9aff..12573ab023 100644
--- a/assets/common/items/weapons/hammer_1.ron
+++ b/assets/common/items/weapons/hammer_1.ron
@@ -4,7 +4,7 @@ Item(
     \n
     Power: 20",
     kind: Tool(
-        ToolData (
+        (
             kind: Hammer(BasicHammer),    
             equip_time_millis: 500,
         )
diff --git a/assets/common/items/weapons/shield_1.ron b/assets/common/items/weapons/shield_1.ron
index 8ad6d4f71b..83a4157942 100644
--- a/assets/common/items/weapons/shield_1.ron
+++ b/assets/common/items/weapons/shield_1.ron
@@ -2,7 +2,7 @@ Item(
     name: "A Shield",
     description: "Legends tell this item is useless.",
     kind: Tool (
-        ToolData (
+        (
             kind: Shield(BasicShield),
             equip_time_millis: 400,
         )
diff --git a/assets/common/items/weapons/short_sword_0.ron b/assets/common/items/weapons/short_sword_0.ron
index 1c8c91d308..f6ac3ffa0e 100644
--- a/assets/common/items/weapons/short_sword_0.ron
+++ b/assets/common/items/weapons/short_sword_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "    
     Power: 15",
     kind: Tool(
-        ToolData (
+        (
             kind: Sword(Short0),    
             equip_time_millis: 400,
         )
diff --git a/assets/common/items/weapons/staff_1.ron b/assets/common/items/weapons/staff_1.ron
index 0287853a69..220497d481 100644
--- a/assets/common/items/weapons/staff_1.ron
+++ b/assets/common/items/weapons/staff_1.ron
@@ -4,7 +4,7 @@ Item(
     
     Power: 6",
     kind: Tool(
-        ToolData (
+        (
             kind: Staff(BasicStaff),    
             equip_time_millis: 200,
         )
diff --git a/assets/common/items/weapons/staff_nature.ron b/assets/common/items/weapons/staff_nature.ron
index b9065cad11..d4c76c6b3a 100644
--- a/assets/common/items/weapons/staff_nature.ron
+++ b/assets/common/items/weapons/staff_nature.ron
@@ -3,7 +3,7 @@ Item(
     description: " Infused by the power of Nature.   
     Power: 25",
     kind: Tool(
-        ToolData (
+        (
             kind: Staff(Sceptre),    
             equip_time_millis: 400,
         )
diff --git a/assets/common/items/weapons/starter_axe.ron b/assets/common/items/weapons/starter_axe.ron
index 61d546fe80..9c82e4901f 100644
--- a/assets/common/items/weapons/starter_axe.ron
+++ b/assets/common/items/weapons/starter_axe.ron
@@ -4,7 +4,7 @@ Item(
     
     Power: 15",
     kind: Tool(
-        ToolData (
+        (
             kind: Axe(BasicAxe),    
             equip_time_millis: 400,
         )
diff --git a/assets/common/items/weapons/starter_bow.ron b/assets/common/items/weapons/starter_bow.ron
index 735de375fb..fb88134255 100644
--- a/assets/common/items/weapons/starter_bow.ron
+++ b/assets/common/items/weapons/starter_bow.ron
@@ -4,7 +4,7 @@ Item(
     
     Power: 15",
     kind: Tool(
-        ToolData (
+        (
             kind: Bow(BasicBow),    
             equip_time_millis: 400,
         )
diff --git a/assets/common/items/weapons/starter_dagger.ron b/assets/common/items/weapons/starter_dagger.ron
index 0a74a79c67..6be38613bd 100644
--- a/assets/common/items/weapons/starter_dagger.ron
+++ b/assets/common/items/weapons/starter_dagger.ron
@@ -4,7 +4,7 @@ Item(
     
     Power: 15",
     kind: Tool(
-        ToolData (
+        (
             kind: Dagger(BasicDagger),    
             equip_time_millis: 300,
         )
diff --git a/assets/common/items/weapons/starter_hammer.ron b/assets/common/items/weapons/starter_hammer.ron
index 9d7e38f115..feb59a5da1 100644
--- a/assets/common/items/weapons/starter_hammer.ron
+++ b/assets/common/items/weapons/starter_hammer.ron
@@ -4,7 +4,7 @@ Item(
     
     Power: 15",
     kind: Tool(
-        ToolData (
+        (
             kind: Hammer(BasicHammer),    
             equip_time_millis: 500,
         )
diff --git a/assets/common/items/weapons/starter_staff.ron b/assets/common/items/weapons/starter_staff.ron
index ae6de21968..9f19fe2000 100644
--- a/assets/common/items/weapons/starter_staff.ron
+++ b/assets/common/items/weapons/starter_staff.ron
@@ -4,7 +4,7 @@ Item(
     
     Power: 20",
     kind: Tool(
-        ToolData (
+        (
             kind: Staff(BasicStaff),    
             equip_time_millis: 300,
         )
diff --git a/assets/common/items/weapons/starter_sword.ron b/assets/common/items/weapons/starter_sword.ron
index 9b0eaae181..4dab78f166 100644
--- a/assets/common/items/weapons/starter_sword.ron
+++ b/assets/common/items/weapons/starter_sword.ron
@@ -4,7 +4,7 @@ Item(
     
     Power: 15",
     kind: Tool(
-        ToolData (
+        (
             kind: Sword(BasicSword),    
             equip_time_millis: 300,
         )
diff --git a/assets/common/items/weapons/wood_sword.ron b/assets/common/items/weapons/wood_sword.ron
index ce1189d866..a766b88c19 100644
--- a/assets/common/items/weapons/wood_sword.ron
+++ b/assets/common/items/weapons/wood_sword.ron
@@ -3,7 +3,7 @@ Item(
     description: "    
     Power: 15",
     kind: Tool(
-        ToolData (
+        (
             kind: Sword(WoodTraining),    
             equip_time_millis: 400,
         )
diff --git a/assets/common/items/weapons/zweihander_sword_0.ron b/assets/common/items/weapons/zweihander_sword_0.ron
index be64c6f17b..32f8e9ca1e 100644
--- a/assets/common/items/weapons/zweihander_sword_0.ron
+++ b/assets/common/items/weapons/zweihander_sword_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "    
     Power: 15",
     kind: Tool(
-        ToolData (
+       (
             kind: Sword(Zweihander0),    
             equip_time_millis: 500,
         )
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index 24fbedd44c..10fd3396d4 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -1,51 +1,52 @@
-({
-    None:(
+((
+    default:(
         vox_spec: ("armor.belt.belt_none", (-5.0, -3.5, 2.0)),
         color: None
     ),
-    Dark:(
-        vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
-        color: None
-    ),
-    TurqCloth:(
-        vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)),
-        color: None
-    ),
-     BloodCloth:(
-        vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)),
-        color: Some((29, 26, 33))
-    ),
-    BlackCloth:(
-        vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)),
-        color: Some((29, 26, 33))
-    ),
-    Assassin:(
-        vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)),
-        color: None
-    ),
-    Dark:(
-        vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
-        color: None
-    ),
-    Plate0:(
-        vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)),
-        color: None
-    ),
-    Leather0:(
-        vox_spec: ("armor.belt.leather-0", (-5.0, -3.5, 2.0)),
-        color: None
-    ),
-    ClothPurple0:(
-        vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)),
-        color: None
-    ),
-    ClothBlue0:(
-        vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)),
-        color: None
-    ),
-    ClothGreen0:(
-        vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)),
-        color: None
-    ),
-
-})
+    map: {
+        Dark:(
+            vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
+            color: None
+        ),
+        TurqCloth:(
+            vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)),
+            color: None
+        ),
+         BloodCloth:(
+            vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)),
+            color: Some((29, 26, 33))
+        ),
+        BlackCloth:(
+            vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)),
+            color: Some((29, 26, 33))
+        ),
+        Assassin:(
+            vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)),
+            color: None
+        ),
+        Dark:(
+            vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
+            color: None
+        ),
+        Plate0:(
+            vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)),
+            color: None
+        ),
+        Leather0:(
+            vox_spec: ("armor.belt.leather-0", (-5.0, -3.5, 2.0)),
+            color: None
+        ),
+        ClothPurple0:(
+            vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)),
+            color: None
+        ),
+        ClothBlue0:(
+            vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)),
+            color: None
+        ),
+        ClothGreen0:(
+            vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)),
+            color: None
+        ),
+    },
+))
diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
index c053c04cbd..a311ef9ae7 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -1,59 +1,60 @@
-({
-    None: (
+((
+    default: (
         vox_spec: ("armor.chest.chest_none", (-7.0, -3.5, 2.0)),
         color: None
     ),
-    Blue: (
-        vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
-        color: Some((44, 74, 109))
-    ),
-    Brown: (
-        vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
-        color: Some((90, 49, 43))
-    ),
-    Dark: (
-        vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
-        color: Some((73, 63, 59))
-    ),
-    Green: (
-        vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
-        color: Some((59, 95, 67))
-    ),
-    Orange: (
-        vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
-        color: Some((109, 58, 58))
-    ),
-    Midnight: (
-        vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
-        color: Some((29, 26, 33))
-    ),
-    Assassin: (
-        vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)),
-        color: None
-    ),
-    Kimono: (
-        vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
-        color: None
-    ),
-    PlateGreen0: (
-        vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)),
-        color: None
-    ),
-    Leather0: (
-        vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
-        color: None
-    ),
-    ClothPurple0:(
-        vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
-        color: None
-    ),
-    ClothBlue0:(
-        vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)),
-        color: None
-    ),
-   ClothGreen0:(
-        vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)),
-        color: None
-    ),
-
-})
+    map: {
+        Blue: (
+            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            color: Some((44, 74, 109))
+        ),
+        Brown: (
+            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            color: Some((90, 49, 43))
+        ),
+        Dark: (
+            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            color: Some((73, 63, 59))
+        ),
+        Green: (
+            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            color: Some((59, 95, 67))
+        ),
+        Orange: (
+            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            color: Some((109, 58, 58))
+        ),
+        Midnight: (
+            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            color: Some((29, 26, 33))
+        ),
+        Assassin: (
+            vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)),
+            color: None
+        ),
+        Kimono: (
+            vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
+            color: None
+        ),
+        PlateGreen0: (
+            vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)),
+            color: None
+        ),
+        Leather0: (
+            vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
+            color: None
+        ),
+        ClothPurple0:(
+            vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
+            color: None
+        ),
+        ClothBlue0:(
+            vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)),
+            color: None
+        ),
+       ClothGreen0:(
+            vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)),
+            color: None
+        ),
+    },
+))
diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
index 868541dc78..99f2e8580e 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -1,42 +1,44 @@
-({    
-    Bare: (
+((    
+    default: (
         vox_spec: ("armor.foot.foot_none", (-2.5, -3.5, -9.0)),
         color: None
     ),
-    Dark: (
-        vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -9.0)),
-        color: None
-    ),
-    Assassin: (
-        vox_spec: ("armor.foot.assa", (-2.5, -3.5, -9.0)),
-        color: None
-    ),
-    Sandal: (
-        vox_spec: ("armor.foot.cloth_sandals", (-2.5, -2.5, -9.0)),
-        color: None
-    ),
-    Jester: (
-        vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -9.0)),
-        color: None
-    ),
-    Plate0: (
-        vox_spec: ("armor.foot.plate-0", (-2.5, -3.5, -9.0)),
-        color: None
-    ),
-    Leather0: (
-        vox_spec: ("armor.foot.leather-0", (-2.5, -3.5, -9.0)),
-        color: None
-    ),
-    ClothPurple0:(
-        vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -9.0)),
-        color: None
-    ),
-    ClothBlue0:(
-        vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -9.0)),
-        color: None
-    ),
-    ClothGreen0:(
-        vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -9.0)),
-        color: None
-    ),
-})
+    map: {
+        Dark: (
+            vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -9.0)),
+            color: None
+        ),
+        Assassin: (
+            vox_spec: ("armor.foot.assa", (-2.5, -3.5, -9.0)),
+            color: None
+        ),
+        Sandal: (
+            vox_spec: ("armor.foot.cloth_sandals", (-2.5, -2.5, -9.0)),
+            color: None
+        ),
+        Jester: (
+            vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -9.0)),
+            color: None
+        ),
+        Plate0: (
+            vox_spec: ("armor.foot.plate-0", (-2.5, -3.5, -9.0)),
+            color: None
+        ),
+        Leather0: (
+            vox_spec: ("armor.foot.leather-0", (-2.5, -3.5, -9.0)),
+            color: None
+        ),
+        ClothPurple0:(
+            vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -9.0)),
+            color: None
+        ),
+        ClothBlue0:(
+            vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -9.0)),
+            color: None
+        ),
+        ClothGreen0:(
+            vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -9.0)),
+            color: None
+        ),
+    },
+))
diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
index 151a85f9a9..bb6f5fcb47 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -1,5 +1,5 @@
-({
-    Bare: (
+((
+    default: (
         left: (
             vox_spec: ("armor.hand.hand_right_none", (-1.5, -1.5, -7.0)),
             color: None
@@ -9,74 +9,76 @@
             color: None
         )
     ),
-    Assassin: (
-        left: (
-            vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)),
-            color: None
+    map: {
+        Assassin: (
+            left: (
+                vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)),
-            color: None
-        )
-    ),
-    Cloth: (
-        left: (
-            vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)),
-            color: None
+        Cloth: (
+            left: (
+                vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)),
-            color: None
-        )
-    ),
-    Plate0: (
-        left: (
-            vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)),
-            color: None
+        Plate0: (
+            left: (
+                vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)),
-            color: None
-        )
-    ),
-    Leather0: (
-        left: (
-            vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)),
-            color: None
+        Leather0: (
+            left: (
+                vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)),
-            color: None
-        )
-    ),
-    ClothPurple0: (
-        left: (
-            vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)),
-            color: None
+        ClothPurple0: (
+            left: (
+                vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)),
-            color: None
-        )
-    ),
-    ClothBlue0: (
-        left: (
-            vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)),
-            color: None
+        ClothBlue0: (
+            left: (
+                vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)),
-            color: None
-        )
-    ),
-    ClothGreen0: (
-        left: (
-            vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)),
-            color: None
+        ClothGreen0: (
+            left: (
+                vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)),
-            color: None
-        )
-    ),
-})
+    },
+))
diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
index 56ae5d0c2d..8d04e54fa2 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -1,54 +1,56 @@
-({
-    None: (
+((
+    default: (
         vox_spec: ("armor.pants.pants_none", (-5.0, -3.5, 1.0)),
         color: Some((28, 66, 109))
     ),
-    Blue: (
-        vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
-        color: Some((28, 66, 109))
-    ),
-    Brown: (
-        vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
-        color: Some((54, 30, 26))
-    ),
-    Dark: (
-        vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
-        color: Some((24, 19, 17))
-    ),
-    Green: (
-        vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
-        color: Some((49, 95, 59))
-    ),
-    Orange: (
-        vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
-        color: Some((148, 52, 33))
-    ),
-    Assassin: (
-        vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)),
-        color: None
-    ),
-    Kimono: (
-        vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
-        color: None
-    ),    
-    PlateGreen0: (
-        vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
-        color: None
-    ),
-    Leather0: (
-        vox_spec: ("armor.pants.leather-0", (-5.0, -3.5, 1.0)),
-        color: None
-    ),
-    ClothPurple0:(
-        vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)),
-        color: None
-    ),
-    ClothBlue0:(
-        vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)),
-        color: None
-    ),
-    ClothGreen0:(
-        vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)),
-        color: None
-    ),
-})
+    map: {
+        Blue: (
+            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            color: Some((28, 66, 109))
+        ),
+        Brown: (
+            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            color: Some((54, 30, 26))
+        ),
+        Dark: (
+            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            color: Some((24, 19, 17))
+        ),
+        Green: (
+            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            color: Some((49, 95, 59))
+        ),
+        Orange: (
+            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            color: Some((148, 52, 33))
+        ),
+        Assassin: (
+            vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)),
+            color: None
+        ),
+        Kimono: (
+            vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
+            color: None
+        ),    
+        PlateGreen0: (
+            vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
+            color: None
+        ),
+        Leather0: (
+            vox_spec: ("armor.pants.leather-0", (-5.0, -3.5, 1.0)),
+            color: None
+        ),
+        ClothPurple0:(
+            vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)),
+            color: None
+        ),
+        ClothBlue0:(
+            vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)),
+            color: None
+        ),
+        ClothGreen0:(
+            vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)),
+            color: None
+        ),
+    },
+))
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index 8b06beeeea..9789b7292b 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -1,6 +1,6 @@
-({
+((
     //This shouldn't be the none option, but what is?
-    None: (
+    default: (
         left: (
             vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
             color: None
@@ -10,104 +10,106 @@
             color: None
         )
     ),
-    Brown1: (
-        left: (
-            vox_spec: ("armor.shoulder.brown_right", (-3.0, -3.5, 1.0)),
-            color: None
+    map: {
+        Brown1: (
+            left: (
+                vox_spec: ("armor.shoulder.brown_right", (-3.0, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 1.0)),
-            color: None
-        )
-    ),
-    Assassin: (
-        left: (
-            vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
-            color: None
+        Assassin: (
+            left: (
+                vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
-            color: None
-        )
-    ),
-    Assassin: (
-        left: (
-            vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
-            color: None
+        Assassin: (
+            left: (
+                vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
-            color: None
-        )
-    ),
-    Chain: (
-        left: (
-            vox_spec: ("armor.shoulder.chain_right-1", (-4.0, -3.5, 1.0)),
-            color: None
+        Chain: (
+            left: (
+                vox_spec: ("armor.shoulder.chain_right-1", (-4.0, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 1.0)),
-            color: None
-        )
-    ),
-    Plate0: (
-        left: (
-            vox_spec: ("armor.shoulder.plate_right-0", (-3.6, -3.5, 1.0)),
-            color: None
+        Plate0: (
+            left: (
+                vox_spec: ("armor.shoulder.plate_right-0", (-3.6, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.plate_right-0", (-2.6, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.plate_right-0", (-2.6, -3.5, 1.0)),
-            color: None
-        )
-    ),
-    Leather0: (
-        left: (
-            vox_spec: ("armor.shoulder.leather_right-0", (-3.2, -3.5, 1.0)),
-            color: None
+        Leather0: (
+            left: (
+                vox_spec: ("armor.shoulder.leather_right-0", (-3.2, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.leather_right-0", (-1.8, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.leather_right-0", (-1.8, -3.5, 1.0)),
-            color: None
-        )
-    ),
-	 Leather1: (
-        left: (
-            vox_spec: ("armor.shoulder.leather_right-1", (-3.6, -4.5, 1.0)),
-            color: None
+         Leather1: (
+            left: (
+                vox_spec: ("armor.shoulder.leather_right-1", (-3.6, -4.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.leather_right-1", (-2.6, -4.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.leather_right-1", (-2.6, -4.5, 1.0)),
-            color: None
-        )
-    ),
-    ClothPurple0: (
-        left: (
-            vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 1.0)),
-            color: None
+        ClothPurple0: (
+            left: (
+                vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.cloth_purple_right-0", (-1.8, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.cloth_purple_right-0", (-1.8, -3.5, 1.0)),
-            color: None
-        )
-    ),
-    ClothBlue0: (
-        left: (
-            vox_spec: ("armor.shoulder.cloth_blue_left-0", (-3.2, -3.5, 1.0)),
-            color: None
+        ClothBlue0: (
+            left: (
+                vox_spec: ("armor.shoulder.cloth_blue_left-0", (-3.2, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.cloth_blue_right-0", (-1.8, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.cloth_blue_right-0", (-1.8, -3.5, 1.0)),
-            color: None
-        )
-    ),
-    ClothGreen0: (
-        left: (
-            vox_spec: ("armor.shoulder.cloth_green_left-0", (-3.2, -3.5, 1.0)),
-            color: None
+        ClothGreen0: (
+            left: (
+                vox_spec: ("armor.shoulder.cloth_green_left-0", (-3.2, -3.5, 1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.cloth_green_right-0", (-1.8, -3.5, 1.0)),
+                color: None
+            )
         ),
-        right: (
-            vox_spec: ("armor.shoulder.cloth_green_right-0", (-1.8, -3.5, 1.0)),
-            color: None
-        )
-    ),
-})
+    },
+))
diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs
index aba5645d3c..88cd537203 100644
--- a/common/src/comp/inventory/item/armor.rs
+++ b/common/src/comp/inventory/item/armor.rs
@@ -1,7 +1,6 @@
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Chest {
-    None = 0,
     Blue = 1,
     Brown = 2,
     Dark = 3,
@@ -16,8 +15,7 @@ pub enum Chest {
     ClothBlue0 = 12,
     ClothGreen0 = 13,
 }
-pub const ALL_CHESTS: [Chest; 14] = [
-    Chest::None,
+pub const ALL_CHESTS: [Chest; 13] = [
     Chest::Blue,
     Chest::Brown,
     Chest::Dark,
@@ -98,7 +96,6 @@ pub const ALL_PANTS: [Pants; 13] = [
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Hand {
-    Bare = 0,
     Cloth = 1,
     Assassin = 2,
     Plate0 = 3,
@@ -107,8 +104,7 @@ pub enum Hand {
     ClothBlue0 = 6,
     ClothGreen0 = 7,
 }
-pub const ALL_HANDS: [Hand; 8] = [
-    Hand::Bare,
+pub const ALL_HANDS: [Hand; 7] = [
     Hand::Cloth,
     Hand::Assassin,
     Hand::Plate0,
@@ -121,7 +117,6 @@ pub const ALL_HANDS: [Hand; 8] = [
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Foot {
-    Bare = 0,
     Dark = 1,
     Sandal = 2,
     Jester = 3,
@@ -132,8 +127,7 @@ pub enum Foot {
     ClothBlue0 = 8,
     ClothGreen0 = 9,
 }
-pub const ALL_FEET: [Foot; 10] = [
-    Foot::Bare,
+pub const ALL_FEET: [Foot; 9] = [
     Foot::Dark,
     Foot::Sandal,
     Foot::Jester,
@@ -148,7 +142,6 @@ pub const ALL_FEET: [Foot; 10] = [
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Shoulder {
-    None = 0,
     Brown1 = 1,
     Chain = 2,
     Assassin = 3,
@@ -159,8 +152,7 @@ pub enum Shoulder {
     ClothBlue0 = 8,
     ClothGreen0 = 9,
 }
-pub const ALL_SHOULDERS: [Shoulder; 10] = [
-    Shoulder::None,
+pub const ALL_SHOULDERS: [Shoulder; 9] = [
     Shoulder::Brown1,
     Shoulder::Chain,
     Shoulder::Assassin,
diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs
index f2a948c4b1..31457d3fcd 100644
--- a/voxygen/src/scene/figure/load.rs
+++ b/voxygen/src/scene/figure/load.rs
@@ -234,19 +234,26 @@ impl HumHeadSpec {
 // Armor spects should be in the same order, top to bottom.
 // These seem overly split up, but wanted to keep the armor seperated
 // unlike head which is done above.
-
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorShoulderSpec(HashMap<Shoulder, SidedArmorVoxSpec>);
+pub struct ArmorVoxSpecMap<K, S>
+where
+    K: std::hash::Hash + std::cmp::Eq,
+{
+    default: S,
+    map: HashMap<K, S>,
+}
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorChestSpec(HashMap<Chest, ArmorVoxSpec>);
+pub struct HumArmorShoulderSpec(ArmorVoxSpecMap<Shoulder, SidedArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorHandSpec(HashMap<Hand, SidedArmorVoxSpec>);
+pub struct HumArmorChestSpec(ArmorVoxSpecMap<Chest, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorBeltSpec(HashMap<Belt, ArmorVoxSpec>);
+pub struct HumArmorHandSpec(ArmorVoxSpecMap<Hand, SidedArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorPantsSpec(HashMap<Pants, ArmorVoxSpec>);
+pub struct HumArmorBeltSpec(ArmorVoxSpecMap<Belt, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorFootSpec(HashMap<Foot, ArmorVoxSpec>);
+pub struct HumArmorPantsSpec(ArmorVoxSpecMap<Pants, ArmorVoxSpec>);
+#[derive(Serialize, Deserialize)]
+pub struct HumArmorFootSpec(ArmorVoxSpecMap<Foot, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
 pub struct HumMainWeaponSpec(HashMap<ToolKind, ArmorVoxSpec>);
 
@@ -307,22 +314,20 @@ impl HumArmorShoulderSpec {
     }
 
     fn mesh_shoulder(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> {
-        let shoulder = if let Some(ItemKind::Armor {
+        let spec = if let Some(ItemKind::Armor {
             kind: Armor::Shoulder(shoulder),
             ..
         }) = loadout.shoulder.as_ref().map(|i| &i.kind)
         {
-            shoulder
+            match self.0.map.get(&shoulder) {
+                Some(spec) => spec,
+                None => {
+                    error!("No shoulder specification exists for {:?}", shoulder);
+                    return load_mesh("not_found", Vec3::new(-3.0, -3.5, 0.1));
+                },
+            }
         } else {
-            &Shoulder::None
-        };
-
-        let spec = match self.0.get(&shoulder) {
-            Some(spec) => spec,
-            None => {
-                error!("No shoulder specification exists for {:?}", shoulder);
-                return load_mesh("not_found", Vec3::new(-3.0, -3.5, 0.1));
-            },
+            &self.0.default
         };
 
         let shoulder_segment = color_segment(
@@ -366,22 +371,20 @@ impl HumArmorChestSpec {
     }
 
     pub fn mesh_chest(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> {
-        let chest = if let Some(ItemKind::Armor {
+        let spec = if let Some(ItemKind::Armor {
             kind: Armor::Chest(chest),
             ..
         }) = loadout.chest.as_ref().map(|i| &i.kind)
         {
-            chest
+            match self.0.map.get(&chest) {
+                Some(spec) => spec,
+                None => {
+                    error!("No chest specification exists for {:?}", loadout.chest);
+                    return load_mesh("not_found", Vec3::new(-7.0, -3.5, 2.0));
+                },
+            }
         } else {
-            &Chest::None
-        };
-
-        let spec = match self.0.get(&chest) {
-            Some(spec) => spec,
-            None => {
-                error!("No chest specification exists for {:?}", loadout.chest);
-                return load_mesh("not_found", Vec3::new(-7.0, -3.5, 2.0));
-            },
+            &self.0.default
         };
 
         let color = |mat_segment| {
@@ -419,22 +422,20 @@ impl HumArmorHandSpec {
     }
 
     fn mesh_hand(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> {
-        let hand = if let Some(ItemKind::Armor {
+        let spec = if let Some(ItemKind::Armor {
             kind: Armor::Hand(hand),
             ..
         }) = loadout.hand.as_ref().map(|i| &i.kind)
         {
-            hand
+            match self.0.map.get(&hand) {
+                Some(spec) => spec,
+                None => {
+                    error!("No hand specification exists for {:?}", hand);
+                    return load_mesh("not_found", Vec3::new(-1.5, -1.5, -7.0));
+                },
+            }
         } else {
-            &Hand::Bare
-        };
-
-        let spec = match self.0.get(&hand) {
-            Some(spec) => spec,
-            None => {
-                error!("No hand specification exists for {:?}", hand);
-                return load_mesh("not_found", Vec3::new(-1.5, -1.5, -7.0));
-            },
+            &self.0.default
         };
 
         let hand_segment = color_segment(
@@ -473,22 +474,20 @@ impl HumArmorBeltSpec {
     }
 
     pub fn mesh_belt(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> {
-        let belt = if let Some(ItemKind::Armor {
+        let spec = if let Some(ItemKind::Armor {
             kind: Armor::Belt(belt),
             ..
         }) = loadout.belt.as_ref().map(|i| &i.kind)
         {
-            belt
+            match self.0.map.get(&belt) {
+                Some(spec) => spec,
+                None => {
+                    error!("No belt specification exists for {:?}", belt);
+                    return load_mesh("not_found", Vec3::new(-4.0, -3.5, 2.0));
+                },
+            }
         } else {
-            &Belt::None
-        };
-
-        let spec = match self.0.get(&belt) {
-            Some(spec) => spec,
-            None => {
-                error!("No belt specification exists for {:?}", belt);
-                return load_mesh("not_found", Vec3::new(-4.0, -3.5, 2.0));
-            },
+            &self.0.default
         };
 
         let belt_segment = color_segment(
@@ -509,22 +508,20 @@ impl HumArmorPantsSpec {
     }
 
     pub fn mesh_pants(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> {
-        let pants = if let Some(ItemKind::Armor {
+        let spec = if let Some(ItemKind::Armor {
             kind: Armor::Pants(pants),
             ..
         }) = loadout.pants.as_ref().map(|i| &i.kind)
         {
-            pants
+            match self.0.map.get(&pants) {
+                Some(spec) => spec,
+                None => {
+                    error!("No pants specification exists for {:?}", pants);
+                    return load_mesh("not_found", Vec3::new(-5.0, -3.5, 1.0));
+                },
+            }
         } else {
-            &Pants::None
-        };
-
-        let spec = match self.0.get(&pants) {
-            Some(spec) => spec,
-            None => {
-                error!("No pants specification exists for {:?}", pants);
-                return load_mesh("not_found", Vec3::new(-5.0, -3.5, 1.0));
-            },
+            &self.0.default
         };
 
         let color = |mat_segment| {
@@ -562,22 +559,20 @@ impl HumArmorFootSpec {
     }
 
     fn mesh_foot(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> {
-        let foot = if let Some(ItemKind::Armor {
+        let spec = if let Some(ItemKind::Armor {
             kind: Armor::Foot(foot),
             ..
         }) = loadout.foot.as_ref().map(|i| &i.kind)
         {
-            foot
+            match self.0.map.get(&foot) {
+                Some(spec) => spec,
+                None => {
+                    error!("No foot specification exists for {:?}", foot);
+                    return load_mesh("not_found", Vec3::new(-2.5, -3.5, -9.0));
+                },
+            }
         } else {
-            &Foot::Bare
-        };
-
-        let spec = match self.0.get(&foot) {
-            Some(spec) => spec,
-            None => {
-                error!("No foot specification exists for {:?}", foot);
-                return load_mesh("not_found", Vec3::new(-2.5, -3.5, -9.0));
-            },
+            &self.0.default
         };
 
         let foot_segment = color_segment(