From 3e9cfa45bbfa8d0d75c209a49157142210c26334 Mon Sep 17 00:00:00 2001
From: w3yden <Stans-Tec@outlook.com>
Date: Wed, 29 Jul 2020 15:21:12 +0200
Subject: [PATCH 1/3] Voxygen/HUD: Display item name over dropped items

Fix clippy warning: Removed unneeded () in fn style

Fix formatting for fn style
---
 CHANGELOG.md                |  1 +
 voxygen/src/hud/mod.rs      | 23 ++++++++++
 voxygen/src/hud/overitem.rs | 83 +++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 voxygen/src/hud/overitem.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48b76f69e8..8ded03bf87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Display item name over loot/dropped items
 - Added Lottery system for loot
 - Added context-sensitive crosshair
 - Announce alias changes to all clients
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 2898937ae7..1711c7d290 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -9,6 +9,7 @@ mod item_imgs;
 mod map;
 mod minimap;
 mod overhead;
+mod overitem;
 mod popup;
 mod settings_window;
 mod skillbar;
@@ -141,6 +142,7 @@ widget_ids! {
         scts[],
 
         overheads[],
+        overitems[],
 
         // Intro Text
         intro_bg,
@@ -664,6 +666,7 @@ impl Hud {
             let players = ecs.read_storage::<comp::Player>();
             let scales = ecs.read_storage::<comp::Scale>();
             let bodies = ecs.read_storage::<comp::Body>();
+            let items = ecs.read_storage::<comp::Item>();
             let entities = ecs.entities();
             let me = client.entity();
             let own_level = stats
@@ -1000,9 +1003,29 @@ impl Hud {
             }
 
             let mut overhead_walker = self.ids.overheads.walk();
+            let mut overitem_walker = self.ids.overitems.walk();
             let mut sct_walker = self.ids.scts.walk();
             let mut sct_bg_walker = self.ids.sct_bgs.walk();
 
+            // Render overitem name
+            for (pos, item, distance) in (&entities, &pos, &items)
+                .join()
+                .map(|(_, pos, item)| (pos, item, pos.0.distance_squared(player_pos)))
+                .filter(|(_, _, distance)| distance < &common::comp::MAX_PICKUP_RANGE_SQR)
+            {
+                let overitem_id = overitem_walker.next(
+                    &mut self.ids.overitems,
+                    &mut ui_widgets.widget_id_generator(),
+                );
+                let ingame_pos = pos.0 + Vec3::unit_z() * 1.2;
+
+                // Item name
+                overitem::Overitem::new(&item.name(), &distance, &self.fonts)
+                    .x_y(0.0, 100.0)
+                    .position_ingame(ingame_pos)
+                    .set(overitem_id, ui_widgets);
+            }
+
             // Render overhead name tags and health bars
             for (pos, name, stats, energy, height_offset, hpfl, uid) in (
                 &entities,
diff --git a/voxygen/src/hud/overitem.rs b/voxygen/src/hud/overitem.rs
new file mode 100644
index 0000000000..bb4458ecb6
--- /dev/null
+++ b/voxygen/src/hud/overitem.rs
@@ -0,0 +1,83 @@
+use crate::ui::{fonts::ConrodVoxygenFonts, Ingameable};
+use conrod_core::{
+    widget::{self, Text},
+    widget_ids, Color, Colorable, Positionable, Widget, WidgetCommon,
+};
+
+widget_ids! {
+    struct Ids {
+        // Name
+        name_bg,
+        name,
+    }
+}
+
+/// ui widget containing everything that goes over a item
+/// (Item, DistanceFromPlayer, Rarity, etc.)
+#[derive(WidgetCommon)]
+pub struct Overitem<'a> {
+    name: &'a str,
+    distance: &'a f32,
+    fonts: &'a ConrodVoxygenFonts,
+    #[conrod(common_builder)]
+    common: widget::CommonBuilder,
+}
+
+impl<'a> Overitem<'a> {
+    pub fn new(name: &'a str, distance: &'a f32, fonts: &'a ConrodVoxygenFonts) -> Self {
+        Self {
+            name,
+            distance,
+            fonts,
+            common: widget::CommonBuilder::default(),
+        }
+    }
+}
+
+pub struct State {
+    ids: Ids,
+}
+
+impl<'a> Ingameable for Overitem<'a> {
+    fn prim_count(&self) -> usize {
+        // Number of conrod primitives contained in the overitem isplay. TODO maybe
+        // this could be done automatically?
+        // - 2 Text::new for name
+        2
+    }
+}
+
+impl<'a> Widget for Overitem<'a> {
+    type Event = ();
+    type State = State;
+    type Style = ();
+
+    fn init_state(&self, id_gen: widget::id::Generator) -> Self::State {
+        State {
+            ids: Ids::new(id_gen),
+        }
+    }
+
+    fn style(&self) -> Self::Style {}
+
+    fn update(self, args: widget::UpdateArgs<Self>) -> Self::Event {
+        let widget::UpdateArgs { state, ui, .. } = args;
+
+        let font_size =
+            ((1.0 - (self.distance / common::comp::MAX_PICKUP_RANGE_SQR)) * 30.0) as u32;
+
+        // ItemName
+        Text::new(&self.name)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(font_size)
+            .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
+            .x_y(-1.0, 48.0)
+            .set(state.ids.name_bg, ui);
+        Text::new(&self.name)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(font_size)
+            .color(Color::Rgba(0.61, 0.61, 0.89, 1.0))
+            .x_y(0.0, 50.0)
+            .set(state.ids.name, ui);
+    }
+}

From 4e99a3d142480c75cec47684c6b81008cc6e1ef5 Mon Sep 17 00:00:00 2001
From: Joshua Yanovski <pythonesque@gmail.com>
Date: Mon, 3 Aug 2020 04:19:05 +0200
Subject: [PATCH 2/3] Fix window resizing on OS X.

Not really clear why this was working on any platform...
---
 CHANGELOG.md            |  1 +
 voxygen/src/anim/mod.rs | 76 -----------------------------------------
 voxygen/src/session.rs  |  1 +
 voxygen/src/window.rs   |  7 +++-
 4 files changed, 8 insertions(+), 77 deletions(-)
 delete mode 100644 voxygen/src/anim/mod.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2011bf5bd2..8ee9530431 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Animals run/turn at different speeds
 - Updated windowing library (winit 0.19 -> 0.22)
 - Bow M2 is now a charged attack that scales the longer it's held
+- Fixed window resizing on Mac OS X.
 
 ### Removed
 
diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs
deleted file mode 100644
index 500abdf94b..0000000000
--- a/voxygen/src/anim/mod.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-pub mod biped_large;
-pub mod bird_medium;
-pub mod bird_small;
-pub mod character;
-pub mod critter;
-pub mod dragon;
-pub mod fish_medium;
-pub mod fish_small;
-pub mod fixture;
-pub mod golem;
-pub mod object;
-pub mod quadruped_medium;
-pub mod quadruped_small;
-pub mod quadruped_low;
-
-use crate::render::FigureBoneData;
-use vek::*;
-
-#[derive(Copy, Clone, Debug)]
-pub struct Bone {
-    pub offset: Vec3<f32>,
-    pub ori: Quaternion<f32>,
-    pub scale: Vec3<f32>,
-}
-
-impl Default for Bone {
-    fn default() -> Self {
-        Self {
-            offset: Vec3::zero(),
-            ori: Quaternion::identity(),
-            scale: Vec3::broadcast(1.0 / 11.0),
-        }
-    }
-}
-
-impl Bone {
-    pub fn compute_base_matrix(&self) -> Mat4<f32> {
-        Mat4::<f32>::translation_3d(self.offset)
-            * Mat4::scaling_3d(self.scale)
-            * Mat4::from(self.ori)
-    }
-
-    /// Change the current bone to be more like `target`.
-    fn interpolate(&mut self, target: &Bone, dt: f32) {
-        // TODO: Make configurable.
-        let factor = (15.0 * dt).min(1.0);
-        self.offset += (target.offset - self.offset) * factor;
-        self.ori = vek::Slerp::slerp(self.ori, target.ori, factor);
-        self.scale += (target.scale - self.scale) * factor;
-    }
-}
-
-pub trait Skeleton: Send + Sync + 'static {
-    type Attr;
-
-    fn bone_count(&self) -> usize { 16 }
-
-    fn compute_matrices(&self) -> ([FigureBoneData; 16], Vec3<f32>);
-
-    /// Change the current skeleton to be more like `target`.
-    fn interpolate(&mut self, target: &Self, dt: f32);
-}
-
-pub trait Animation {
-    type Skeleton: Skeleton;
-    type Dependency;
-
-    /// Returns a new skeleton that is generated by the animation.
-    fn update_skeleton(
-        skeleton: &Self::Skeleton,
-        dependency: Self::Dependency,
-        anim_time: f64,
-        rate: &mut f32,
-        skeleton_attr: &<<Self as Animation>::Skeleton as Skeleton>::Attr,
-    ) -> Self::Skeleton;
-}
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 2588147a73..00bffa5338 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -180,6 +180,7 @@ impl PlayState for SessionState {
     }
 
     fn tick(&mut self, global_state: &mut GlobalState, events: Vec<Event>) -> PlayStateResult {
+        // NOTE: Not strictly necessary, but useful for hotloading translation changes.
         self.voxygen_i18n = load_expect::<VoxygenLocalization>(&i18n_asset_key(
             &global_state.settings.language.selected_language,
         ));
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index c154845a2b..c634a332f5 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -896,15 +896,20 @@ impl Window {
 
         match event {
             WindowEvent::CloseRequested => self.events.push(Event::Close),
-            WindowEvent::Resized(winit::dpi::PhysicalSize { width, height }) => {
+            WindowEvent::Resized(physical) => {
                 let (mut color_view, mut depth_view) = self.renderer.win_views_mut();
+                self.window.resize(physical);
                 self.window.update_gfx(&mut color_view, &mut depth_view);
                 self.renderer.on_resize().unwrap();
                 // TODO: update users of this event with the fact that it is now the physical
                 // size
+                let winit::dpi::PhysicalSize { width, height } = physical;
                 self.events
                     .push(Event::Resize(Vec2::new(width as u32, height as u32)));
             },
+            WindowEvent::ScaleFactorChanged { .. } => {
+                // TODO: Handle properly!
+            },
             WindowEvent::ReceivedCharacter(c) => self.events.push(Event::Char(c)),
             WindowEvent::MouseInput { button, state, .. } => {
                 if let (true, Some(game_inputs)) =

From a167ee98ee602afdb4f1611369fcea37cf23d1b8 Mon Sep 17 00:00:00 2001
From: BottledByte <6443024-BottledByte@users.noreply.gitlab.com>
Date: Mon, 3 Aug 2020 03:41:32 +0000
Subject: [PATCH 3/3] De-enumerized armor variants

---
 assets/common/items/armor/back/admin.ron      |   2 +-
 .../items/armor/back/dungeon_purple-0.ron     |   2 +-
 assets/common/items/armor/back/short_0.ron    |   2 +-
 assets/common/items/armor/belt/assassin.ron   |   2 +-
 .../common/items/armor/belt/cloth_blue_0.ron  |   2 +-
 .../common/items/armor/belt/cloth_green_0.ron |   2 +-
 .../items/armor/belt/cloth_purple_0.ron       |   2 +-
 .../common/items/armor/belt/cultist_belt.ron  |   2 +-
 assets/common/items/armor/belt/druid.ron      |   2 +-
 assets/common/items/armor/belt/leather_0.ron  |   2 +-
 assets/common/items/armor/belt/leather_2.ron  |   2 +-
 assets/common/items/armor/belt/plate_0.ron    |   2 +-
 assets/common/items/armor/belt/steel_0.ron    |   2 +-
 assets/common/items/armor/belt/twig.ron       |   2 +-
 .../common/items/armor/belt/twigsflowers.ron  |   2 +-
 .../common/items/armor/belt/twigsleaves.ron   |   2 +-
 assets/common/items/armor/chest/assassin.ron  |   2 +-
 .../common/items/armor/chest/cloth_blue_0.ron |   2 +-
 .../items/armor/chest/cloth_green_0.ron       |   2 +-
 .../items/armor/chest/cloth_purple_0.ron      |   2 +-
 .../items/armor/chest/cultist_chest_blue.ron  |   2 +-
 .../armor/chest/cultist_chest_purple.ron      |   2 +-
 assets/common/items/armor/chest/druid.ron     |   2 +-
 assets/common/items/armor/chest/leather_0.ron |   2 +-
 assets/common/items/armor/chest/leather_2.ron |   2 +-
 .../items/armor/chest/plate_green_0.ron       |   2 +-
 assets/common/items/armor/chest/steel_0.ron   |   2 +-
 assets/common/items/armor/chest/twig.ron      |   2 +-
 .../common/items/armor/chest/twigsflowers.ron |   2 +-
 .../common/items/armor/chest/twigsleaves.ron  |   2 +-
 .../items/armor/chest/worker_green_0.ron      |   2 +-
 .../items/armor/chest/worker_green_1.ron      |   2 +-
 .../items/armor/chest/worker_orange_0.ron     |   2 +-
 .../items/armor/chest/worker_orange_1.ron     |   2 +-
 .../items/armor/chest/worker_purple_0.ron     |   2 +-
 .../items/armor/chest/worker_purple_1.ron     |   2 +-
 .../common/items/armor/chest/worker_red_0.ron |   2 +-
 .../common/items/armor/chest/worker_red_1.ron |   2 +-
 .../items/armor/chest/worker_yellow_0.ron     |   2 +-
 .../items/armor/chest/worker_yellow_1.ron     |   2 +-
 assets/common/items/armor/foot/assassin.ron   |   2 +-
 .../common/items/armor/foot/cloth_blue_0.ron  |   2 +-
 .../common/items/armor/foot/cloth_green_0.ron |   2 +-
 .../items/armor/foot/cloth_purple_0.ron       |   2 +-
 .../common/items/armor/foot/cultist_boots.ron |   2 +-
 assets/common/items/armor/foot/druid.ron      |   2 +-
 .../items/armor/foot/jackalope_slippers.ron   |   2 +-
 assets/common/items/armor/foot/leather_0.ron  |   2 +-
 assets/common/items/armor/foot/leather_2.ron  |   2 +-
 assets/common/items/armor/foot/plate_0.ron    |   2 +-
 assets/common/items/armor/foot/steel_0.ron    |   2 +-
 assets/common/items/armor/foot/twig.ron       |   2 +-
 .../common/items/armor/foot/twigsflowers.ron  |   2 +-
 .../common/items/armor/foot/twigsleaves.ron   |   2 +-
 assets/common/items/armor/hand/assassin.ron   |   2 +-
 .../common/items/armor/hand/cloth_blue_0.ron  |   2 +-
 .../common/items/armor/hand/cloth_green_0.ron |   2 +-
 .../items/armor/hand/cloth_purple_0.ron       |   2 +-
 .../items/armor/hand/cultist_hands_blue.ron   |   2 +-
 .../items/armor/hand/cultist_hands_purple.ron |   2 +-
 assets/common/items/armor/hand/druid.ron      |   2 +-
 assets/common/items/armor/hand/leather_0.ron  |   2 +-
 assets/common/items/armor/hand/leather_2.ron  |   2 +-
 assets/common/items/armor/hand/plate_0.ron    |   2 +-
 assets/common/items/armor/hand/steel_0.ron    |   2 +-
 assets/common/items/armor/hand/twig.ron       |   2 +-
 .../common/items/armor/hand/twigsflowers.ron  |   2 +-
 .../common/items/armor/hand/twigsleaves.ron   |   2 +-
 .../common/items/armor/head/assa_mask_0.ron   |   2 +-
 assets/common/items/armor/head/leather_0.ron  |   2 +-
 assets/common/items/armor/neck/neck_0.ron     |   2 +-
 assets/common/items/armor/pants/assassin.ron  |   2 +-
 .../common/items/armor/pants/cloth_blue_0.ron |   2 +-
 .../items/armor/pants/cloth_green_0.ron       |   2 +-
 .../items/armor/pants/cloth_purple_0.ron      |   2 +-
 .../items/armor/pants/cultist_legs_blue.ron   |   2 +-
 .../items/armor/pants/cultist_legs_purple.ron |   2 +-
 assets/common/items/armor/pants/druid.ron     |   2 +-
 assets/common/items/armor/pants/hunting.ron   |   2 +-
 assets/common/items/armor/pants/leather_0.ron |   2 +-
 assets/common/items/armor/pants/leather_2.ron |   2 +-
 .../items/armor/pants/plate_green_0.ron       |   2 +-
 assets/common/items/armor/pants/steel_0.ron   |   2 +-
 assets/common/items/armor/pants/twig.ron      |   2 +-
 .../common/items/armor/pants/twigsflowers.ron |   2 +-
 .../common/items/armor/pants/twigsleaves.ron  |   2 +-
 .../items/armor/pants/worker_blue_0.ron       |   2 +-
 assets/common/items/armor/ring/ring_0.ron     |   2 +-
 .../common/items/armor/shoulder/assassin.ron  |   2 +-
 .../items/armor/shoulder/cloth_blue_0.ron     |   2 +-
 .../items/armor/shoulder/cloth_blue_1.ron     |   2 +-
 .../items/armor/shoulder/cloth_green_0.ron    |   2 +-
 .../items/armor/shoulder/cloth_purple_0.ron   |   2 +-
 .../armor/shoulder/cultist_shoulder_blue.ron  |   2 +-
 .../shoulder/cultist_shoulder_purple.ron      |   2 +-
 .../items/armor/shoulder/druidshoulder.ron    |   2 +-
 .../items/armor/shoulder/iron_spikes.ron      |   2 +-
 .../common/items/armor/shoulder/leather_0.ron |   2 +-
 .../common/items/armor/shoulder/leather_1.ron |   2 +-
 .../common/items/armor/shoulder/leather_2.ron |   2 +-
 .../items/armor/shoulder/leather_iron_0.ron   |   2 +-
 .../items/armor/shoulder/leather_iron_1.ron   |   2 +-
 .../items/armor/shoulder/leather_iron_2.ron   |   2 +-
 .../items/armor/shoulder/leather_iron_3.ron   |   2 +-
 .../items/armor/shoulder/leather_strips.ron   |   2 +-
 .../common/items/armor/shoulder/plate_0.ron   |   2 +-
 .../common/items/armor/shoulder/steel_0.ron   |   2 +-
 assets/common/items/armor/shoulder/twigs.ron  |   2 +-
 .../items/armor/shoulder/twigsflowers.ron     |   2 +-
 .../items/armor/shoulder/twigsleaves.ron      |   2 +-
 .../items/armor/starter/rugged_chest.ron      |   2 +-
 .../items/armor/starter/rugged_pants.ron      |   2 +-
 .../common/items/armor/starter/sandals_0.ron  |   2 +-
 assets/common/items/armor/tabard/admin.ron    |   2 +-
 assets/common/items/debug/admin.ron           |   2 +-
 assets/common/items/debug/admin_back.ron      |   2 +-
 assets/common/items/debug/cultist_belt.ron    |   2 +-
 assets/common/items/debug/cultist_boots.ron   |   2 +-
 .../common/items/debug/cultist_chest_blue.ron |   2 +-
 .../common/items/debug/cultist_hands_blue.ron |   2 +-
 .../common/items/debug/cultist_legs_blue.ron  |   2 +-
 .../items/debug/cultist_shoulder_blue.ron     |   2 +-
 assets/common/items/testing/test_boots.ron    |   2 +-
 assets/voxygen/item_image_manifest.ron        | 230 +++++------
 .../voxel/humanoid_armor_back_manifest.ron    |   6 +-
 .../voxel/humanoid_armor_belt_manifest.ron    |  38 +-
 .../voxel/humanoid_armor_chest_manifest.ron   |  64 ++--
 .../voxel/humanoid_armor_foot_manifest.ron    |  34 +-
 .../voxel/humanoid_armor_hand_manifest.ron    |  30 +-
 .../voxel/humanoid_armor_pants_manifest.ron   |  44 +--
 .../humanoid_armor_shoulder_manifest.ron      |  65 ++--
 common/src/comp/ability.rs                    |   2 +-
 common/src/comp/inventory/item/armor.rs       | 361 +-----------------
 tools/src/main.rs                             |   2 +-
 voxygen/src/hud/item_imgs.rs                  |   2 +-
 voxygen/src/hud/util.rs                       |   2 +-
 voxygen/src/scene/figure/cache.rs             |  14 +-
 voxygen/src/scene/figure/load.rs              |  40 +-
 138 files changed, 416 insertions(+), 764 deletions(-)

diff --git a/assets/common/items/armor/back/admin.ron b/assets/common/items/armor/back/admin.ron
index 1e7e0a313b..edf3262af2 100644
--- a/assets/common/items/armor/back/admin.ron
+++ b/assets/common/items/armor/back/admin.ron
@@ -3,7 +3,7 @@ Item(
     description: "With great power comes\ngreat responsibility.",
     kind: Armor(
         (
-            kind: Back(Admin),
+            kind: Back("Admin"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/back/dungeon_purple-0.ron b/assets/common/items/armor/back/dungeon_purple-0.ron
index 8e513848db..f0c7c12f3d 100644
--- a/assets/common/items/armor/back/dungeon_purple-0.ron
+++ b/assets/common/items/armor/back/dungeon_purple-0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Smells like dark magic and candles.",
     kind: Armor(
         (
-            kind: Back(DungPurp0),
+            kind: Back("DungPurp0"),
             stats: (
                 protection: Normal(3.0),
             ),
diff --git a/assets/common/items/armor/back/short_0.ron b/assets/common/items/armor/back/short_0.ron
index a1093e90b8..2f7f4aa223 100644
--- a/assets/common/items/armor/back/short_0.ron
+++ b/assets/common/items/armor/back/short_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Probably made of the finest leather.",
     kind: Armor(
         (
-            kind: Back(Short0),
+            kind: Back("Short0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/belt/assassin.ron
index 2c00d9066a..f358a6c6d6 100644
--- a/assets/common/items/armor/belt/assassin.ron
+++ b/assets/common/items/armor/belt/assassin.ron
@@ -3,7 +3,7 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         (
-            kind: Belt(Assassin),
+            kind: Belt("Assassin"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/belt/cloth_blue_0.ron
index ef9085cf85..91a654529c 100644
--- a/assets/common/items/armor/belt/cloth_blue_0.ron
+++ b/assets/common/items/armor/belt/cloth_blue_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm",
     kind: Armor(
         (
-            kind: Belt(ClothBlue0),
+            kind: Belt("ClothBlue0"),
             stats:  (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/belt/cloth_green_0.ron
index b4cba9679d..575a65365b 100644
--- a/assets/common/items/armor/belt/cloth_green_0.ron
+++ b/assets/common/items/armor/belt/cloth_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Belt(ClothGreen0),
+            kind: Belt("ClothGreen0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/belt/cloth_purple_0.ron
index 54cc8647dc..5a631bcb34 100644
--- a/assets/common/items/armor/belt/cloth_purple_0.ron
+++ b/assets/common/items/armor/belt/cloth_purple_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Belt(ClothPurple0),
+            kind: Belt("ClothPurple0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/cultist_belt.ron b/assets/common/items/armor/belt/cultist_belt.ron
index 439851225a..6b856636c6 100644
--- a/assets/common/items/armor/belt/cultist_belt.ron
+++ b/assets/common/items/armor/belt/cultist_belt.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Belt(Cultist),
+            kind: Belt("Cultist"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/druid.ron b/assets/common/items/armor/belt/druid.ron
index 941ebbe6ca..9d66177f7d 100644
--- a/assets/common/items/armor/belt/druid.ron
+++ b/assets/common/items/armor/belt/druid.ron
@@ -3,7 +3,7 @@ Item(
     description: "Twisted vines to keep everything secure.",
     kind: Armor(
         (
-            kind: Belt(Druid),
+            kind: Belt("Druid"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/leather_0.ron b/assets/common/items/armor/belt/leather_0.ron
index 6c7b499bfb..fc945f685a 100644
--- a/assets/common/items/armor/belt/leather_0.ron
+++ b/assets/common/items/armor/belt/leather_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         (
-            kind: Belt(Leather0),
+            kind: Belt("Leather0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/leather_2.ron b/assets/common/items/armor/belt/leather_2.ron
index fb2d1d05a4..02e85824f3 100644
--- a/assets/common/items/armor/belt/leather_2.ron
+++ b/assets/common/items/armor/belt/leather_2.ron
@@ -3,7 +3,7 @@ Item(
     description: "A belt made from simple leather.",
     kind: Armor(
         (
-            kind: Belt(Leather2),
+            kind: Belt("Leather2"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/plate_0.ron b/assets/common/items/armor/belt/plate_0.ron
index c48c0bdb0a..d431365290 100644
--- a/assets/common/items/armor/belt/plate_0.ron
+++ b/assets/common/items/armor/belt/plate_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A belt with a buckle forged from iron.",
     kind: Armor(
         (
-            kind: Belt(Plate0),
+            kind: Belt("Plate0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/steel_0.ron b/assets/common/items/armor/belt/steel_0.ron
index 0b9d7df412..9a4c6e7532 100644
--- a/assets/common/items/armor/belt/steel_0.ron
+++ b/assets/common/items/armor/belt/steel_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A belt forged from steel.",
     kind: Armor(
         (
-            kind: Belt(Steel0),
+            kind: Belt("Steel0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/twig.ron b/assets/common/items/armor/belt/twig.ron
index 754206366b..bd6dba50b4 100644
--- a/assets/common/items/armor/belt/twig.ron
+++ b/assets/common/items/armor/belt/twig.ron
@@ -3,7 +3,7 @@ Item(
     description: "A belt made from woven from twigs.",
     kind: Armor(
         (
-            kind: Belt(Twig),
+            kind: Belt("Twig"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/twigsflowers.ron b/assets/common/items/armor/belt/twigsflowers.ron
index 0d503ef7d7..d24c75bc01 100644
--- a/assets/common/items/armor/belt/twigsflowers.ron
+++ b/assets/common/items/armor/belt/twigsflowers.ron
@@ -3,7 +3,7 @@ Item(
     description: "A belt woven from twigs and flowers.",
     kind: Armor(
         (
-            kind: Belt(Twigsflowers),
+            kind: Belt("Twigsflowers"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/belt/twigsleaves.ron b/assets/common/items/armor/belt/twigsleaves.ron
index 883f1ebe77..0c825bbf84 100644
--- a/assets/common/items/armor/belt/twigsleaves.ron
+++ b/assets/common/items/armor/belt/twigsleaves.ron
@@ -3,7 +3,7 @@ Item(
     description: "A belt woven from twigs and leaves.",
     kind: Armor(
         (
-            kind: Belt(Twigsleaves),
+            kind: Belt("Twigsleaves"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/chest/assassin.ron
index cbe034b1f1..01d0d61fef 100644
--- a/assets/common/items/armor/chest/assassin.ron
+++ b/assets/common/items/armor/chest/assassin.ron
@@ -3,7 +3,7 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         (
-            kind: Chest(Assassin),
+            kind: Chest("Assassin"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/chest/cloth_blue_0.ron
index d2a69a427c..c89ff2328a 100644
--- a/assets/common/items/armor/chest/cloth_blue_0.ron
+++ b/assets/common/items/armor/chest/cloth_blue_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Chest(ClothBlue0),
+            kind: Chest("ClothBlue0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/chest/cloth_green_0.ron
index 840c3f1c37..440448e38d 100644
--- a/assets/common/items/armor/chest/cloth_green_0.ron
+++ b/assets/common/items/armor/chest/cloth_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Chest(ClothGreen0),
+            kind: Chest("ClothGreen0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/chest/cloth_purple_0.ron
index b77ab71883..e2e5e967b9 100644
--- a/assets/common/items/armor/chest/cloth_purple_0.ron
+++ b/assets/common/items/armor/chest/cloth_purple_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Chest(ClothPurple0),
+            kind: Chest("ClothPurple0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/cultist_chest_blue.ron b/assets/common/items/armor/chest/cultist_chest_blue.ron
index 8b1a34da39..42cb920efe 100644
--- a/assets/common/items/armor/chest/cultist_chest_blue.ron
+++ b/assets/common/items/armor/chest/cultist_chest_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Chest(CultistBlue),
+            kind: Chest("CultistBlue"),
             stats: (
                 protection: Normal(30.0),
             ),
diff --git a/assets/common/items/armor/chest/cultist_chest_purple.ron b/assets/common/items/armor/chest/cultist_chest_purple.ron
index e35a727d6b..cd9412ce5b 100644
--- a/assets/common/items/armor/chest/cultist_chest_purple.ron
+++ b/assets/common/items/armor/chest/cultist_chest_purple.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Chest(CultistPurple),
+            kind: Chest("CultistPurple"),
             stats: (
                 protection: Normal(30.0),
             ),
diff --git a/assets/common/items/armor/chest/druid.ron b/assets/common/items/armor/chest/druid.ron
index 96855c249a..24bc889fcc 100644
--- a/assets/common/items/armor/chest/druid.ron
+++ b/assets/common/items/armor/chest/druid.ron
@@ -3,7 +3,7 @@ Item(
     description: "Druidic chest wrappings.",
     kind: Armor(
         (
-            kind: Chest(Druid),
+            kind: Chest("Druid"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/chest/leather_0.ron b/assets/common/items/armor/chest/leather_0.ron
index 21767b4c06..174fec8fb3 100644
--- a/assets/common/items/armor/chest/leather_0.ron
+++ b/assets/common/items/armor/chest/leather_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         (
-            kind: Chest(Leather0),
+            kind: Chest("Leather0"),
             stats: (
                 protection: Normal(10.0),
             ),
diff --git a/assets/common/items/armor/chest/leather_2.ron b/assets/common/items/armor/chest/leather_2.ron
index 75661e56a0..f7fcf151db 100644
--- a/assets/common/items/armor/chest/leather_2.ron
+++ b/assets/common/items/armor/chest/leather_2.ron
@@ -3,7 +3,7 @@ Item(
     description: "A cuirass made of simple leather.",
     kind: Armor(
         (
-            kind: Chest(Leather2),
+            kind: Chest("Leather2"),
             stats: (
                 protection: Normal(10.0),
             ),
diff --git a/assets/common/items/armor/chest/plate_green_0.ron b/assets/common/items/armor/chest/plate_green_0.ron
index dda388739b..7fae0ffd43 100644
--- a/assets/common/items/armor/chest/plate_green_0.ron
+++ b/assets/common/items/armor/chest/plate_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A chestplate forged from iron.",
     kind: Armor(
         (
-            kind: Chest(PlateGreen0),
+            kind: Chest("PlateGreen0"),
             stats: (
                 protection: Normal(20.0),
             ),
diff --git a/assets/common/items/armor/chest/steel_0.ron b/assets/common/items/armor/chest/steel_0.ron
index 314bf57e95..9da979fa01 100644
--- a/assets/common/items/armor/chest/steel_0.ron
+++ b/assets/common/items/armor/chest/steel_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A cuirass of steel plate.",
     kind: Armor(
         (
-            kind: Chest(Steel0),
+            kind: Chest("Steel0"),
             stats: (
                 protection: Normal(25.0),
             ),
diff --git a/assets/common/items/armor/chest/twig.ron b/assets/common/items/armor/chest/twig.ron
index 56c3584569..a102d1bc2c 100644
--- a/assets/common/items/armor/chest/twig.ron
+++ b/assets/common/items/armor/chest/twig.ron
@@ -3,7 +3,7 @@ Item(
     description: "A shirt woven from twigs.",
     kind: Armor(
         (
-            kind: Chest(Twig),
+            kind: Chest("Twig"),
             stats: (
                 protection: Normal(15.0),
             ),
diff --git a/assets/common/items/armor/chest/twigsflowers.ron b/assets/common/items/armor/chest/twigsflowers.ron
index 8b364b55e9..782c3e4e95 100644
--- a/assets/common/items/armor/chest/twigsflowers.ron
+++ b/assets/common/items/armor/chest/twigsflowers.ron
@@ -3,7 +3,7 @@ Item(
     description: "A shirt woven from twigs and flowers.",
     kind: Armor(
         (
-            kind: Chest(Twigsflowers),
+            kind: Chest("Twigsflowers"),
             stats: (
                 protection: Normal(15.0),
             ),
diff --git a/assets/common/items/armor/chest/twigsleaves.ron b/assets/common/items/armor/chest/twigsleaves.ron
index 336182d654..eb0e8f436c 100644
--- a/assets/common/items/armor/chest/twigsleaves.ron
+++ b/assets/common/items/armor/chest/twigsleaves.ron
@@ -3,7 +3,7 @@ Item(
     description: "A shirt woven from twigs and leaves.",
     kind: Armor(
         (
-            kind: Chest(Twigsleaves),
+            kind: Chest("Twigsleaves"),
             stats: (
                 protection: Normal(15.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_green_0.ron b/assets/common/items/armor/chest/worker_green_0.ron
index 90f884c50b..43abc54500 100644
--- a/assets/common/items/armor/chest/worker_green_0.ron
+++ b/assets/common/items/armor/chest/worker_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerGreen0),
+            kind: Chest("WorkerGreen0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_green_1.ron b/assets/common/items/armor/chest/worker_green_1.ron
index 5a52626017..44e9eada14 100644
--- a/assets/common/items/armor/chest/worker_green_1.ron
+++ b/assets/common/items/armor/chest/worker_green_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerGreen1),
+            kind: Chest("WorkerGreen1"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_orange_0.ron b/assets/common/items/armor/chest/worker_orange_0.ron
index a65db86c4e..134e60c192 100644
--- a/assets/common/items/armor/chest/worker_orange_0.ron
+++ b/assets/common/items/armor/chest/worker_orange_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerOrange0),
+            kind: Chest("WorkerOrange0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_orange_1.ron b/assets/common/items/armor/chest/worker_orange_1.ron
index b0e41761c1..bf0aef7ba2 100644
--- a/assets/common/items/armor/chest/worker_orange_1.ron
+++ b/assets/common/items/armor/chest/worker_orange_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerOrange1),
+            kind: Chest("WorkerOrange1"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_purple_0.ron b/assets/common/items/armor/chest/worker_purple_0.ron
index b8dd21d140..d0ff228e31 100644
--- a/assets/common/items/armor/chest/worker_purple_0.ron
+++ b/assets/common/items/armor/chest/worker_purple_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerPurple0),
+            kind: Chest("WorkerPurple0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_purple_1.ron b/assets/common/items/armor/chest/worker_purple_1.ron
index f6782a1632..604ae3f656 100644
--- a/assets/common/items/armor/chest/worker_purple_1.ron
+++ b/assets/common/items/armor/chest/worker_purple_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerPurple1),
+            kind: Chest("WorkerPurple1"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_red_0.ron b/assets/common/items/armor/chest/worker_red_0.ron
index 62f3159ace..859d8eb079 100644
--- a/assets/common/items/armor/chest/worker_red_0.ron
+++ b/assets/common/items/armor/chest/worker_red_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerRed0),
+            kind: Chest("WorkerRed0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_red_1.ron b/assets/common/items/armor/chest/worker_red_1.ron
index a1a3b5eda7..5f2f28d20e 100644
--- a/assets/common/items/armor/chest/worker_red_1.ron
+++ b/assets/common/items/armor/chest/worker_red_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerRed1),
+            kind: Chest("WorkerRed1"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_yellow_0.ron b/assets/common/items/armor/chest/worker_yellow_0.ron
index 0d625111f8..37d2504917 100644
--- a/assets/common/items/armor/chest/worker_yellow_0.ron
+++ b/assets/common/items/armor/chest/worker_yellow_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerYellow0),
+            kind: Chest("WorkerYellow0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/chest/worker_yellow_1.ron b/assets/common/items/armor/chest/worker_yellow_1.ron
index 85d69c6a98..5a3dde6a0f 100644
--- a/assets/common/items/armor/chest/worker_yellow_1.ron
+++ b/assets/common/items/armor/chest/worker_yellow_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Was used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Chest(WorkerYellow1),
+            kind: Chest("WorkerYellow1"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/foot/assassin.ron
index 2b3c47390c..15eb08bc9c 100644
--- a/assets/common/items/armor/foot/assassin.ron
+++ b/assets/common/items/armor/foot/assassin.ron
@@ -3,7 +3,7 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         (
-            kind: Foot(Assassin),
+            kind: Foot("Assassin"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/foot/cloth_blue_0.ron
index 239b32ca05..f361b3ca64 100644
--- a/assets/common/items/armor/foot/cloth_blue_0.ron
+++ b/assets/common/items/armor/foot/cloth_blue_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Foot(ClothBlue0),
+            kind: Foot("ClothBlue0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/foot/cloth_green_0.ron
index 66586701a0..a93045f877 100644
--- a/assets/common/items/armor/foot/cloth_green_0.ron
+++ b/assets/common/items/armor/foot/cloth_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Foot(ClothGreen0),
+            kind: Foot("ClothGreen0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/foot/cloth_purple_0.ron
index fcc1e9b15d..01fb8e1fe1 100644
--- a/assets/common/items/armor/foot/cloth_purple_0.ron
+++ b/assets/common/items/armor/foot/cloth_purple_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft and warm.",
     kind: Armor(
         (
-            kind: Foot(ClothPurple0),
+            kind: Foot("ClothPurple0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/foot/cultist_boots.ron b/assets/common/items/armor/foot/cultist_boots.ron
index 2f9453db96..6aff96c399 100644
--- a/assets/common/items/armor/foot/cultist_boots.ron
+++ b/assets/common/items/armor/foot/cultist_boots.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Foot(Cultist),
+            kind: Foot("Cultist"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/foot/druid.ron b/assets/common/items/armor/foot/druid.ron
index 51cd2072d4..e99824ed97 100644
--- a/assets/common/items/armor/foot/druid.ron
+++ b/assets/common/items/armor/foot/druid.ron
@@ -3,7 +3,7 @@ Item(
     description: "For treading softly through the woods.",
     kind: Armor(
         (
-            kind: Foot(Druid),
+            kind: Foot("Druid"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/foot/jackalope_slippers.ron b/assets/common/items/armor/foot/jackalope_slippers.ron
index 751dce12a3..82b52e87a7 100644
--- a/assets/common/items/armor/foot/jackalope_slippers.ron
+++ b/assets/common/items/armor/foot/jackalope_slippers.ron
@@ -3,7 +3,7 @@ Item(
     description: "So warm and cozy!",
     kind: Armor(
         (
-            kind: Foot(JackalopeSlips),
+            kind: Foot("JackalopeSlips"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/foot/leather_0.ron b/assets/common/items/armor/foot/leather_0.ron
index bd508944de..a1bec22ea0 100644
--- a/assets/common/items/armor/foot/leather_0.ron
+++ b/assets/common/items/armor/foot/leather_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         (
-            kind: Foot(Leather0),
+            kind: Foot("Leather0"),
             stats: (
                 protection: Normal(2.0),
             ),
diff --git a/assets/common/items/armor/foot/leather_2.ron b/assets/common/items/armor/foot/leather_2.ron
index 6fe2ce0c6f..f3f397e64d 100644
--- a/assets/common/items/armor/foot/leather_2.ron
+++ b/assets/common/items/armor/foot/leather_2.ron
@@ -3,7 +3,7 @@ Item(
     description: "Boots made of simple leather.",
     kind: Armor(
         (
-            kind: Foot(Leather2),
+            kind: Foot("Leather2"),
             stats: (
                 protection: Normal(2.0),
             ),
diff --git a/assets/common/items/armor/foot/plate_0.ron b/assets/common/items/armor/foot/plate_0.ron
index fd9c41bb15..50426aa112 100644
--- a/assets/common/items/armor/foot/plate_0.ron
+++ b/assets/common/items/armor/foot/plate_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Boots forged from iron.",
     kind: Armor(
         (
-            kind: Foot(Plate0),
+            kind: Foot("Plate0"),
             stats: (
                 protection: Normal(4.0),
             ),
diff --git a/assets/common/items/armor/foot/steel_0.ron b/assets/common/items/armor/foot/steel_0.ron
index 5b39db22e4..8e946cbe82 100644
--- a/assets/common/items/armor/foot/steel_0.ron
+++ b/assets/common/items/armor/foot/steel_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Boots forged from steel.",
     kind: Armor(
         (
-            kind: Foot(Steel0),
+            kind: Foot("Steel0"),
             stats: (
                 protection: Normal(5.0),
             ),
diff --git a/assets/common/items/armor/foot/twig.ron b/assets/common/items/armor/foot/twig.ron
index 742c7b1cc9..7a933269a6 100644
--- a/assets/common/items/armor/foot/twig.ron
+++ b/assets/common/items/armor/foot/twig.ron
@@ -3,7 +3,7 @@ Item(
     description: "Boots woven from twigs.",
     kind: Armor(
         (
-            kind: Foot(Twig),
+            kind: Foot("Twig"),
             stats: (
                 protection: Normal(3.0),
             ),
diff --git a/assets/common/items/armor/foot/twigsflowers.ron b/assets/common/items/armor/foot/twigsflowers.ron
index ec1918a11b..9cd370cefd 100644
--- a/assets/common/items/armor/foot/twigsflowers.ron
+++ b/assets/common/items/armor/foot/twigsflowers.ron
@@ -3,7 +3,7 @@ Item(
     description: "Boots woven from twigs and flowers.",
     kind: Armor(
         (
-            kind: Foot(Twigsflowers),
+            kind: Foot("Twigsflowers"),
             stats: (
                 protection: Normal(3.0),
             ),
diff --git a/assets/common/items/armor/foot/twigsleaves.ron b/assets/common/items/armor/foot/twigsleaves.ron
index 7dfa97ac34..5bd146b70a 100644
--- a/assets/common/items/armor/foot/twigsleaves.ron
+++ b/assets/common/items/armor/foot/twigsleaves.ron
@@ -3,7 +3,7 @@ Item(
     description: "Boots woven from twigs and leaves.",
     kind: Armor(
         (
-            kind: Foot(Twigsleaves),
+            kind: Foot("Twigsleaves"),
             stats: (
                 protection: Normal(3.0),
             ),
diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/hand/assassin.ron
index 9b635f7a0d..10a58f0798 100644
--- a/assets/common/items/armor/hand/assassin.ron
+++ b/assets/common/items/armor/hand/assassin.ron
@@ -3,7 +3,7 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         (
-            kind: Hand(Assassin),
+            kind: Hand("Assassin"),
             stats: (
                 protection: Normal(2.0),
             ),
diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/hand/cloth_blue_0.ron
index 9fcc19d577..36d46658dc 100644
--- a/assets/common/items/armor/hand/cloth_blue_0.ron
+++ b/assets/common/items/armor/hand/cloth_blue_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A strip of cloth.",
     kind: Armor(
         (
-            kind: Hand(ClothBlue0),
+            kind: Hand("ClothBlue0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/hand/cloth_green_0.ron
index face79a1d4..92ca42477e 100644
--- a/assets/common/items/armor/hand/cloth_green_0.ron
+++ b/assets/common/items/armor/hand/cloth_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A strip of cloth.",
     kind: Armor(
         (
-            kind: Hand(ClothGreen0),
+            kind: Hand("ClothGreen0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/hand/cloth_purple_0.ron
index 5946dddd2f..12cda36497 100644
--- a/assets/common/items/armor/hand/cloth_purple_0.ron
+++ b/assets/common/items/armor/hand/cloth_purple_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A strip of cloth.",
     kind: Armor(
         (
-            kind: Hand(ClothPurple0),
+            kind: Hand("ClothPurple0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/hand/cultist_hands_blue.ron b/assets/common/items/armor/hand/cultist_hands_blue.ron
index c4c88cd131..e47abd428c 100644
--- a/assets/common/items/armor/hand/cultist_hands_blue.ron
+++ b/assets/common/items/armor/hand/cultist_hands_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Hand(CultistBlue),
+            kind: Hand("CultistBlue"),
             stats: (
                 protection: Normal(12.0),
             ),
diff --git a/assets/common/items/armor/hand/cultist_hands_purple.ron b/assets/common/items/armor/hand/cultist_hands_purple.ron
index 46e1f672d7..73d9760b4b 100644
--- a/assets/common/items/armor/hand/cultist_hands_purple.ron
+++ b/assets/common/items/armor/hand/cultist_hands_purple.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Hand(CultistPurple),
+            kind: Hand("CultistPurple"),
             stats: (
                 protection: Normal(12.0),
             ),
diff --git a/assets/common/items/armor/hand/druid.ron b/assets/common/items/armor/hand/druid.ron
index ddb12753a7..dab5caa7e6 100644
--- a/assets/common/items/armor/hand/druid.ron
+++ b/assets/common/items/armor/hand/druid.ron
@@ -3,7 +3,7 @@ Item(
     description: "Soft, strong, and flexible.",
     kind: Armor(
         (
-            kind: Hand(Druid),
+            kind: Hand("Druid"),
             stats: (
                 protection: Normal(2.0),
             ),
diff --git a/assets/common/items/armor/hand/leather_0.ron b/assets/common/items/armor/hand/leather_0.ron
index 050623f3c3..59d4319a28 100644
--- a/assets/common/items/armor/hand/leather_0.ron
+++ b/assets/common/items/armor/hand/leather_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         (
-            kind: Hand(Leather0),
+            kind: Hand("Leather0"),
             stats: (
                 protection: Normal(4.0),
             ),
diff --git a/assets/common/items/armor/hand/leather_2.ron b/assets/common/items/armor/hand/leather_2.ron
index 639b1ba37a..071a7f709d 100644
--- a/assets/common/items/armor/hand/leather_2.ron
+++ b/assets/common/items/armor/hand/leather_2.ron
@@ -3,7 +3,7 @@ Item(
     description: "Gloves made of simple leather.",
     kind: Armor(
         (
-            kind: Hand(Leather2),
+            kind: Hand("Leather2"),
             stats: (
                 protection: Normal(4.0),
             ),
diff --git a/assets/common/items/armor/hand/plate_0.ron b/assets/common/items/armor/hand/plate_0.ron
index 20242b87ed..db3c8ce145 100644
--- a/assets/common/items/armor/hand/plate_0.ron
+++ b/assets/common/items/armor/hand/plate_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Gauntlets forged from iron.",
     kind: Armor(
         (
-            kind: Hand(Plate0),
+            kind: Hand("Plate0"),
             stats: (
                 protection: Normal(8.0),
             ),
diff --git a/assets/common/items/armor/hand/steel_0.ron b/assets/common/items/armor/hand/steel_0.ron
index 6978576802..01e8543ac5 100644
--- a/assets/common/items/armor/hand/steel_0.ron
+++ b/assets/common/items/armor/hand/steel_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Gauntlets forged from steel.",
     kind: Armor(
         (
-            kind: Hand(Steel0),
+            kind: Hand("Steel0"),
             stats: (
                 protection: Normal(10.0),
             ),
diff --git a/assets/common/items/armor/hand/twig.ron b/assets/common/items/armor/hand/twig.ron
index 9cb73a911b..7f81556e5b 100644
--- a/assets/common/items/armor/hand/twig.ron
+++ b/assets/common/items/armor/hand/twig.ron
@@ -3,7 +3,7 @@ Item(
     description: "Handwraps woven from twigs.",
     kind: Armor(
         (
-            kind: Hand(Twig),
+            kind: Hand("Twig"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/hand/twigsflowers.ron b/assets/common/items/armor/hand/twigsflowers.ron
index 04a6f4b098..58a0d1f592 100644
--- a/assets/common/items/armor/hand/twigsflowers.ron
+++ b/assets/common/items/armor/hand/twigsflowers.ron
@@ -3,7 +3,7 @@ Item(
     description: "Handwraps woven from twigs and flowers.",
     kind: Armor(
         (
-            kind: Hand(Twigsflowers),
+            kind: Hand("Twigsflowers"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/hand/twigsleaves.ron b/assets/common/items/armor/hand/twigsleaves.ron
index 8226c3d103..6514099f0b 100644
--- a/assets/common/items/armor/hand/twigsleaves.ron
+++ b/assets/common/items/armor/hand/twigsleaves.ron
@@ -3,7 +3,7 @@ Item(
     description: "Handwraps woven from twigs and leaves.",
     kind: Armor(
         (
-            kind: Hand(Twigsleaves),
+            kind: Hand("Twigsleaves"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/head/assa_mask_0.ron b/assets/common/items/armor/head/assa_mask_0.ron
index 2ee38ca25e..469672b130 100644
--- a/assets/common/items/armor/head/assa_mask_0.ron
+++ b/assets/common/items/armor/head/assa_mask_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Used to obscure your face.",
     kind: Armor(
         (
-            kind: Head(AssaMask0),
+            kind: Head("AssaMask0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/head/leather_0.ron b/assets/common/items/armor/head/leather_0.ron
index 9ce5ba6814..8f545c9f45 100644
--- a/assets/common/items/armor/head/leather_0.ron
+++ b/assets/common/items/armor/head/leather_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         (
-            kind: Head(Leather0),
+            kind: Head("Leather0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/neck/neck_0.ron b/assets/common/items/armor/neck/neck_0.ron
index e8b25c6f58..14b1138acd 100644
--- a/assets/common/items/armor/neck/neck_0.ron
+++ b/assets/common/items/armor/neck/neck_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "It's become tarnished with age.",
     kind: Armor(
         (
-            kind: Neck(Neck0),
+            kind: Neck("Neck0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/pants/assassin.ron
index be00f18aa6..25e48f965e 100644
--- a/assets/common/items/armor/pants/assassin.ron
+++ b/assets/common/items/armor/pants/assassin.ron
@@ -3,7 +3,7 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         (
-            kind: Pants(Assassin),
+            kind: Pants("Assassin"),
             stats: (
                 protection: Normal(5.0),
             ),
diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/pants/cloth_blue_0.ron
index 52ebc0c3a5..33b08d3d30 100644
--- a/assets/common/items/armor/pants/cloth_blue_0.ron
+++ b/assets/common/items/armor/pants/cloth_blue_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A skirt made from linen.",
     kind: Armor(
         (
-            kind: Pants(ClothBlue0),
+            kind: Pants("ClothBlue0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/pants/cloth_green_0.ron
index 364e058cee..5d633daa7d 100644
--- a/assets/common/items/armor/pants/cloth_green_0.ron
+++ b/assets/common/items/armor/pants/cloth_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A skirt made from linen.",
     kind: Armor(
         (
-            kind: Pants(ClothGreen0),
+            kind: Pants("ClothGreen0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/pants/cloth_purple_0.ron
index efcd70f574..b49a5d2617 100644
--- a/assets/common/items/armor/pants/cloth_purple_0.ron
+++ b/assets/common/items/armor/pants/cloth_purple_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A skirt made from linen.",
     kind: Armor(
         (
-            kind: Pants(ClothPurple0),
+            kind: Pants("ClothPurple0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/pants/cultist_legs_blue.ron b/assets/common/items/armor/pants/cultist_legs_blue.ron
index aabf7b54a6..8c4328afde 100644
--- a/assets/common/items/armor/pants/cultist_legs_blue.ron
+++ b/assets/common/items/armor/pants/cultist_legs_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Pants(CultistBlue),
+            kind: Pants("CultistBlue"),
             stats: (
                 protection: Normal(24.0),
             ),
diff --git a/assets/common/items/armor/pants/cultist_legs_purple.ron b/assets/common/items/armor/pants/cultist_legs_purple.ron
index a2609e55c9..bf9bf3dec9 100644
--- a/assets/common/items/armor/pants/cultist_legs_purple.ron
+++ b/assets/common/items/armor/pants/cultist_legs_purple.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Pants(CultistPurple),
+            kind: Pants("CultistPurple"),
             stats: (
                 protection: Normal(24.0),
             ),
diff --git a/assets/common/items/armor/pants/druid.ron b/assets/common/items/armor/pants/druid.ron
index f1e35bac41..40c82b7d62 100644
--- a/assets/common/items/armor/pants/druid.ron
+++ b/assets/common/items/armor/pants/druid.ron
@@ -3,7 +3,7 @@ Item(
     description: "Feel the breeze!",
     kind: Armor(
         (
-            kind: Pants(Druid),
+            kind: Pants("Druid"),
             stats: (
                 protection: Normal(4.0),
             ),
diff --git a/assets/common/items/armor/pants/hunting.ron b/assets/common/items/armor/pants/hunting.ron
index 16dbf0d1c8..391aa9ef26 100644
--- a/assets/common/items/armor/pants/hunting.ron
+++ b/assets/common/items/armor/pants/hunting.ron
@@ -3,7 +3,7 @@ Item(
     description: "Crafted from soft, supple leather.",
     kind: Armor(
         (
-            kind: Pants(Hunting),
+            kind: Pants("Hunting"),
             stats: (
                 protection: Normal(8.0),
             ),
diff --git a/assets/common/items/armor/pants/leather_0.ron b/assets/common/items/armor/pants/leather_0.ron
index cf7b058a02..576e451736 100644
--- a/assets/common/items/armor/pants/leather_0.ron
+++ b/assets/common/items/armor/pants/leather_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         (
-            kind: Pants(Leather0),
+            kind: Pants("Leather0"),
             stats: (
                 protection: Normal(8.0),
             ),
diff --git a/assets/common/items/armor/pants/leather_2.ron b/assets/common/items/armor/pants/leather_2.ron
index 05d4fcf9df..f50ba7df0c 100644
--- a/assets/common/items/armor/pants/leather_2.ron
+++ b/assets/common/items/armor/pants/leather_2.ron
@@ -3,7 +3,7 @@ Item(
     description: "Leg armour made of simple leather.",
     kind: Armor(
         (
-            kind: Pants(Leather2),
+            kind: Pants("Leather2"),
             stats: (
                 protection: Normal(8.0),
             ),
diff --git a/assets/common/items/armor/pants/plate_green_0.ron b/assets/common/items/armor/pants/plate_green_0.ron
index d1167a6934..3417367e47 100644
--- a/assets/common/items/armor/pants/plate_green_0.ron
+++ b/assets/common/items/armor/pants/plate_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Greaves forged from iron.",
     kind: Armor(
         (
-            kind: Pants(PlateGreen0),
+            kind: Pants("PlateGreen0"),
             stats: (
                 protection: Normal(16.0),
             ),
diff --git a/assets/common/items/armor/pants/steel_0.ron b/assets/common/items/armor/pants/steel_0.ron
index 7349351884..4cf9e17498 100644
--- a/assets/common/items/armor/pants/steel_0.ron
+++ b/assets/common/items/armor/pants/steel_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Greaves forged from steel.",
     kind: Armor(
         (
-            kind: Pants(Steel0),
+            kind: Pants("Steel0"),
             stats: (
                 protection: Normal(20.0),
             ),
diff --git a/assets/common/items/armor/pants/twig.ron b/assets/common/items/armor/pants/twig.ron
index 8dfa916027..1c8cd3de0c 100644
--- a/assets/common/items/armor/pants/twig.ron
+++ b/assets/common/items/armor/pants/twig.ron
@@ -3,7 +3,7 @@ Item(
     description: "Pants woven from twigs. Chafey!",
     kind: Armor(
         (
-            kind: Pants(Twig),
+            kind: Pants("Twig"),
             stats: (
                 protection: Normal(12.0),
             ),
diff --git a/assets/common/items/armor/pants/twigsflowers.ron b/assets/common/items/armor/pants/twigsflowers.ron
index 2af4112492..17fa75baac 100644
--- a/assets/common/items/armor/pants/twigsflowers.ron
+++ b/assets/common/items/armor/pants/twigsflowers.ron
@@ -3,7 +3,7 @@ Item(
     description: "Pants woven from twigs and flowers. Fragrant!",
     kind: Armor(
         (
-            kind: Pants(Twigsflowers),
+            kind: Pants("Twigsflowers"),
             stats: (
                 protection: Normal(12.0),
             ),
diff --git a/assets/common/items/armor/pants/twigsleaves.ron b/assets/common/items/armor/pants/twigsleaves.ron
index 14065ef14c..c2f4564a7a 100644
--- a/assets/common/items/armor/pants/twigsleaves.ron
+++ b/assets/common/items/armor/pants/twigsleaves.ron
@@ -3,7 +3,7 @@ Item(
     description: "Pants woven from twigs and leaves. Slightly less chafey than the twig pants!",
     kind: Armor(
         (
-            kind: Pants(Twigsleaves),
+            kind: Pants("Twigsleaves"),
             stats: (
                 protection: Normal(12.0),
             ),
diff --git a/assets/common/items/armor/pants/worker_blue_0.ron b/assets/common/items/armor/pants/worker_blue_0.ron
index bd9f2a7916..0d0a52bc58 100644
--- a/assets/common/items/armor/pants/worker_blue_0.ron
+++ b/assets/common/items/armor/pants/worker_blue_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Pants used by a farmer, until recently.",
     kind: Armor(
         (
-            kind: Pants(WorkerBlue0),
+            kind: Pants("WorkerBlue0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/ring/ring_0.ron b/assets/common/items/armor/ring/ring_0.ron
index daa0914bbd..fbb464ef74 100644
--- a/assets/common/items/armor/ring/ring_0.ron
+++ b/assets/common/items/armor/ring/ring_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Barely fits your finger.",
     kind: Armor(
         (
-            kind: Ring(Ring0),
+            kind: Ring("Ring0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/shoulder/assassin.ron
index a3dbee15aa..dcdc6eedc1 100644
--- a/assets/common/items/armor/shoulder/assassin.ron
+++ b/assets/common/items/armor/shoulder/assassin.ron
@@ -3,7 +3,7 @@ Item(
     description: "Only the best for a member of the creed.",
     kind: Armor(
         (
-            kind: Shoulder(Assassin),
+            kind: Shoulder("Assassin"),
             stats: (
                 protection: Normal(3.0),
             ),
diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/shoulder/cloth_blue_0.ron
index 432ae4af55..30a8d609ca 100644
--- a/assets/common/items/armor/shoulder/cloth_blue_0.ron
+++ b/assets/common/items/armor/shoulder/cloth_blue_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A warm coat.",
     kind: Armor(
         (
-            kind: Shoulder(ClothBlue0),
+            kind: Shoulder("ClothBlue0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/shoulder/cloth_blue_1.ron b/assets/common/items/armor/shoulder/cloth_blue_1.ron
index d435fc8ebf..4cd8b91535 100644
--- a/assets/common/items/armor/shoulder/cloth_blue_1.ron
+++ b/assets/common/items/armor/shoulder/cloth_blue_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Simple shoulderpads made from blue cloth.",
     kind: Armor(
         (
-            kind: Shoulder(ClothBlue1),
+            kind: Shoulder("ClothBlue1"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/shoulder/cloth_green_0.ron
index d9eaa35359..c9c89d70e2 100644
--- a/assets/common/items/armor/shoulder/cloth_green_0.ron
+++ b/assets/common/items/armor/shoulder/cloth_green_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A warm coat.",
     kind: Armor(
         (
-            kind: Shoulder(ClothGreen0),
+            kind: Shoulder("ClothGreen0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/shoulder/cloth_purple_0.ron
index 10a73ef105..8cede44f9d 100644
--- a/assets/common/items/armor/shoulder/cloth_purple_0.ron
+++ b/assets/common/items/armor/shoulder/cloth_purple_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A warm coat.",
     kind: Armor(
         (
-            kind: Shoulder(ClothPurple0),
+            kind: Shoulder("ClothPurple0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron
index aa1125a7ac..5a90f84f13 100644
--- a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron
+++ b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Shoulder(CultistBlue),
+            kind: Shoulder("CultistBlue"),
             stats: (
                 protection: Normal(18.0),
             ),
diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron
index 52953b9bdb..ca034b2da3 100644
--- a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron
+++ b/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Shoulder(CultistPurple),
+            kind: Shoulder("CultistPurple"),
             stats: (
                 protection: Normal(18.0),
             ),
diff --git a/assets/common/items/armor/shoulder/druidshoulder.ron b/assets/common/items/armor/shoulder/druidshoulder.ron
index 7f88373304..10b91f0c77 100644
--- a/assets/common/items/armor/shoulder/druidshoulder.ron
+++ b/assets/common/items/armor/shoulder/druidshoulder.ron
@@ -3,7 +3,7 @@ Item(
     description: "Forged for protectors of the wild.",
     kind: Armor(
         (
-            kind: Shoulder(DruidShoulder),
+            kind: Shoulder("DruidShoulder"),
             stats: (
                 protection: Normal(3.0),
             ),
diff --git a/assets/common/items/armor/shoulder/iron_spikes.ron b/assets/common/items/armor/shoulder/iron_spikes.ron
index a253e7a276..25a9d616ff 100644
--- a/assets/common/items/armor/shoulder/iron_spikes.ron
+++ b/assets/common/items/armor/shoulder/iron_spikes.ron
@@ -3,7 +3,7 @@ Item(
     description: "Iron shoulder pads with spikes attached.",
     kind: Armor(
         (
-            kind: Shoulder(IronSpikes),
+            kind: Shoulder("IronSpikes"),
             stats: (
                 protection: Normal(12.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_0.ron b/assets/common/items/armor/shoulder/leather_0.ron
index bbdc133063..00f2d48814 100644
--- a/assets/common/items/armor/shoulder/leather_0.ron
+++ b/assets/common/items/armor/shoulder/leather_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Shoulder pads made of leather.",
     kind: Armor(
         (
-            kind: Shoulder(Leather0),
+            kind: Shoulder("Leather0"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_1.ron b/assets/common/items/armor/shoulder/leather_1.ron
index 92c9047c26..a5f2219657 100644
--- a/assets/common/items/armor/shoulder/leather_1.ron
+++ b/assets/common/items/armor/shoulder/leather_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Swift like the wind.",
     kind: Armor(
         (
-            kind: Shoulder(Leather1),
+            kind: Shoulder("Leather1"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_2.ron b/assets/common/items/armor/shoulder/leather_2.ron
index 2a8531895e..4fc916ce73 100644
--- a/assets/common/items/armor/shoulder/leather_2.ron
+++ b/assets/common/items/armor/shoulder/leather_2.ron
@@ -3,7 +3,7 @@ Item(
     description: "A simple shoulder pad made of leather.",
     kind: Armor(
         (
-            kind: Shoulder(Leather2),
+            kind: Shoulder("Leather2"),
             stats: (
                 protection: Normal(6.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_iron_0.ron b/assets/common/items/armor/shoulder/leather_iron_0.ron
index 6a26e9c7c5..bacff107bf 100644
--- a/assets/common/items/armor/shoulder/leather_iron_0.ron
+++ b/assets/common/items/armor/shoulder/leather_iron_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Robust spaulders made from iron and leather.",
     kind: Armor(
         (
-            kind: Shoulder(IronLeather0),
+            kind: Shoulder("IronLeather0"),
             stats: (
                 protection: Normal(9.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_iron_1.ron b/assets/common/items/armor/shoulder/leather_iron_1.ron
index 2f2bc043fa..9b9f241735 100644
--- a/assets/common/items/armor/shoulder/leather_iron_1.ron
+++ b/assets/common/items/armor/shoulder/leather_iron_1.ron
@@ -3,7 +3,7 @@ Item(
     description: "Robust spaulders made from iron and leather.",
     kind: Armor(
         (
-            kind: Shoulder(IronLeather1),
+            kind: Shoulder("IronLeather1"),
             stats: (
                 protection: Normal(9.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_iron_2.ron b/assets/common/items/armor/shoulder/leather_iron_2.ron
index 653597c82e..30d8913828 100644
--- a/assets/common/items/armor/shoulder/leather_iron_2.ron
+++ b/assets/common/items/armor/shoulder/leather_iron_2.ron
@@ -3,7 +3,7 @@ Item(
     description: "Robust spaulders made from iron and leather.",
     kind: Armor(
         (
-            kind: Shoulder(IronLeather2),
+            kind: Shoulder("IronLeather2"),
             stats: (
                 protection: Normal(9.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_iron_3.ron b/assets/common/items/armor/shoulder/leather_iron_3.ron
index fb0eb45951..9443680196 100644
--- a/assets/common/items/armor/shoulder/leather_iron_3.ron
+++ b/assets/common/items/armor/shoulder/leather_iron_3.ron
@@ -3,7 +3,7 @@ Item(
     description: "Robust spaulders made from iron and leather.",
     kind: Armor(
         (
-            kind: Shoulder(IronLeather3),
+            kind: Shoulder("IronLeather3"),
             stats: (
                 protection: Normal(9.0),
             ),
diff --git a/assets/common/items/armor/shoulder/leather_strips.ron b/assets/common/items/armor/shoulder/leather_strips.ron
index fa0e176e2b..08c57ff11c 100644
--- a/assets/common/items/armor/shoulder/leather_strips.ron
+++ b/assets/common/items/armor/shoulder/leather_strips.ron
@@ -3,7 +3,7 @@ Item(
     description: "Shoulder wraps made from leather strips.",
     kind: Armor(
         (
-            kind: Shoulder(LeatherStrips),
+            kind: Shoulder("LeatherStrips"),
             stats: (
                 protection: Normal(4.0),
             ),
diff --git a/assets/common/items/armor/shoulder/plate_0.ron b/assets/common/items/armor/shoulder/plate_0.ron
index 54c7fa4dbf..b8472676ae 100644
--- a/assets/common/items/armor/shoulder/plate_0.ron
+++ b/assets/common/items/armor/shoulder/plate_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Shoulderguards forged from iron.",
     kind: Armor(
         (
-            kind: Shoulder(Plate0),
+            kind: Shoulder("Plate0"),
             stats: (
                 protection: Normal(12.0),
             ),
diff --git a/assets/common/items/armor/shoulder/steel_0.ron b/assets/common/items/armor/shoulder/steel_0.ron
index 0ccd4a907a..5b30394d20 100644
--- a/assets/common/items/armor/shoulder/steel_0.ron
+++ b/assets/common/items/armor/shoulder/steel_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "A simple shoulder pad made of steel.",
     kind: Armor(
         (
-            kind: Shoulder(Steel0),
+            kind: Shoulder("Steel0"),
             stats: (
                 protection: Normal(15.0),
             ),
diff --git a/assets/common/items/armor/shoulder/twigs.ron b/assets/common/items/armor/shoulder/twigs.ron
index 65995c6699..03a1531fd2 100644
--- a/assets/common/items/armor/shoulder/twigs.ron
+++ b/assets/common/items/armor/shoulder/twigs.ron
@@ -3,7 +3,7 @@ Item(
     description: "Spaulders made from tightly tied twigs.",
     kind: Armor(
         (
-            kind: Shoulder(TwiggyShoulder),
+            kind: Shoulder("TwiggyShoulder"),
             stats: (
                 protection: Normal(9.0),
             ),
diff --git a/assets/common/items/armor/shoulder/twigsflowers.ron b/assets/common/items/armor/shoulder/twigsflowers.ron
index e8f2fecfe2..6fd96cf963 100644
--- a/assets/common/items/armor/shoulder/twigsflowers.ron
+++ b/assets/common/items/armor/shoulder/twigsflowers.ron
@@ -3,7 +3,7 @@ Item(
     description: "Flowery, leafy spaulders.",
     kind: Armor(
         (
-            kind: Shoulder(FlowerShoulder),
+            kind: Shoulder("FlowerShoulder"),
             stats: (
                 protection: Normal(9.0),
             ),
diff --git a/assets/common/items/armor/shoulder/twigsleaves.ron b/assets/common/items/armor/shoulder/twigsleaves.ron
index 9e87f878f5..a246c6db2c 100644
--- a/assets/common/items/armor/shoulder/twigsleaves.ron
+++ b/assets/common/items/armor/shoulder/twigsleaves.ron
@@ -3,7 +3,7 @@ Item(
     description: "Spaulders made from tied twigs and leaves.",
     kind: Armor(
         (
-            kind: Shoulder(LeafyShoulder),
+            kind: Shoulder("LeafyShoulder"),
             stats: (
                 protection: Normal(9.0),
             ),
diff --git a/assets/common/items/armor/starter/rugged_chest.ron b/assets/common/items/armor/starter/rugged_chest.ron
index 2ad170a8ae..a3ff4e6a74 100644
--- a/assets/common/items/armor/starter/rugged_chest.ron
+++ b/assets/common/items/armor/starter/rugged_chest.ron
@@ -3,7 +3,7 @@ Item(
     description: "Smells like Adventure.",
     kind: Armor(
         (
-            kind: Chest(Rugged0),
+            kind: Chest("Rugged0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/starter/rugged_pants.ron b/assets/common/items/armor/starter/rugged_pants.ron
index 3b46eb61ba..926f336c9f 100644
--- a/assets/common/items/armor/starter/rugged_pants.ron
+++ b/assets/common/items/armor/starter/rugged_pants.ron
@@ -3,7 +3,7 @@ Item(
     description: "They remind you of the old days.",
     kind: Armor(
         (
-            kind: Pants(Rugged0),
+            kind: Pants("Rugged0"),
             stats: (
                 protection: Normal(1.0),
             ),
diff --git a/assets/common/items/armor/starter/sandals_0.ron b/assets/common/items/armor/starter/sandals_0.ron
index cbfd3b4805..156b7db23e 100644
--- a/assets/common/items/armor/starter/sandals_0.ron
+++ b/assets/common/items/armor/starter/sandals_0.ron
@@ -3,7 +3,7 @@ Item(
     description: "Loyal companions.",
     kind: Armor(
         (
-            kind: Foot(Sandal0),
+            kind: Foot("Sandal0"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/armor/tabard/admin.ron b/assets/common/items/armor/tabard/admin.ron
index 665541e195..feede58206 100644
--- a/assets/common/items/armor/tabard/admin.ron
+++ b/assets/common/items/armor/tabard/admin.ron
@@ -3,7 +3,7 @@ Item(
     description: "With great power comes\ngreat responsibility.",
     kind: Armor(
         (
-            kind: Tabard(Admin),
+            kind: Tabard("Admin"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/common/items/debug/admin.ron b/assets/common/items/debug/admin.ron
index 433e9c0ecc..cf94cac904 100644
--- a/assets/common/items/debug/admin.ron
+++ b/assets/common/items/debug/admin.ron
@@ -3,7 +3,7 @@ Item(
     description: "With great power comes\ngreat responsibility.",
     kind: Armor(
         (
-            kind: Tabard(Admin),
+            kind: Tabard("Admin"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/debug/admin_back.ron b/assets/common/items/debug/admin_back.ron
index d491343bbf..e93a00e261 100644
--- a/assets/common/items/debug/admin_back.ron
+++ b/assets/common/items/debug/admin_back.ron
@@ -3,7 +3,7 @@ Item(
     description: "With great power comes\ngreat responsibility.",
     kind: Armor(
         (
-            kind: Back(Admin),
+            kind: Back("Admin"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/debug/cultist_belt.ron b/assets/common/items/debug/cultist_belt.ron
index 648c2a5adb..ee1147c0b4 100644
--- a/assets/common/items/debug/cultist_belt.ron
+++ b/assets/common/items/debug/cultist_belt.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Belt(Cultist),
+            kind: Belt("Cultist"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/debug/cultist_boots.ron b/assets/common/items/debug/cultist_boots.ron
index 5a130430be..146034afc8 100644
--- a/assets/common/items/debug/cultist_boots.ron
+++ b/assets/common/items/debug/cultist_boots.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Foot(Cultist),
+            kind: Foot("Cultist"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/debug/cultist_chest_blue.ron b/assets/common/items/debug/cultist_chest_blue.ron
index 7ae1a9f3ab..245855631d 100644
--- a/assets/common/items/debug/cultist_chest_blue.ron
+++ b/assets/common/items/debug/cultist_chest_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Chest(CultistBlue),
+            kind: Chest("CultistBlue"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/debug/cultist_hands_blue.ron b/assets/common/items/debug/cultist_hands_blue.ron
index e9955b2a23..21ddf151b8 100644
--- a/assets/common/items/debug/cultist_hands_blue.ron
+++ b/assets/common/items/debug/cultist_hands_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Hand(CultistBlue),
+            kind: Hand("CultistBlue"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/debug/cultist_legs_blue.ron b/assets/common/items/debug/cultist_legs_blue.ron
index 4ab7fa5119..b3bf65bf22 100644
--- a/assets/common/items/debug/cultist_legs_blue.ron
+++ b/assets/common/items/debug/cultist_legs_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Pants(CultistBlue),
+            kind: Pants("CultistBlue"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/debug/cultist_shoulder_blue.ron b/assets/common/items/debug/cultist_shoulder_blue.ron
index 92c1ff5092..096df2ad5d 100644
--- a/assets/common/items/debug/cultist_shoulder_blue.ron
+++ b/assets/common/items/debug/cultist_shoulder_blue.ron
@@ -3,7 +3,7 @@ Item(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Shoulder(CultistBlue),
+            kind: Shoulder("CultistBlue"),
             stats: (
                 protection: Invincible,
             ),
diff --git a/assets/common/items/testing/test_boots.ron b/assets/common/items/testing/test_boots.ron
index 405cd4d7c9..d317aeff25 100644
--- a/assets/common/items/testing/test_boots.ron
+++ b/assets/common/items/testing/test_boots.ron
@@ -3,7 +3,7 @@ Item(
     description: "Hopefully this test doesn't break!",
     kind: Armor(
         (
-            kind: Foot(Dark),
+            kind: Foot("Dark"),
             stats: (
                 protection: Normal(0.0),
             ),
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index b352dd9655..478a908f27 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -568,481 +568,481 @@
     ),
     // Armor
     // Starter Parts
-    Armor(Foot(Sandal0)): VoxTrans(
+    Armor(Foot("Sandal0")): VoxTrans(
         "voxel.armor.foot.cloth_sandals",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Pants(Rugged0)): VoxTrans(
+    Armor(Pants("Rugged0")): VoxTrans(
         "voxel.armor.pants.rugged-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(Rugged0)): VoxTrans(
+    Armor(Chest("Rugged0")): VoxTrans(
         "voxel.armor.chest.rugged-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Cultist Clothing
-    Armor(Chest(CultistPurple)): VoxTrans(
+    Armor(Chest("CultistPurple")): VoxTrans(
         "voxel.armor.chest.cultist",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(CultistPurple)): VoxTrans(
+    Armor(Pants("CultistPurple")): VoxTrans(
         "voxel.armor.pants.cultist",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Cultist)): VoxTrans(
+    Armor(Belt("Cultist")): VoxTrans(
         "voxel.armor.belt.cultist",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot(Cultist)): VoxTrans(
+    Armor(Foot("Cultist")): VoxTrans(
         "voxel.armor.foot.cultist",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(CultistPurple)): VoxTrans(
+    Armor(Hand("CultistPurple")): VoxTrans(
         "voxel.armor.hand.cultist_right",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(CultistPurple)): VoxTrans(
+    Armor(Shoulder("CultistPurple")): VoxTrans(
         "voxel.armor.shoulder.cultist_right",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(CultistBlue)): VoxTrans(
+    Armor(Chest("CultistBlue")): VoxTrans(
         "voxel.armor.chest.cultist",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(CultistBlue)): VoxTrans(
+    Armor(Pants("CultistBlue")): VoxTrans(
         "voxel.armor.pants.cultist",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Hand(CultistBlue)): VoxTrans(
+    Armor(Hand("CultistBlue")): VoxTrans(
         "voxel.armor.hand.cultist_right",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(CultistBlue)): VoxTrans(
+    Armor(Shoulder("CultistBlue")): VoxTrans(
         "voxel.armor.shoulder.cultist_right",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
      // Druid Set
-    Armor(Chest(Druid)): VoxTrans(
+    Armor(Chest("Druid")): VoxTrans(
         "voxel.armor.chest.druid",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Druid)): VoxTrans(
+    Armor(Pants("Druid")): VoxTrans(
         "voxel.armor.pants.druid",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Druid)): VoxTrans(
+    Armor(Belt("Druid")): VoxTrans(
         "voxel.armor.belt.druid",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot(Druid)): VoxTrans(
+    Armor(Foot("Druid")): VoxTrans(
         "voxel.armor.foot.druid",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Druid)): VoxTrans(
+    Armor(Hand("Druid")): VoxTrans(
         "voxel.armor.hand.druid_right",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(DruidShoulder)): VoxTrans(
+    Armor(Shoulder("DruidShoulder")): VoxTrans(
         "voxel.armor.shoulder.druid_right",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Villager Clothing
-    Armor(Pants(WorkerBlue0)): VoxTrans(
+    Armor(Pants("WorkerBlue0")): VoxTrans(
         "voxel.armor.pants.worker_blue-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerGreen0)): VoxTrans(
+    Armor(Chest("WorkerGreen0")): VoxTrans(
         "voxel.armor.chest.worker_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerGreen1)): VoxTrans(
+    Armor(Chest("WorkerGreen1")): VoxTrans(
         "voxel.armor.chest.shirt_white-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerRed0)): VoxTrans(
+    Armor(Chest("WorkerRed0")): VoxTrans(
         "voxel.armor.chest.worker_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerRed1)): VoxTrans(
+    Armor(Chest("WorkerRed1")): VoxTrans(
         "voxel.armor.chest.shirt_white-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerPurple0)): VoxTrans(
+    Armor(Chest("WorkerPurple0")): VoxTrans(
         "voxel.armor.chest.worker_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerPurple1)): VoxTrans(
+    Armor(Chest("WorkerPurple1")): VoxTrans(
         "voxel.armor.chest.shirt_white-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerYellow0)): VoxTrans(
+    Armor(Chest("WorkerYellow0")): VoxTrans(
         "voxel.armor.chest.worker_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerYellow1)): VoxTrans(
+    Armor(Chest("WorkerYellow1")): VoxTrans(
         "voxel.armor.chest.shirt_white-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerOrange0)): VoxTrans(
+    Armor(Chest("WorkerOrange0")): VoxTrans(
         "voxel.armor.chest.worker_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest(WorkerOrange1)): VoxTrans(
+    Armor(Chest("WorkerOrange1")): VoxTrans(
         "voxel.armor.chest.shirt_white-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Assassin Set
-    Armor(Chest(Assassin)): VoxTrans(
+    Armor(Chest("Assassin")): VoxTrans(
         "voxel.armor.chest.assa",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Assassin)): VoxTrans(
+    Armor(Pants("Assassin")): VoxTrans(
         "voxel.armor.pants.assa",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Assassin)): VoxTrans(
+    Armor(Belt("Assassin")): VoxTrans(
         "voxel.armor.belt.assa",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(Assassin)): VoxTrans(
+    Armor(Foot("Assassin")): VoxTrans(
         "voxel.armor.foot.assa",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Assassin)): VoxTrans(
+    Armor(Hand("Assassin")): VoxTrans(
         "voxel.armor.hand.assa_right",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(Assassin)): VoxTrans(
+    Armor(Shoulder("Assassin")): VoxTrans(
         "voxel.armor.shoulder.assa_right",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Starting Armor - Plate
-    Armor(Chest(PlateGreen0)): VoxTrans(
+    Armor(Chest("PlateGreen0")): VoxTrans(
         "voxel.armor.chest.plate_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(PlateGreen0)): VoxTrans(
+    Armor(Pants("PlateGreen0")): VoxTrans(
         "voxel.armor.pants.plate_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Plate0)): VoxTrans(
+    Armor(Belt("Plate0")): VoxTrans(
         "voxel.armor.belt.plate-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(Plate0)): VoxTrans(
+    Armor(Foot("Plate0")): VoxTrans(
         "voxel.armor.foot.plate-0",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Plate0)): VoxTrans(
+    Armor(Hand("Plate0")): VoxTrans(
         "voxel.armor.hand.plate_right-0",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(Plate0)): VoxTrans(
+    Armor(Shoulder("Plate0")): VoxTrans(
         "voxel.armor.shoulder.plate_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Steel0 Armor
-    Armor(Chest(Steel0)): VoxTrans(
+    Armor(Chest("Steel0")): VoxTrans(
         "voxel.armor.chest.steel-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Steel0)): VoxTrans(
+    Armor(Pants("Steel0")): VoxTrans(
         "voxel.armor.pants.steel-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Steel0)): VoxTrans(
+    Armor(Belt("Steel0")): VoxTrans(
         "voxel.armor.belt.steel-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(Steel0)): VoxTrans(
+    Armor(Foot("Steel0")): VoxTrans(
         "voxel.armor.foot.steel-0",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Steel0)): VoxTrans(
+    Armor(Hand("Steel0")): VoxTrans(
         "voxel.armor.hand.steel_right-0",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-     Armor(Shoulder(Steel0)): VoxTrans(
+     Armor(Shoulder("Steel0")): VoxTrans(
         "voxel.armor.shoulder.steel_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Leather0 Armor
-    Armor(Chest(Leather0)): VoxTrans(
+    Armor(Chest("Leather0")): VoxTrans(
         "voxel.armor.chest.leather-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Leather0)): VoxTrans(
+    Armor(Pants("Leather0")): VoxTrans(
         "voxel.armor.pants.leather-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Leather0)): VoxTrans(
+    Armor(Belt("Leather0")): VoxTrans(
         "voxel.armor.belt.leather-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(Leather0)): VoxTrans(
+    Armor(Foot("Leather0")): VoxTrans(
         "voxel.armor.foot.leather-0",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Leather0)): VoxTrans(
+    Armor(Hand("Leather0")): VoxTrans(
         "voxel.armor.hand.leather_right-0",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-     Armor(Shoulder(Leather0)): VoxTrans(
+     Armor(Shoulder("Leather0")): VoxTrans(
         "voxel.armor.shoulder.leather_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Leather1 Armor
-    Armor(Shoulder(Leather1)): VoxTrans(
+    Armor(Shoulder("Leather1")): VoxTrans(
         "voxel.armor.shoulder.leather_right-1",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Leather2 Armor
-    Armor(Chest(Leather2)): VoxTrans(
+    Armor(Chest("Leather2")): VoxTrans(
         "voxel.armor.chest.leather-2",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Leather2)): VoxTrans(
+    Armor(Pants("Leather2")): VoxTrans(
         "voxel.armor.pants.leather-2",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Leather2)): VoxTrans(
+    Armor(Belt("Leather2")): VoxTrans(
         "voxel.armor.belt.leather-2",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(Leather2)): VoxTrans(
+    Armor(Foot("Leather2")): VoxTrans(
         "voxel.armor.foot.leather-2",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Leather2)): VoxTrans(
+    Armor(Hand("Leather2")): VoxTrans(
         "voxel.armor.hand.leather_right-2",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-     Armor(Shoulder(Leather2)): VoxTrans(
+     Armor(Shoulder("Leather2")): VoxTrans(
         "voxel.armor.shoulder.leather_right-2",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Linen Cloth
-    Armor(Chest(ClothBlue0)): VoxTrans(
+    Armor(Chest("ClothBlue0")): VoxTrans(
         "voxel.armor.chest.cloth_blue-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(ClothBlue0)): VoxTrans(
+    Armor(Pants("ClothBlue0")): VoxTrans(
         "voxel.armor.pants.cloth_blue-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(ClothBlue0)): VoxTrans(
+    Armor(Belt("ClothBlue0")): VoxTrans(
         "voxel.armor.belt.cloth_blue-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(ClothBlue0)): VoxTrans(
+    Armor(Foot("ClothBlue0")): VoxTrans(
         "voxel.armor.foot.cloth_blue-0",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(ClothBlue0)): VoxTrans(
+    Armor(Hand("ClothBlue0")): VoxTrans(
         "voxel.armor.hand.cloth_blue_right-0",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(ClothBlue0)): VoxTrans(
+    Armor(Shoulder("ClothBlue0")): VoxTrans(
         "voxel.armor.shoulder.cloth_blue_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //////////////
-    Armor(Chest(ClothGreen0)): VoxTrans(
+    Armor(Chest("ClothGreen0")): VoxTrans(
         "voxel.armor.chest.cloth_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(ClothGreen0)): VoxTrans(
+    Armor(Pants("ClothGreen0")): VoxTrans(
         "voxel.armor.pants.cloth_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(ClothGreen0)): VoxTrans(
+    Armor(Belt("ClothGreen0")): VoxTrans(
         "voxel.armor.belt.cloth_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(ClothGreen0)): VoxTrans(
+    Armor(Foot("ClothGreen0")): VoxTrans(
         "voxel.armor.foot.cloth_green-0",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(ClothGreen0)): VoxTrans(
+    Armor(Hand("ClothGreen0")): VoxTrans(
         "voxel.armor.hand.cloth_green_right-0",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(ClothGreen0)): VoxTrans(
+    Armor(Shoulder("ClothGreen0")): VoxTrans(
         "voxel.armor.shoulder.cloth_green_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-     Armor(Shoulder(ClothGreen0)): VoxTrans(
+     Armor(Shoulder("ClothGreen0")): VoxTrans(
         "voxel.armor.shoulder.cloth_green_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //////
-    Armor(Chest(ClothPurple0)): VoxTrans(
+    Armor(Chest("ClothPurple0")): VoxTrans(
         "voxel.armor.chest.cloth_purple-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(ClothPurple0)): VoxTrans(
+    Armor(Pants("ClothPurple0")): VoxTrans(
         "voxel.armor.pants.cloth_purple-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(ClothPurple0)): VoxTrans(
+    Armor(Belt("ClothPurple0")): VoxTrans(
         "voxel.armor.belt.cloth_purple-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot(ClothPurple0)): VoxTrans(
+    Armor(Foot("ClothPurple0")): VoxTrans(
         "voxel.armor.foot.cloth_purple-0",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(ClothPurple0)): VoxTrans(
+    Armor(Hand("ClothPurple0")): VoxTrans(
         "voxel.armor.hand.cloth_purple_right-0",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(ClothPurple0)): VoxTrans(
+    Armor(Shoulder("ClothPurple0")): VoxTrans(
         "voxel.armor.shoulder.cloth_purple_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-     Armor(Shoulder(ClothBlue1)): VoxTrans(
+     Armor(Shoulder("ClothBlue1")): VoxTrans(
         "voxel.armor.shoulder.cloth_blue_right-1",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-     Armor(Shoulder(IronSpikes)): VoxTrans(
+     Armor(Shoulder("IronSpikes")): VoxTrans(
         "voxel.armor.shoulder.iron_spikes_right",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-     Armor(Shoulder(IronLeather3)): VoxTrans(
+     Armor(Shoulder("IronLeather3")): VoxTrans(
         "voxel.armor.shoulder.leather_iron_right-3",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-     Armor(Shoulder(IronLeather2)): VoxTrans(
+     Armor(Shoulder("IronLeather2")): VoxTrans(
         "voxel.armor.shoulder.leather_iron_right-2",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    Armor(Shoulder(IronLeather1)): VoxTrans(
+    Armor(Shoulder("IronLeather1")): VoxTrans(
         "voxel.armor.shoulder.leather_iron_right-1",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    Armor(Shoulder(IronLeather0)): VoxTrans(
+    Armor(Shoulder("IronLeather0")): VoxTrans(
         "voxel.armor.shoulder.leather_iron_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    Armor(Shoulder(LeatherStrips)): VoxTrans(
+    Armor(Shoulder("LeatherStrips")): VoxTrans(
         "voxel.armor.shoulder.leather_strips_right",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    Armor(Foot(JackalopeSlips)): VoxTrans(
+    Armor(Foot("JackalopeSlips")): VoxTrans(
         "voxel.armor.foot.jackalope_slippers",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     //Twig Set
-    Armor(Chest(Twig)): VoxTrans(
+    Armor(Chest("Twig")): VoxTrans(
         "voxel.armor.chest.twigs_chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Twig)): VoxTrans(
+    Armor(Pants("Twig")): VoxTrans(
         "voxel.armor.pants.twigs_pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Twig)): VoxTrans(
+    Armor(Belt("Twig")): VoxTrans(
         "voxel.armor.belt.twigs_belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot(Twig)): VoxTrans(
+    Armor(Foot("Twig")): VoxTrans(
         "voxel.armor.foot.twigs_foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Twig)): VoxTrans(
+    Armor(Hand("Twig")): VoxTrans(
         "voxel.armor.hand.twigs_glove_right",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(TwiggyShoulder)): VoxTrans(
+    Armor(Shoulder("TwiggyShoulder")): VoxTrans(
         "voxel.armor.shoulder.twigs_right",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
         ),
     //TwigsLeaves Set
-    Armor(Chest(Twigsleaves)): VoxTrans(
+    Armor(Chest("Twigsleaves")): VoxTrans(
         "voxel.armor.chest.twigsleaves_chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Twigsleaves)): VoxTrans(
+    Armor(Pants("Twigsleaves")): VoxTrans(
         "voxel.armor.pants.twigsleaves_pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Twigsleaves)): VoxTrans(
+    Armor(Belt("Twigsleaves")): VoxTrans(
         "voxel.armor.belt.twigsleaves_belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot(Twigsleaves)): VoxTrans(
+    Armor(Foot("Twigsleaves")): VoxTrans(
         "voxel.armor.foot.twigsleaves_foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Twigsleaves)): VoxTrans(
+    Armor(Hand("Twigsleaves")): VoxTrans(
         "voxel.armor.hand.twigsleaves_glove_right",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-     Armor(Shoulder(LeafyShoulder)): VoxTrans(
+     Armor(Shoulder("LeafyShoulder")): VoxTrans(
         "voxel.armor.shoulder.twigsleaves_shoulder_right",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //TwigsFlowers Set
-    Armor(Chest(Twigsflowers)): VoxTrans(
+    Armor(Chest("Twigsflowers")): VoxTrans(
         "voxel.armor.chest.twigsflowers_chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants(Twigsflowers)): VoxTrans(
+    Armor(Pants("Twigsflowers")): VoxTrans(
         "voxel.armor.pants.twigsflowers_pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt(Twigsflowers)): VoxTrans(
+    Armor(Belt("Twigsflowers")): VoxTrans(
         "voxel.armor.belt.twigsflowers_belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot(Twigsflowers)): VoxTrans(
+    Armor(Foot("Twigsflowers")): VoxTrans(
         "voxel.armor.foot.twigsflowers_foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand(Twigsflowers)): VoxTrans(
+    Armor(Hand("Twigsflowers")): VoxTrans(
         "voxel.armor.hand.twigsflowers_glove_right",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-     Armor(Shoulder(FlowerShoulder)): VoxTrans(
+     Armor(Shoulder("FlowerShoulder")): VoxTrans(
         "voxel.armor.shoulder.twigsflowers_shoulder_right",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //misc
-     Armor(Pants(Hunting)): VoxTrans(
+     Armor(Pants("Hunting")): VoxTrans(
         "voxel.armor.pants.grayscale",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Backs
-    Armor(Back(Short0)): VoxTrans(
+    Armor(Back("Short0")): VoxTrans(
         "voxel.armor.back.short-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Back(Admin)): VoxTrans(
+    Armor(Back("Admin")): VoxTrans(
         "voxel.armor.back.admin",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Back(DungPurp0)): VoxTrans(
+    Armor(Back("DungPurp0")): VoxTrans(
         "voxel.armor.back.dung_purp-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
     // Rings
-    Armor(Ring(Ring0)): Png(
+    Armor(Ring("Ring0")): Png(
         "element.icons.ring-0",
     ),
     // Necks
-    Armor(Neck(Neck0)): Png(
+    Armor(Neck("Neck0")): Png(
         "element.icons.neck-0",
     ),
     // Tabards
-    Armor(Tabard(Admin)): Png(
+    Armor(Tabard("Admin")): Png(
         "element.icons.tabard_admin",
     ),
     // Heads
-    Armor(Head(Leather0)): VoxTrans(
+    Armor(Head("Leather0")): VoxTrans(
         "voxel.armor.head.leather-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Head(AssaMask0)): VoxTrans(
+    Armor(Head("AssaMask0")): VoxTrans(
         "voxel.armor.head.assa_mask-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
index 2cd68d083e..dcda59421c 100644
--- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
@@ -4,15 +4,15 @@
         color: None
     ),
     map: {
-      Short0: (
+      "Short0": (
           vox_spec: ("armor.back.short-0", (-5.0, -1.0, -11.0)),
           color: None
       ), 
-      Admin: (
+      "Admin": (
           vox_spec: ("armor.back.admin", (-5.0, -1.0, -11.0)),
           color: None
       ),    
-      DungPurp0: (
+      "DungPurp0": (
           vox_spec: ("armor.back.dung_purp-0", (-5.0, -1.0, -14.0)),
           color: None
       ),     
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index bfa4a8b224..1ddab8aa04 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -1,78 +1,78 @@
 ((
-    default:(
+    default: (
         vox_spec: ("armor.belt.belt_none", (-5.0, -3.5, 2.0)),
         color: None
     ),
     map: {
-        Dark:(
+        "Dark": (
             vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
             color: None
         ),
-        TurqCloth:(
+        "TurqCloth": (
             vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)),
             color: None
         ),
-         BloodCloth:(
+        "BloodCloth": (
             vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)),
             color: Some((29, 26, 33))
         ),
-        BlackCloth:(
+        "BlackCloth": (
             vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)),
             color: Some((29, 26, 33))
         ),
-        Assassin:(
+        "Assassin": (
             vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        Dark:(
+        "Dark": (
             vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
             color: None
         ),
-        Plate0:(
+        "Plate0": (
             vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        Leather0:(
+        "Leather0": (
             vox_spec: ("armor.belt.leather-0", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        ClothPurple0:(
+        "ClothPurple0": (
             vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        ClothBlue0:(
+        "ClothBlue0": (
             vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        ClothGreen0:(
+        "ClothGreen0": (
             vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        Cultist: (
+        "Cultist": (
             vox_spec: ("armor.belt.cultist", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        Leather2:(
+        "Leather2": (
             vox_spec: ("armor.belt.leather-2", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        Steel0:(
+        "Steel0": (
             vox_spec: ("armor.belt.steel-0", (-5.0, -4.5, 2.0)),
             color: None
         ),
-        Druid:(
+        "Druid": (
             vox_spec: ("armor.belt.druid", (-4.0, -3.5, -1.0)),
             color: None
         ),
-        Twig:(
+        "Twig": (
             vox_spec: ("armor.belt.twigs_belt", (-4.0, -3.5, -1.0)),
             color: None
         ),
-        Twigsleaves:(
+        "Twigsleaves": (
             vox_spec: ("armor.belt.twigsleaves_belt", (-4.0, -3.5, -1.0)),
             color: None
         ),
-        Twigsflowers:(
+        "Twigsflowers": (
             vox_spec: ("armor.belt.twigsflowers_belt", (-4.0, -3.5, -1.0)),
             color: None
         ),
diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
index 7ce400cab2..93eb3a18a7 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -4,133 +4,133 @@
         color: None
     ),
     map: {
-        Blue: (
+        "Blue": (
             vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((44, 74, 109))
         ),
-        Brown: (
+        "Brown": (
             vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((90, 49, 43))
         ),
-        Dark: (
+        "Dark": (
             vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((73, 63, 59))
         ),
-        Green: (
+        "Green": (
             vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((59, 95, 67))
         ),
-        Orange: (
+        "Orange": (
             vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((109, 58, 58))
         ),
-        Midnight: (
+        "Midnight": (
             vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((29, 26, 33))
         ),
-        Assassin: (
+        "Assassin": (
             vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        Kimono: (
+        "Kimono": (
             vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        PlateGreen0: (
+        "PlateGreen0": (
             vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        Leather0: (
+        "Leather0": (
             vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        ClothPurple0:(
+        "ClothPurple0": (
             vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
             color: None
         ),
-        ClothBlue0:(
+        "ClothBlue0": (
             vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)),
             color: None
         ),
-       ClothGreen0:(
+        "ClothGreen0": (
             vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)),
             color: None
         ),
-        Rugged0:(
+        "Rugged0": (
             vox_spec: ("armor.chest.rugged-0", (-7.0, -3.5, 2.0)),
             color: None
         ),
         // Villagers
-        WorkerGreen0:(
+        "WorkerGreen0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((88, 108, 65))
         ),
-        WorkerGreen1:(
+        "WorkerGreen1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
             color: Some((88, 108, 65))
         ),
-        WorkerRed0:(
+        "WorkerRed0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((124, 38, 46))
         ),
-        WorkerRed1:(
+        "WorkerRed1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
             color: Some((124, 38, 46))
         ),
-        WorkerPurple0:(
+        "WorkerPurple0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((64, 47, 56))
         ),  
-        WorkerPurple1:(
+        "WorkerPurple1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
             color: Some((64, 47, 56))
         ),   
-        WorkerYellow0:(
+        "WorkerYellow0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((184, 132, 40))
         ), 
-        WorkerYellow1:(
+        "WorkerYellow1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
             color: Some((184, 132, 40)) 
         ), 
-        WorkerOrange0:(
+        "WorkerOrange0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((135, 82, 67))
         ), 
-        WorkerOrange1:(
+        "WorkerOrange1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
             color: Some((135, 82, 67))
         ),      
-        Druid:(
+        "Druid": (
             vox_spec: ("armor.chest.druid", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        Twig:(
+        "Twig": (
             vox_spec: ("armor.chest.twigs_chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        Twigsleaves:(
+        "Twigsleaves": (
             vox_spec: ("armor.chest.twigsleaves_chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        Twigsflowers:(
+        "Twigsflowers": (
             vox_spec: ("armor.chest.twigsflowers_chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         // Cultists
-        CultistPurple: (
+        "CultistPurple": (
             vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
             color: Some((30, 0, 64))
         ),
-        CultistBlue: (
+        "CultistBlue": (
             vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
             color: Some((57, 81, 132))
         ),
-        Steel0:(
+        "Steel0": (
             vox_spec: ("armor.chest.steel-0", (-8.0, -4.5, 2.0)),
             color: None
         ),
-        Leather2:(
+        "Leather2": (
             vox_spec: ("armor.chest.leather-2", (-7.0, -3.5, 2.0)),
             color: None
         ),
diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
index f611272163..ca038be44d 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -4,71 +4,71 @@
         color: None
     ),
     map: {
-        Dark: (
+        "Dark": (
             vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Assassin: (
+        "Assassin": (
             vox_spec: ("armor.foot.assa", (-2.5, -3.5, -2.0)),
             color: None
         ),        
-        Jester: (
+        "Jester": (
             vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -2.0)),
             color: None
         ),
-        Plate0: (
+        "Plate0": (
             vox_spec: ("armor.foot.plate-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Leather0: (
+        "Leather0": (
             vox_spec: ("armor.foot.leather-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        ClothPurple0:(
+        "ClothPurple0": (
             vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        ClothBlue0:(
+        "ClothBlue0": (
             vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        ClothGreen0:(
+        "ClothGreen0": (
             vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Sandal0:(
+        "Sandal0": (
             vox_spec: ("armor.foot.cloth_sandals", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Cultist: (
+        "Cultist": (
             vox_spec: ("armor.foot.cultist", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Steel0:(
+        "Steel0": (
             vox_spec: ("armor.foot.steel-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Leather2:(
+        "Leather2": (
             vox_spec: ("armor.foot.leather-2", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        JackalopeSlips:(
+        "JackalopeSlips": (
             vox_spec: ("armor.foot.jackalope_slippers", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Druid:(
+        "Druid": (
             vox_spec: ("armor.foot.druid", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Twig:(
+        "Twig": (
             vox_spec: ("armor.foot.twigs_foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Twigsleaves:(
+        "Twigsleaves": (
             vox_spec: ("armor.foot.twigsleaves_foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        Twigsflowers:(
+        "Twigsflowers": (
             vox_spec: ("armor.foot.twigsflowers_foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
index ed5ce4a131..109dbace12 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -10,7 +10,7 @@
         )
     ),
     map: {
-        Assassin: (
+        "Assassin": (
             left: (
                 vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -2.5)),
                 color: None
@@ -20,7 +20,7 @@
                 color: None
             )
         ),
-        Cloth: (
+        "Cloth": (
             left: (
                 vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -2.5)),
                 color: None
@@ -30,7 +30,7 @@
                 color: None
             )
         ),
-        Plate0: (
+        "Plate0": (
             left: (
                 vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -2.5)),
                 color: None
@@ -40,7 +40,7 @@
                 color: None
             )
         ),
-        Leather0: (
+        "Leather0": (
             left: (
                 vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -2.5)),
                 color: None
@@ -50,7 +50,7 @@
                 color: None
             )
         ),
-        ClothPurple0: (
+        "ClothPurple0": (
             left: (
                 vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -2.5)),
                 color: None
@@ -60,7 +60,7 @@
                 color: None
             )
         ),
-        ClothBlue0: (
+        "ClothBlue0": (
             left: (
                 vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -2.5)),
                 color: None
@@ -70,7 +70,7 @@
                 color: None
             )
         ),
-        ClothGreen0: (
+        "ClothGreen0": (
             left: (
                 vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -2.5)),
                 color: None
@@ -80,7 +80,7 @@
                 color: None
             )
         ),
-        CultistPurple: (
+        "CultistPurple": (
             left: (
                 vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -2.5)),
                 color: Some((30, 0, 64))
@@ -90,7 +90,7 @@
                 color: Some((30, 0, 64))
             )
         ),
-        CultistBlue: (
+        "CultistBlue": (
             left: (
                 vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -2.5)),
                 color: Some((57, 81, 132))
@@ -100,7 +100,7 @@
                 color: Some((57, 81, 132))
             )
         ),
-        Steel0: (
+        "Steel0": (
             left: (
                 vox_spec: ("armor.hand.steel_left-0", (-1.5, -1.5, -2.5)),
                 color: None
@@ -110,7 +110,7 @@
                 color: None
             )
         ),
-        Leather2: (
+        "Leather2": (
             left: (
                 vox_spec: ("armor.hand.leather_left-2", (-1.5, -1.5, -2.5)),
                 color: None
@@ -120,7 +120,7 @@
                 color: None
             )
         ),
-        Druid: (
+        "Druid": (
             left: (
                 vox_spec: ("armor.hand.druid_left", (-1.5, -1.5, -2.5)),
                 color: None
@@ -130,7 +130,7 @@
                 color: None
             )
         ),
-        Twig: (
+        "Twig": (
             left: (
                 vox_spec: ("armor.hand.twigs_glove_left", (-1.5, -1.5, -2.5)),
                 color: None
@@ -140,7 +140,7 @@
                 color: None
             )
         ),
-        Twigsleaves: (
+        "Twigsleaves": (
             left: (
                 vox_spec: ("armor.hand.twigsleaves_glove_left", (-1.5, -1.5, -2.5)),
                 color: None
@@ -150,7 +150,7 @@
                 color: None
             )
         ),
-        Twigsflowers: (
+        "Twigsflowers": (
             left: (
                 vox_spec: ("armor.hand.twigsflowers_glove_left", (-1.5, -1.5, -2.5)),
                 color: None
diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
index cd784060c6..bb15cc6876 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -4,91 +4,91 @@
         color: Some((28, 66, 109))
     ),
     map: {
-        Blue: (
+        "Blue": (
             vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((28, 66, 109))
         ),
-        Brown: (
+        "Brown": (
             vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((54, 30, 26))
         ),
-        Dark: (
+        "Dark": (
             vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((24, 19, 17))
         ),
-        Hunting: (
+        "Hunting": (
             vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((49, 95, 59))
         ),
-        Orange: (
+        "Orange": (
             vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((148, 52, 33))
         ),
-        Assassin: (
+        "Assassin": (
             vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        Kimono: (
+        "Kimono": (
             vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
             color: None
         ),    
-        PlateGreen0: (
+        "PlateGreen0": (
             vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        Leather0: (
+        "Leather0": (
             vox_spec: ("armor.pants.leather-0", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        ClothPurple0:(
+        "ClothPurple0": (
             vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        ClothBlue0:(
+        "ClothBlue0": (
             vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        ClothGreen0:(
+        "ClothGreen0": (
             vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        Rugged0:(
+        "Rugged0": (
             vox_spec: ("armor.pants.rugged-0", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        WorkerBlue0:(
+        "WorkerBlue0": (
             vox_spec: ("armor.pants.worker_blue-0", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        CultistPurple: (
+        "CultistPurple": (
             vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
             color: Some((30, 0, 64))
         ),
-        CultistBlue : (
+        "CultistBlue" : (
             vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
             color: Some((57, 81, 132))
         ),
-        Steel0:(
+        "Steel0": (
             vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)),
             color: None
         ),
-        Leather2:(
+        "Leather2": (
             vox_spec: ("armor.pants.leather-2", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        Druid:(
+        "Druid": (
             vox_spec: ("armor.pants.druid", (-5.0, -3.5, -1.0)),
             color: None
         ),
-        Twig:(
+        "Twig": (
             vox_spec: ("armor.pants.twigs_pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        Twigsleaves:(
+        "Twigsleaves": (
             vox_spec: ("armor.pants.twigsleaves_pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        Twigsflowers:(
+        "Twigsflowers": (
             vox_spec: ("armor.pants.twigsflowers_pants", (-6.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 a002a0d97f..873a88adc3 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -11,7 +11,7 @@
         )
     ),
     map: {
-        Brown1: (
+        "Brown1": (
             left: (
                 vox_spec: ("armor.shoulder.brown_right", (-3.0, -3.5, 1.0)),
                 color: None
@@ -21,7 +21,7 @@
                 color: None
             )
         ),
-        Assassin: (
+        "Assassin": (
             left: (
                 vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
                 color: None
@@ -31,17 +31,7 @@
                 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
-            )
-        ),
-        Chain: (
+        "Chain": (
             left: (
                 vox_spec: ("armor.shoulder.chain_right-1", (-4.0, -3.5, 1.0)),
                 color: None
@@ -51,7 +41,7 @@
                 color: None
             )
         ),
-        Plate0: (
+        "Plate0": (
             left: (
                 vox_spec: ("armor.shoulder.plate_right-0", (-3.6, -3.5, -0.0)),
                 color: None
@@ -61,7 +51,7 @@
                 color: None
             )
         ),
-        Leather0: (
+        "Leather0": (
             left: (
                 vox_spec: ("armor.shoulder.leather_right-0", (-3.2, -3.5, 0.0)),
                 color: None
@@ -71,7 +61,7 @@
                 color: None
             )
         ),
-         Leather1: (
+        "Leather1": (
             left: (
                 vox_spec: ("armor.shoulder.leather_right-1", (-3.6, -4.5, 0.0)),
                 color: None
@@ -81,7 +71,7 @@
                 color: None
             )
         ),
-        ClothPurple0: (
+        "ClothPurple0": (
             left: (
                 vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 0.0)),
                 color: None
@@ -91,7 +81,7 @@
                 color: None
             )
         ),
-        ClothBlue0: (
+        "ClothBlue0": (
             left: (
                 vox_spec: ("armor.shoulder.cloth_blue_left-0", (-3.2, -3.5, 0.0)),
                 color: None
@@ -101,7 +91,7 @@
                 color: None
             )
         ),
-        ClothGreen0: (
+        "ClothGreen0": (
             left: (
                 vox_spec: ("armor.shoulder.cloth_green_left-0", (-3.2, -3.5, 0.0)),
                 color: None
@@ -111,7 +101,7 @@
                 color: None
             )
         ),
-        CultistPurple: (
+        "CultistPurple": (
             left: (
                 vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)),
                 color: Some((30, 0, 64))
@@ -121,7 +111,7 @@
                 color: Some((30, 0, 64))
             )
         ),
-        CultistBlue: (
+        "CultistBlue": (
             left: (
                 vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)),
                 color: Some((57, 81, 132))
@@ -131,7 +121,7 @@
                 color: Some((57, 81, 132))
             )
         ),
-        Steel0: (
+        "Steel0": (
             left: (
                 vox_spec: ("armor.shoulder.steel_left-0", (-5.0, -4.5 , 0.0)),
                 color: None
@@ -141,7 +131,7 @@
                 color: None
             )
         ),
-        Leather2: (
+        "Leather2": (
             left: (
                 vox_spec: ("armor.shoulder.leather_left-2", (-5.0, -3.8, -0.9)),
                 color: None
@@ -150,8 +140,8 @@
                 vox_spec: ("armor.shoulder.leather_right-2", (-1.0, -3.8, -0.9)),
                 color: None
             )
-            ),
-        TwiggyShoulder: (
+        ),
+        "TwiggyShoulder": (
             left: (
                 vox_spec: ("armor.shoulder.twigs_left", (-5.0, -4.5 , -1.0)),
                 color: None
@@ -160,8 +150,8 @@
                 vox_spec: ("armor.shoulder.twigs_right", (-1.0, -4.5, -1.0)),
                 color: None
             )
-            ),
-        LeafyShoulder: (
+        ),
+        "LeafyShoulder": (
             left: (
                 vox_spec: ("armor.shoulder.twigsleaves_shoulder_left", (-5.5, -5.0 , 0.0)),
                 color: None
@@ -170,8 +160,8 @@
                 vox_spec: ("armor.shoulder.twigsleaves_shoulder_right", (-1.5, -5.0, 0.0)),
                 color: None
             )
-            ),
-        FlowerShoulder: (
+        ),
+        "FlowerShoulder": (
             left: (
                 vox_spec: ("armor.shoulder.twigsflowers_shoulder_left", (-5.5, -5.0 , 0.0)),
                 color: None
@@ -180,9 +170,8 @@
                 vox_spec: ("armor.shoulder.twigsflowers_shoulder_right", (-1.5, -5.0, 0.0)),
                 color: None
             ),
-            
         ),        
-        ClothBlue1: (
+        "ClothBlue1": (
             left: (
                 vox_spec: ("armor.shoulder.cloth_blue_left-1", (-4.0, -2.5, -0.5)),
                 color: None
@@ -192,7 +181,7 @@
                 color: None
             )
         ),
-        IronSpikes: (
+        "IronSpikes": (
             left: (
                 vox_spec: ("armor.shoulder.iron_spikes_left", (-5.5, -3.8, -2.0)),
                 color: None
@@ -202,7 +191,7 @@
                 color: None
             )
         ),
-        IronLeather3: (
+        "IronLeather3": (
             left: (
                 vox_spec: ("armor.shoulder.leather_iron_left-3", (-4.0, -2.5, -1.0)),
                 color: None
@@ -212,7 +201,7 @@
                 color: None
             )
         ),
-        IronLeather2: (
+        "IronLeather2": (
             left: (
                 vox_spec: ("armor.shoulder.leather_iron_left-2", (-5.0, -2.5, -0.5)),
                 color: None
@@ -222,7 +211,7 @@
                 color: None
             )
         ),
-        IronLeather1: (
+        "IronLeather1": (
             left: (
                 vox_spec: ("armor.shoulder.leather_iron_left-1", (-5.0, -2.5, -0.5)),
                 color: None
@@ -232,7 +221,7 @@
                 color: None
             )
         ),
-        IronLeather0: (
+        "IronLeather0": (
             left: (
                 vox_spec: ("armor.shoulder.leather_iron_left-0", (-6.0, -2.5, -0.5)),
                 color: None
@@ -242,7 +231,7 @@
                 color: None
             )
         ),
-        LeatherStrips: (
+        "LeatherStrips": (
             left: (
                 vox_spec: ("armor.shoulder.leather_strips_left", (-3.0, -2.5, -2.0)),
                 color: None
@@ -252,7 +241,7 @@
                 color: None
             )
         ),      
-        DruidShoulder: (
+        "DruidShoulder": (
             left: (
                 vox_spec: ("armor.shoulder.druid_left", (-4.0, -4.5 , -3.0)),
                 color: None
diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index 56a1ad3eda..79292b797e 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -204,7 +204,7 @@ impl Loadout {
             .iter()
             .flat_map(|armor| armor.as_ref())
             .filter_map(|item| {
-                if let ItemKind::Armor(armor) = item.kind {
+                if let ItemKind::Armor(armor) = &item.kind {
                     Some(armor.get_protection())
                 } else {
                     None
diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs
index 0b8f5ff3fc..a3beb9e5af 100644
--- a/common/src/comp/inventory/item/armor.rs
+++ b/common/src/comp/inventory/item/armor.rs
@@ -1,353 +1,18 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Chest {
-    Blue = 1,
-    Brown = 2,
-    Dark = 3,
-    Green = 4,
-    Orange = 5,
-    Midnight = 6,
-    Kimono = 7,
-    Assassin = 8,
-    PlateGreen0 = 9,
-    Leather0 = 10,
-    ClothPurple0 = 11,
-    ClothBlue0 = 12,
-    ClothGreen0 = 13,
-    Rugged0 = 14,
-    WorkerGreen0 = 15,
-    WorkerGreen1 = 16,
-    WorkerRed0 = 17,
-    WorkerRed1 = 18,
-    WorkerPurple0 = 19,
-    WorkerPurple1 = 20,
-    WorkerYellow0 = 21,
-    WorkerYellow1 = 22,
-    WorkerOrange0 = 23,
-    WorkerOrange1 = 24,
-    CultistPurple = 25,
-    CultistBlue = 26,
-    Steel0 = 27,
-    Leather2 = 28,
-    Druid = 29,
-    Twig = 30,
-    Twigsleaves = 31,
-    Twigsflowers = 32,
-}
-pub const ALL_CHESTS: [Chest; 32] = [
-    Chest::Blue,
-    Chest::Brown,
-    Chest::Dark,
-    Chest::Green,
-    Chest::Orange,
-    Chest::Midnight,
-    Chest::Kimono,
-    Chest::Assassin,
-    Chest::PlateGreen0,
-    Chest::Leather0,
-    Chest::ClothPurple0,
-    Chest::ClothBlue0,
-    Chest::ClothGreen0,
-    Chest::Rugged0,
-    Chest::WorkerGreen0,
-    Chest::WorkerGreen1,
-    Chest::WorkerRed0,
-    Chest::WorkerRed1,
-    Chest::WorkerPurple0,
-    Chest::WorkerPurple1,
-    Chest::WorkerYellow0,
-    Chest::WorkerYellow1,
-    Chest::WorkerOrange0,
-    Chest::WorkerOrange1,
-    Chest::CultistPurple,
-    Chest::CultistBlue,
-    Chest::Steel0,
-    Chest::Leather2,
-    Chest::Druid,
-    Chest::Twig,
-    Chest::Twigsleaves,
-    Chest::Twigsflowers,
-];
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Belt {
-    None = 0,
-    Dark = 1,
-    TurqCloth = 2,
-    BloodCloth = 3,
-    BlackCloth = 4,
-    Assassin = 5,
-    Plate0 = 6,
-    Leather0 = 7,
-    ClothPurple0 = 8,
-    ClothBlue0 = 9,
-    ClothGreen0 = 10,
-    Cultist = 11,
-    Leather2 = 12,
-    Steel0 = 13,
-    Druid = 14,
-    Twig = 15,
-    Twigsleaves = 16,
-    Twigsflowers = 17,
-}
-
-pub const ALL_BELTS: [Belt; 18] = [
-    Belt::None,
-    Belt::Dark,
-    Belt::TurqCloth,
-    Belt::BloodCloth,
-    Belt::BlackCloth,
-    Belt::Assassin,
-    Belt::Plate0,
-    Belt::Leather0,
-    Belt::ClothPurple0,
-    Belt::ClothBlue0,
-    Belt::ClothGreen0,
-    Belt::Cultist,
-    Belt::Leather2,
-    Belt::Steel0,
-    Belt::Druid,
-    Belt::Twig,
-    Belt::Twigsleaves,
-    Belt::Twigsflowers,
-];
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Pants {
-    None = 0,
-    Blue = 1,
-    Brown = 2,
-    Dark = 3,
-    Hunting = 4,
-    Orange = 5,
-    Kimono = 6,
-    Assassin = 7,
-    PlateGreen0 = 8,
-    Leather0 = 9,
-    ClothPurple0 = 10,
-    ClothBlue0 = 11,
-    ClothGreen0 = 12,
-    Rugged0 = 13,
-    WorkerBlue0 = 14,
-    CultistPurple = 15,
-    CultistBlue = 16,
-    Steel0 = 17,
-    Leather2 = 18,
-    Druid = 19,
-    Twig = 20,
-    Twigsleaves = 21,
-    Twigsflowers = 22,
-}
-pub const ALL_PANTS: [Pants; 23] = [
-    Pants::None,
-    Pants::Blue,
-    Pants::Brown,
-    Pants::Dark,
-    Pants::Hunting,
-    Pants::Orange,
-    Pants::Kimono,
-    Pants::Assassin,
-    Pants::PlateGreen0,
-    Pants::Leather0,
-    Pants::ClothPurple0,
-    Pants::ClothBlue0,
-    Pants::ClothGreen0,
-    Pants::Rugged0,
-    Pants::WorkerBlue0,
-    Pants::CultistPurple,
-    Pants::CultistBlue,
-    Pants::Steel0,
-    Pants::Leather2,
-    Pants::Druid,
-    Pants::Twig,
-    Pants::Twigsleaves,
-    Pants::Twigsflowers,
-];
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Hand {
-    Cloth = 1,
-    Assassin = 2,
-    Plate0 = 3,
-    Leather0 = 4,
-    ClothPurple0 = 5,
-    ClothBlue0 = 6,
-    ClothGreen0 = 7,
-    CultistPurple = 8,
-    CultistBlue = 9,
-    Steel0 = 10,
-    Leather2 = 11,
-    Druid = 12,
-    Twig = 13,
-    Twigsleaves = 14,
-    Twigsflowers = 15,
-}
-pub const ALL_HANDS: [Hand; 15] = [
-    Hand::Cloth,
-    Hand::Assassin,
-    Hand::Plate0,
-    Hand::Leather0,
-    Hand::ClothPurple0,
-    Hand::ClothBlue0,
-    Hand::ClothGreen0,
-    Hand::CultistPurple,
-    Hand::CultistBlue,
-    Hand::Steel0,
-    Hand::Leather2,
-    Hand::Druid,
-    Hand::Twig,
-    Hand::Twigsleaves,
-    Hand::Twigsflowers,
-];
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Foot {
-    Dark = 1,
-    Sandal0 = 2,
-    Jester = 3,
-    Assassin = 4,
-    Plate0 = 5,
-    Leather0 = 6,
-    ClothPurple0 = 7,
-    ClothBlue0 = 8,
-    ClothGreen0 = 9,
-    Cultist = 10,
-    Steel0 = 11,
-    Leather2 = 12,
-    JackalopeSlips = 13,
-    Druid = 14,
-    Twig = 15,
-    Twigsleaves = 16,
-    Twigsflowers = 17,
-}
-
-pub const ALL_FEET: [Foot; 17] = [
-    Foot::Dark,
-    Foot::Sandal0,
-    Foot::Jester,
-    Foot::Assassin,
-    Foot::Plate0,
-    Foot::Leather0,
-    Foot::ClothPurple0,
-    Foot::ClothBlue0,
-    Foot::ClothGreen0,
-    Foot::Cultist,
-    Foot::Steel0,
-    Foot::Leather2,
-    Foot::JackalopeSlips,
-    Foot::Druid,
-    Foot::Twig,
-    Foot::Twigsleaves,
-    Foot::Twigsflowers,
-];
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Shoulder {
-    Brown1 = 1,
-    Chain = 2,
-    Assassin = 3,
-    Plate0 = 4,
-    Leather0 = 5,
-    Leather1 = 6,
-    ClothPurple0 = 7,
-    ClothBlue0 = 8,
-    ClothGreen0 = 9,
-    CultistPurple = 10,
-    CultistBlue = 11,
-    Steel0 = 12,
-    Leather2 = 13,
-    ClothBlue1 = 14,
-    IronSpikes = 15,
-    IronLeather0 = 16,
-    IronLeather1 = 17,
-    IronLeather2 = 18,
-    IronLeather3 = 19,
-    LeatherStrips = 20,
-    LeafyShoulder = 21,
-    TwiggyShoulder = 22,
-    FlowerShoulder = 23,
-    DruidShoulder = 24,
-}
-pub const ALL_SHOULDERS: [Shoulder; 24] = [
-    Shoulder::Brown1,
-    Shoulder::Chain,
-    Shoulder::Assassin,
-    Shoulder::Plate0,
-    Shoulder::Leather0,
-    Shoulder::Leather1,
-    Shoulder::ClothPurple0,
-    Shoulder::ClothBlue0,
-    Shoulder::ClothGreen0,
-    Shoulder::CultistPurple,
-    Shoulder::CultistBlue,
-    Shoulder::Steel0,
-    Shoulder::Leather2,
-    Shoulder::ClothBlue1,
-    Shoulder::IronSpikes,
-    Shoulder::IronLeather0,
-    Shoulder::IronLeather1,
-    Shoulder::IronLeather2,
-    Shoulder::IronLeather3,
-    Shoulder::LeatherStrips,
-    Shoulder::LeafyShoulder,
-    Shoulder::TwiggyShoulder,
-    Shoulder::FlowerShoulder,
-    Shoulder::DruidShoulder,
-];
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Back {
-    Short0 = 1,
-    Admin = 2,
-    DungPurp0 = 3,
-}
-pub const ALL_BACKS: [Back; 3] = [Back::Short0, Back::Admin, Back::DungPurp0];
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Ring {
-    Ring0 = 1,
-}
-pub const ALL_RINGS: [Ring; 1] = [Ring::Ring0];
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Neck {
-    Neck0 = 1,
-}
-pub const ALL_NECKS: [Neck; 1] = [Neck::Neck0];
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Head {
-    Leather0 = 1,
-    AssaMask0 = 2,
-}
-pub const ALL_HEADS: [Head; 2] = [Head::Leather0, Head::AssaMask0];
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum Tabard {
-    Admin = 1,
-}
-pub const ALL_TABARDS: [Tabard; 1] = [Tabard::Admin];
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum ArmorKind {
-    Shoulder(Shoulder),
-    Chest(Chest),
-    Belt(Belt),
-    Hand(Hand),
-    Pants(Pants),
-    Foot(Foot),
-    Back(Back),
-    Ring(Ring),
-    Neck(Neck),
-    Head(Head),
-    Tabard(Tabard),
+    Shoulder(String),
+    Chest(String),
+    Belt(String),
+    Hand(String),
+    Pants(String),
+    Foot(String),
+    Back(String),
+    Ring(String),
+    Neck(String),
+    Head(String),
+    Tabard(String),
 }
 
 impl Armor {
@@ -370,7 +35,7 @@ pub enum Protection {
     Normal(f32),
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Armor {
     pub kind: ArmorKind,
     pub stats: Stats,
diff --git a/tools/src/main.rs b/tools/src/main.rs
index c5fdde3c7d..441226b756 100644
--- a/tools/src/main.rs
+++ b/tools/src/main.rs
@@ -45,7 +45,7 @@ fn armor_stats() -> Result<(), Box<dyn Error>> {
 
                     let asset = assets::load_expect_cloned::<comp::Item>(asset_identifier);
 
-                    match asset.kind {
+                    match &asset.kind {
                         comp::item::ItemKind::Armor(armor) => {
                             let protection = match armor.get_protection() {
                                 Protection::Invincible => "Invincible".to_string(),
diff --git a/voxygen/src/hud/item_imgs.rs b/voxygen/src/hud/item_imgs.rs
index de745ff5ac..405ad05e7a 100644
--- a/voxygen/src/hud/item_imgs.rs
+++ b/voxygen/src/hud/item_imgs.rs
@@ -33,7 +33,7 @@ impl From<&Item> for ItemKey {
         match &item.kind {
             ItemKind::Tool(Tool { kind, .. }) => ItemKey::Tool(kind.clone()),
             ItemKind::Lantern(Lantern { kind, .. }) => ItemKey::Lantern(*kind),
-            ItemKind::Armor(Armor { kind, .. }) => ItemKey::Armor(*kind),
+            ItemKind::Armor(Armor { kind, .. }) => ItemKey::Armor(kind.clone()),
             ItemKind::Utility { kind, .. } => ItemKey::Utility(*kind),
             ItemKind::Consumable { kind, .. } => ItemKey::Consumable(*kind),
             ItemKind::Throwable { kind, .. } => ItemKey::Throwable(*kind),
diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs
index dd81d96e07..c1465ebd63 100644
--- a/voxygen/src/hud/util.rs
+++ b/voxygen/src/hud/util.rs
@@ -20,7 +20,7 @@ pub fn loadout_slot_text<'a>(
 
 pub fn item_text<'a>(item: &'a Item) -> (&'_ str, Cow<'a, str>) {
     let desc = match &item.kind {
-        ItemKind::Armor(armor) => Cow::Owned(armor_desc(*armor, item.description())),
+        ItemKind::Armor(armor) => Cow::Owned(armor_desc(armor.clone(), item.description())),
         ItemKind::Tool(tool) => Cow::Owned(tool_desc(tool.clone(), item.description())),
         /*ItemKind::Consumable(kind, effect, ..) => {
             Cow::Owned(consumable_desc(consumable, item.description()))
diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs
index 941d387e99..864664065e 100644
--- a/voxygen/src/scene/figure/cache.rs
+++ b/voxygen/src/scene/figure/cache.rs
@@ -64,22 +64,22 @@ impl CharacterCacheKey {
             shoulder: if let Some(ItemKind::Armor(armor)) =
                 loadout.shoulder.as_ref().map(|i| &i.kind)
             {
-                Some(armor.kind)
+                Some(armor.kind.clone())
             } else {
                 None
             },
             chest: if let Some(ItemKind::Armor(armor)) = loadout.chest.as_ref().map(|i| &i.kind) {
-                Some(armor.kind)
+                Some(armor.kind.clone())
             } else {
                 None
             },
             belt: if let Some(ItemKind::Armor(armor)) = loadout.belt.as_ref().map(|i| &i.kind) {
-                Some(armor.kind)
+                Some(armor.kind.clone())
             } else {
                 None
             },
             back: if let Some(ItemKind::Armor(armor)) = loadout.back.as_ref().map(|i| &i.kind) {
-                Some(armor.kind)
+                Some(armor.kind.clone())
             } else {
                 None
             },
@@ -91,17 +91,17 @@ impl CharacterCacheKey {
                 None
             },
             hand: if let Some(ItemKind::Armor(armor)) = loadout.hand.as_ref().map(|i| &i.kind) {
-                Some(armor.kind)
+                Some(armor.kind.clone())
             } else {
                 None
             },
             pants: if let Some(ItemKind::Armor(armor)) = loadout.pants.as_ref().map(|i| &i.kind) {
-                Some(armor.kind)
+                Some(armor.kind.clone())
             } else {
                 None
             },
             foot: if let Some(ItemKind::Armor(armor)) = loadout.foot.as_ref().map(|i| &i.kind) {
-                Some(armor.kind)
+                Some(armor.kind.clone())
             } else {
                 None
             },
diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs
index 486b94fb85..88d412eb64 100644
--- a/voxygen/src/scene/figure/load.rs
+++ b/voxygen/src/scene/figure/load.rs
@@ -11,9 +11,7 @@ use common::{
         golem::{BodyType as GBodyType, Species as GSpecies},
         humanoid::{Body, BodyType, EyeColor, Skin, Species},
         item::{
-            armor::{
-                Armor, ArmorKind, Back, Belt, Chest, Foot, Hand, Head, Pants, Shoulder, Tabard,
-            },
+            armor::{Armor, ArmorKind},
             tool::{Tool, ToolKind},
             ItemKind, Lantern, LanternKind,
         },
@@ -254,27 +252,27 @@ where
     map: HashMap<K, S>,
 }
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorShoulderSpec(ArmorVoxSpecMap<Shoulder, SidedArmorVoxSpec>);
+pub struct HumArmorShoulderSpec(ArmorVoxSpecMap<String, SidedArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorChestSpec(ArmorVoxSpecMap<Chest, ArmorVoxSpec>);
+pub struct HumArmorChestSpec(ArmorVoxSpecMap<String, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorHandSpec(ArmorVoxSpecMap<Hand, SidedArmorVoxSpec>);
+pub struct HumArmorHandSpec(ArmorVoxSpecMap<String, SidedArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorBeltSpec(ArmorVoxSpecMap<Belt, ArmorVoxSpec>);
+pub struct HumArmorBeltSpec(ArmorVoxSpecMap<String, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorBackSpec(ArmorVoxSpecMap<Back, ArmorVoxSpec>);
+pub struct HumArmorBackSpec(ArmorVoxSpecMap<String, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorPantsSpec(ArmorVoxSpecMap<Pants, ArmorVoxSpec>);
+pub struct HumArmorPantsSpec(ArmorVoxSpecMap<String, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorFootSpec(ArmorVoxSpecMap<Foot, ArmorVoxSpec>);
+pub struct HumArmorFootSpec(ArmorVoxSpecMap<String, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
 pub struct HumMainWeaponSpec(HashMap<ToolKind, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
 pub struct HumArmorLanternSpec(ArmorVoxSpecMap<LanternKind, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorHeadSpec(ArmorVoxSpecMap<Head, ArmorVoxSpec>);
+pub struct HumArmorHeadSpec(ArmorVoxSpecMap<String, ArmorVoxSpec>);
 #[derive(Serialize, Deserialize)]
-pub struct HumArmorTabardSpec(ArmorVoxSpecMap<Tabard, ArmorVoxSpec>);
+pub struct HumArmorTabardSpec(ArmorVoxSpecMap<String, ArmorVoxSpec>);
 
 impl Asset for HumArmorShoulderSpec {
     const ENDINGS: &'static [&'static str] = &["ron"];
@@ -372,7 +370,7 @@ impl HumArmorShoulderSpec {
             ..
         })) = loadout.shoulder.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&shoulder) {
+            match self.0.map.get(shoulder) {
                 Some(spec) => spec,
                 None => {
                     error!(?shoulder, "No shoulder specification exists");
@@ -454,7 +452,7 @@ impl HumArmorChestSpec {
             ..
         })) = loadout.chest.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&chest) {
+            match self.0.map.get(chest) {
                 Some(spec) => spec,
                 None => {
                     error!(?loadout.chest, "No chest specification exists");
@@ -511,7 +509,7 @@ impl HumArmorHandSpec {
             ..
         })) = loadout.hand.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&hand) {
+            match self.0.map.get(hand) {
                 Some(spec) => spec,
                 None => {
                     error!(?hand, "No hand specification exists");
@@ -587,7 +585,7 @@ impl HumArmorBeltSpec {
             ..
         })) = loadout.belt.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&belt) {
+            match self.0.map.get(belt) {
                 Some(spec) => spec,
                 None => {
                     error!(?belt, "No belt specification exists");
@@ -631,7 +629,7 @@ impl HumArmorBackSpec {
             ..
         })) = loadout.back.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&back) {
+            match self.0.map.get(back) {
                 Some(spec) => spec,
                 None => {
                     error!(?back, "No back specification exists");
@@ -674,7 +672,7 @@ impl HumArmorPantsSpec {
             ..
         })) = loadout.pants.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&pants) {
+            match self.0.map.get(pants) {
                 Some(spec) => spec,
                 None => {
                     error!(?pants, "No pants specification exists");
@@ -731,7 +729,7 @@ impl HumArmorFootSpec {
             ..
         })) = loadout.foot.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&foot) {
+            match self.0.map.get(foot) {
                 Some(spec) => spec,
                 None => {
                     error!(?foot, "No foot specification exists");
@@ -886,7 +884,7 @@ impl HumArmorHeadSpec {
             ..
         })) = loadout.head.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&head) {
+            match self.0.map.get(head) {
                 Some(spec) => spec,
                 None => {
                     error!(?head, "No head specification exists");
@@ -941,7 +939,7 @@ impl HumArmorTabardSpec {
             ..
         })) = loadout.tabard.as_ref().map(|i| &i.kind)
         {
-            match self.0.map.get(&tabard) {
+            match self.0.map.get(tabard) {
                 Some(spec) => spec,
                 None => {
                     error!(?tabard, "No tabard specification exists");