From 17380785f7c9d48ed0c1a5ca3dbe80274bb2aac2 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Tue, 13 Feb 2018 00:57:12 +0000
Subject: [PATCH] Cleanup of the units PART XII New idle carry anims states for
 romans + capes Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21199.
---
 .../units/romans/ballista_infantry_a.xml      | 24 +------
 .../units/romans/ballista_infantry_b.xml      | 24 +------
 ...inist_a.xml => cavalry_javelinist_a_m.xml} |  2 +-
 .../units/romans/cavalry_javelinist_a_r.xml   | 32 +++------
 ...inist_b.xml => cavalry_javelinist_b_m.xml} |  2 +-
 .../units/romans/cavalry_javelinist_b_r.xml   | 32 +++------
 ...inist_e.xml => cavalry_javelinist_e_m.xml} |  2 +-
 .../units/romans/cavalry_javelinist_e_r.xml   | 32 +++------
 ...pearman_a.xml => cavalry_spearman_a_m.xml} |  2 +-
 .../units/romans/cavalry_spearman_a_r.xml     | 29 ++++----
 ...pearman_b.xml => cavalry_spearman_b_m.xml} |  2 +-
 .../units/romans/cavalry_spearman_b_r.xml     | 33 ++++-----
 ...pearman_e.xml => cavalry_spearman_e_m.xml} |  2 +-
 .../units/romans/cavalry_spearman_e_r.xml     | 29 ++++----
 ...n_unit_2.xml => cavalry_swordsman_c_m.xml} |  4 +-
 ...unit_2_r.xml => cavalry_swordsman_c_r.xml} | 12 +++-
 .../actors/units/romans/champion_unit_1.xml   | 67 -------------------
 .../actors/units/romans/champion_unit_3.xml   | 46 -------------
 .../romans/champion_unit_4_imp_legion.xml     | 43 ------------
 .../actors/units/romans/female_citizen.xml    |  2 +-
 .../public/art/actors/units/romans/healer.xml | 10 ++-
 ...=> hero_cavalry_swordsman_marcellus_m.xml} |  4 +-
 ...=> hero_cavalry_swordsman_marcellus_r.xml} |  8 ++-
 ...l => hero_cavalry_swordsman_maximus_m.xml} |  4 +-
 ...l => hero_cavalry_swordsman_maximus_r.xml} | 12 +++-
 ...ml => hero_cavalry_swordsman_scipio_m.xml} |  4 +-
 ...ml => hero_cavalry_swordsman_scipio_r.xml} | 12 +++-
 .../hero_infantry_swordsman_marcellus.xml     | 24 +++++++
 .../hero_infantry_swordsman_maximus.xml       | 29 ++++++++
 .../actors/units/romans/hero_marcellus.xml    | 45 -------------
 .../art/actors/units/romans/hero_maximus.xml  | 46 -------------
 .../units/romans/imp_rome_champion_1.xml      | 47 -------------
 .../units/romans/infantry_javelinist_a.xml    | 26 +++----
 .../units/romans/infantry_javelinist_b.xml    | 26 +++----
 .../units/romans/infantry_javelinist_e.xml    | 26 +++----
 .../units/romans/infantry_spearman_a.xml      | 30 +++++----
 .../units/romans/infantry_spearman_b.xml      | 26 +++----
 .../units/romans/infantry_spearman_e.xml      | 30 +++++----
 .../units/romans/infantry_swordsman_a.xml     | 22 +++---
 .../units/romans/infantry_swordsman_b.xml     | 34 +++++-----
 .../units/romans/infantry_swordsman_c.xml     | 58 ++++++++++++++++
 .../units/romans/infantry_swordsman_c2.xml    | 25 +++++++
 .../units/romans/infantry_swordsman_c3.xml    | 24 +++++++
 .../units/romans/infantry_swordsman_c4.xml    | 30 +++++++++
 .../units/romans/infantry_swordsman_e.xml     | 22 +++---
 .../actors/units/romans/onager_operator_a.xml |  3 +-
 .../actors/units/romans/onager_operator_b.xml |  3 +-
 .../actors/units/romans/onager_operator_c.xml |  6 +-
 .../actors/units/romans/scorpio_operator.xml  |  2 +-
 .../art/actors/units/romans/siege_ladder.xml  |  2 +-
 .../art/actors/units/romans/siege_onager.xml  |  2 +-
 .../units/romans/siege_onager_pivot.xml       |  2 +-
 .../art/actors/units/romans/siege_ram.xml     |  2 +-
 .../art/actors/units/romans/siege_rock.xml    |  2 +-
 .../actors/units/romans/siege_rock_packed.xml |  2 +-
 .../actors/units/romans/siege_rock_pivot.xml  |  2 +-
 .../units/romans/siege_rock_pivot_packed.xml  |  2 +-
 .../art/actors/units/romans/siege_scorpio.xml |  2 +-
 .../units/romans/siege_scorpio_packed.xml     |  2 +-
 .../public/art/actors/units/romans/trader.xml |  2 +-
 .../art/actors/units/romans/trader_h.xml      |  2 +-
 61 files changed, 461 insertions(+), 622 deletions(-)
 rename binaries/data/mods/public/art/actors/units/romans/{cavalry_javelinist_a.xml => cavalry_javelinist_a_m.xml} (98%)
 rename binaries/data/mods/public/art/actors/units/romans/{cavalry_javelinist_b.xml => cavalry_javelinist_b_m.xml} (97%)
 rename binaries/data/mods/public/art/actors/units/romans/{cavalry_javelinist_e.xml => cavalry_javelinist_e_m.xml} (98%)
 rename binaries/data/mods/public/art/actors/units/romans/{cavalry_spearman_a.xml => cavalry_spearman_a_m.xml} (97%)
 rename binaries/data/mods/public/art/actors/units/romans/{cavalry_spearman_b.xml => cavalry_spearman_b_m.xml} (97%)
 rename binaries/data/mods/public/art/actors/units/romans/{cavalry_spearman_e.xml => cavalry_spearman_e_m.xml} (97%)
 rename binaries/data/mods/public/art/actors/units/romans/{champion_unit_2.xml => cavalry_swordsman_c_m.xml} (90%)
 rename binaries/data/mods/public/art/actors/units/romans/{champion_unit_2_r.xml => cavalry_swordsman_c_r.xml} (65%)
 delete mode 100644 binaries/data/mods/public/art/actors/units/romans/champion_unit_1.xml
 delete mode 100644 binaries/data/mods/public/art/actors/units/romans/champion_unit_3.xml
 delete mode 100644 binaries/data/mods/public/art/actors/units/romans/champion_unit_4_imp_legion.xml
 rename binaries/data/mods/public/art/actors/units/romans/{hero_marcellus_horse.xml => hero_cavalry_swordsman_marcellus_m.xml} (83%)
 rename binaries/data/mods/public/art/actors/units/romans/{hero_marcellus_r.xml => hero_cavalry_swordsman_marcellus_r.xml} (76%)
 rename binaries/data/mods/public/art/actors/units/romans/{hero_maximus_horse.xml => hero_cavalry_swordsman_maximus_m.xml} (82%)
 rename binaries/data/mods/public/art/actors/units/romans/{hero_maximus_r.xml => hero_cavalry_swordsman_maximus_r.xml} (65%)
 rename binaries/data/mods/public/art/actors/units/romans/{hero_scipio_horse.xml => hero_cavalry_swordsman_scipio_m.xml} (82%)
 rename binaries/data/mods/public/art/actors/units/romans/{hero_scipio_r.xml => hero_cavalry_swordsman_scipio_r.xml} (64%)
 create mode 100644 binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_marcellus.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_maximus.xml
 delete mode 100644 binaries/data/mods/public/art/actors/units/romans/hero_marcellus.xml
 delete mode 100644 binaries/data/mods/public/art/actors/units/romans/hero_maximus.xml
 delete mode 100644 binaries/data/mods/public/art/actors/units/romans/imp_rome_champion_1.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml

diff --git a/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_a.xml b/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_a.xml
index 9f1803ab8a..e023d107eb 100644
--- a/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_a.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -24,29 +24,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_ranged_rome_ballista_fire_a.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_b.xml b/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_b.xml
index c2bbf6e608..42a022932b 100644
--- a/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/ballista_infantry_b.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -24,29 +24,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_ranged_rome_ballista_fire_b.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_m.xml
similarity index 98%
rename from binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_m.xml
index a45c457708..abcf980b45 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_m.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
index 0b238611c2..4b0f0f9a8b 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-   <variant file="biped/base_cavalry_javelin_ready_shield.xml" frequency="100" name="Base">
+   <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
@@ -31,26 +31,16 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
+    <variant file="biped/base_cavalry_javelin_ready_shield.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
-    <variant file="biped/attack_slaughter_shield_cavalry.xml" name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="ammo"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/rider/promotion_shield.xml" />
+    <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
+    <variant file="biped/rider/gather_meat_rome.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_m.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_m.xml
index 38cdf33191..3e79778ffa 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_m.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
index 90534fab90..17e8e76b86 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_cavalry_javelin_ready_shield.xml" frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
@@ -36,26 +36,16 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
+    <variant file="biped/base_cavalry_javelin_ready_shield.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
-    <variant file="biped/attack_slaughter_shield_cavalry.xml" name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="ammo"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/rider/promotion_shield.xml" />
+    <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
+    <variant file="biped/rider/gather_meat_rome.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_m.xml
similarity index 98%
rename from binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_m.xml
index 2e20f9b476..99bd447651 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_m.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
index 3765e5d478..a7ccc4ef64 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_cavalry_javelin_ready_shield.xml" frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
@@ -17,26 +17,16 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
+    <variant file="biped/base_cavalry_javelin_ready_shield.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
-    <variant file="biped/attack_slaughter_shield_cavalry.xml" name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="ammo"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/rider/promotion_shield.xml" />
+    <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
+    <variant file="biped/rider/gather_meat_rome.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a_m.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a_m.xml
index 29bf339c04..88bcd97ba0 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a_m.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a_r.xml
index c063dca0bf..9bac6581e2 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_a_r.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_cavalry_spearman_relax_shield.xml" frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/helmets/rome_boeotian.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/shields/rome_parma_a.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_lance_cavalry_reverse.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/cape_cav_animated_spearman_relax_shield.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/spearman_relax_shield.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
@@ -26,20 +26,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
-    <variant file="biped/attack_slaughter_spear_shield_cavalry.xml" name="attack_slaughter"/>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/base_cavalry_spearman_relax_shield.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
+    <variant file="biped/rider/promotion_shield.xml" />
+    <variant file="biped/rider/gather_meat_rome.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b_m.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b_m.xml
index e6c28aaab0..f177943c15 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b_m.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b_r.xml
index d205f684c4..a3153ca8e7 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_b_r.xml
@@ -1,38 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_cavalry_spearman_relax_shield.xml" frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/heads/rome_monte_simple.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_lance_cavalry_reverse.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/rome_parma_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_cav_animated_spearman_relax_shield.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/spearman_relax_shield.xml" attachpoint="root"/>
       </props>
+      <textures>
+        <texture file="skeletal/rome_csp_b.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="texture">
-      <textures><texture file="skeletal/rome_csp_b.dds" name="baseTex"/></textures>
-    </variant>
+    <variant file="biped/base_cavalry_spearman_relax_shield.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
-    <variant file="biped/attack_slaughter_spear_shield_cavalry.xml" name="attack_slaughter"/>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
+    <variant file="biped/rider/promotion_shield.xml" />
+    <variant file="biped/rider/gather_meat_rome.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e_m.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e_m.xml
index 72fa920827..0e0fe2040c 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e_m.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e_r.xml
index a05a383f9c..404a272ec7 100644
--- a/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_spearman_e_r.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_cavalry_spearman_relax_shield.xml" frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/helmets/rome_boeotian_highcrest.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
         <prop actor="props/units/shields/rome_parma_e.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_lance_cavalry_reverse.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/cape_cav_animated_spearman_relax_shield.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/spearman_relax_shield.xml" attachpoint="root"/>
       </props>
       <textures>
         <texture file="skeletal/rome_csp_e.dds" name="baseTex"/>
@@ -17,20 +17,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
-    <variant file="biped/attack_slaughter_spear_shield_cavalry.xml" name="attack_slaughter"/>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/base_cavalry_spearman_relax_shield.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
+    <variant file="biped/rider/promotion_shield.xml" />
+    <variant file="biped/rider/gather_meat_rome.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/champion_unit_2.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_swordsman_c_m.xml
similarity index 90%
rename from binaries/data/mods/public/art/actors/units/romans/champion_unit_2.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_swordsman_c_m.xml
index 078a1b87b2..dff71e78dc 100644
--- a/binaries/data/mods/public/art/actors/units/romans/champion_unit_2.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_swordsman_c_m.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/romans/champion_unit_2_r.xml" attachpoint="rider"/>
+        <prop actor="units/romans/cavalry_swordsman_c_r.xml" attachpoint="rider"/>
         <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/romans/champion_unit_2_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_swordsman_c_r.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/units/romans/champion_unit_2_r.xml
rename to binaries/data/mods/public/art/actors/units/romans/cavalry_swordsman_c_r.xml
index 55ce67ed15..e700c7ebb0 100644
--- a/binaries/data/mods/public/art/actors/units/romans/champion_unit_2_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_swordsman_c_r.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -9,10 +9,16 @@
         <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/spatha.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/rome_parma_hero.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_cav_animated_champ_ptol.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/champ_ptol.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="skeletal/rome_consular_cav.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_consular_cav.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/death.xml"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/champion_unit_1.xml b/binaries/data/mods/public/art/actors/units/romans/champion_unit_1.xml
deleted file mode 100644
index a3323808c4..0000000000
--- a/binaries/data/mods/public/art/actors/units/romans/champion_unit_1.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_ready.xml">
-      <props>
-        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/rome_monte_su.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_su.xml" attachpoint="shield"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="2" name="Scale-Brass">
-      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
-      <textures><texture file="skeletal/rome_su1_extraordinarii.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="2" name="Cuirass and pteruges">
-      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
-      <textures><texture file="skeletal/rome_su1_b.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="Cuirass">
-      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/samnite_isp_e_1.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="pectoral-tripledisc">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/kart_csp_a_1.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="pectoral-square">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/kart_csp_a_2.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="pectoral-muscle">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/kart_csp_a_3.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/champion_unit_3.xml b/binaries/data/mods/public/art/actors/units/romans/champion_unit_3.xml
deleted file mode 100644
index 3548e1055e..0000000000
--- a/binaries/data/mods/public/art/actors/units/romans/champion_unit_3.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/rome_coolus_b.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_marian.xml" attachpoint="shield"/>
-      </props>
-      <textures>
-        <texture file="skeletal/rome_su3_marian_legion.dds" name="baseTex"/>
-        <texture file="skeletal/rome_su3_marian_legion_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/champion_unit_4_imp_legion.xml b/binaries/data/mods/public/art/actors/units/romans/champion_unit_4_imp_legion.xml
deleted file mode 100644
index 95a300e519..0000000000
--- a/binaries/data/mods/public/art/actors/units/romans/champion_unit_4_imp_legion.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/rome_imp_gallic_g.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_legionnaire.xml" attachpoint="shield"/>
-      </props>
-      <textures><texture file="skeletal/rome_su4_imperial_legion.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml b/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml
index eee29a4780..23503fafd2 100644
--- a/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/healer.xml b/binaries/data/mods/public/art/actors/units/romans/healer.xml
index 047a4b3e00..d720da48f6 100644
--- a/binaries/data/mods/public/art/actors/units/romans/healer.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/healer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -15,8 +15,14 @@
       <props>
         <prop actor="props/units/heads/hele_hood_priest.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/rome_healer_1.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_healer_1.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_horse.xml b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_marcellus_m.xml
similarity index 83%
rename from binaries/data/mods/public/art/actors/units/romans/hero_marcellus_horse.xml
rename to binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_marcellus_m.xml
index a1f79d9112..5b681576c8 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_marcellus_m.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/romans/hero_marcellus_r.xml" attachpoint="rider"/>
+        <prop actor="units/romans/hero_cavalry_swordsman_marcellus_r.xml" attachpoint="rider"/>
         <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_r.xml b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_marcellus_r.xml
similarity index 76%
rename from binaries/data/mods/public/art/actors/units/romans/hero_marcellus_r.xml
rename to binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_marcellus_r.xml
index 7a07a24125..1cd2c61c54 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_marcellus_r.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -9,12 +9,16 @@
         <prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/rome_parma_hero_2.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_cav_animated_champ_ptol.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/champ_ptol.xml" attachpoint="root"/>
       </props>
       <textures>
         <texture file="skeletal/rome_hero_marcellus.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/death.xml"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_maximus_horse.xml b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_maximus_m.xml
similarity index 82%
rename from binaries/data/mods/public/art/actors/units/romans/hero_maximus_horse.xml
rename to binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_maximus_m.xml
index 339aa9b81b..d05b8c0d9d 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_maximus_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_maximus_m.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/romans/hero_maximus_r.xml" attachpoint="rider"/>
+        <prop actor="units/romans/hero_cavalry_swordsman_maximus_r.xml" attachpoint="rider"/>
         <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
       </props>
       <textures><texture file="skeletal/horse_rome_maximus.png" name="baseTex"/></textures>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_maximus_r.xml b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_maximus_r.xml
similarity index 65%
rename from binaries/data/mods/public/art/actors/units/romans/hero_maximus_r.xml
rename to binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_maximus_r.xml
index 9a983a21b7..d1d34928ea 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_maximus_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_maximus_r.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -9,10 +9,16 @@
         <prop actor="props/units/heads/new/rome_head_hero_scipio.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/rome_parma_hero_1.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_cav_animated_champ_ptol.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/champ_ptol.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="skeletal/rome_hero_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_hero_3.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/death.xml"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_scipio_horse.xml b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_scipio_m.xml
similarity index 82%
rename from binaries/data/mods/public/art/actors/units/romans/hero_scipio_horse.xml
rename to binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_scipio_m.xml
index a7418c18de..adcf765c4e 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_scipio_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_scipio_m.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/romans/hero_scipio_r.xml" attachpoint="rider"/>
+        <prop actor="units/romans/hero_cavalry_swordsman_scipio_r.xml" attachpoint="rider"/>
         <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
       </props>
       <textures><texture file="skeletal/horse_rome_scipio.png" name="baseTex"/></textures>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_scipio_r.xml b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_scipio_r.xml
similarity index 64%
rename from binaries/data/mods/public/art/actors/units/romans/hero_scipio_r.xml
rename to binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_scipio_r.xml
index 66aecbe8a9..b02adb2672 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_scipio_r.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_cavalry_swordsman_scipio_r.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -9,10 +9,16 @@
         <prop actor="props/units/heads/new/rome_head_hero_scipio.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/spatha.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/rome_parma_hero_3.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_cav_animated_scipio.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/rome_hero_swordsman_scipio.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="skeletal/rome_hero_scipio.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_hero_scipio.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/death.xml"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_marcellus.xml b/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_marcellus.xml
new file mode 100644
index 0000000000..67cfcd4f12
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_marcellus.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"  ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base" file="biped/base_swordsman_shield_ready.xml">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/rome_monte_e.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/rome_scutum_su.xml" attachpoint="shield"/>
+      </props>
+      <textures>
+        <texture file="skeletal/rome_hero_marcellus.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_maximus.xml b/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_maximus.xml
new file mode 100644
index 0000000000..3c34f7d2d8
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_infantry_swordsman_maximus.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base" file="biped/base_swordsman_shield_ready.xml">
+      <mesh>skeletal/new/m_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/rome_attic_bronze.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/rome_head_hero_scipio.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/rome_parma_hero_1.xml" attachpoint="shield"/>
+        <prop actor="props/units/capes/swordsman_shield_ready.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="skeletal/rome_hero_3.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/death_infantry.xml">
+      <props>
+        <prop actor="props/units/capes/swordsman_shield_ready.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus.xml b/binaries/data/mods/public/art/actors/units/romans/hero_marcellus.xml
deleted file mode 100644
index c37c2375dc..0000000000
--- a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base" file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/rome_monte_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_su.xml" attachpoint="shield"/>
-      </props>
-      <textures>
-        <texture file="skeletal/rome_hero_marcellus.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_maximus.xml b/binaries/data/mods/public/art/actors/units/romans/hero_maximus.xml
deleted file mode 100644
index 8308576875..0000000000
--- a/binaries/data/mods/public/art/actors/units/romans/hero_maximus.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base" file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/rome_attic_bronze.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/new/rome_head_hero_scipio.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_parma_hero_1.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_animated_swordsman_shield_ready.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="skeletal/rome_hero_3.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/imp_rome_champion_1.xml b/binaries/data/mods/public/art/actors/units/romans/imp_rome_champion_1.xml
deleted file mode 100644
index 99351b6db5..0000000000
--- a/binaries/data/mods/public/art/actors/units/romans/imp_rome_champion_1.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/rome_imp_gallic_g_cent.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_marian.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_animated_swordsman_shield_ready.xml" attachpoint="root"/>
-      </props>
-      <textures>
-		<texture file="skeletal/imp_rome_su1_a.dds" name="baseTex"/>
-		<texture file="skeletal/imp_rome_su1_a_spec.png" name="specTex"/>
-	  </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_a.xml
index 5594933cc3..2c3a4da998 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_a.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_skirmisher.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
@@ -11,9 +11,19 @@
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/heads/rome_helmet_wolfskin.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/rome_ijv_a.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_ijv_a.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_skirmisher.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
@@ -29,16 +39,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_b.xml
index 4d21cd6ab0..c26c286b2d 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_b.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_skirmisher.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
@@ -11,9 +11,19 @@
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/heads/rome_helmet_wolfskin.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/rome_ijv_b.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_ijv_b.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_skirmisher.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
@@ -29,16 +39,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_e.xml
index 0c6860170c..373bee061f 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_e.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_skirmisher.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
@@ -11,9 +11,19 @@
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/heads/rome_helmet_wolfskin.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/rome_ijv_e.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_ijv_e.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_skirmisher.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
@@ -29,16 +39,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml
index 851b3696ed..14c0cb4f51 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_spearman_relax.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/rome_etrusco_a.xml" attachpoint="helmet"/>
@@ -14,12 +14,24 @@
   </group>
   <group>
     <variant frequency="1" name="Chainmail-Shoulder Doubling">
-      <textures><texture file="skeletal/rome_isp_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isp_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Chainmail-No Shoulder Doubling">
-      <textures><texture file="skeletal/rome_isp_a_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isp_a_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_spearman_relax.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
@@ -34,16 +46,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml
index fac7a00530..15592b9a10 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_spearman_relax.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/rome_etrusco_b.xml" attachpoint="helmet"/>
@@ -10,9 +10,19 @@
         <prop actor="props/units/shields/rome_scutum_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
       </props>
-      <textures><texture file="skeletal/rome_isw_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isw_a.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_spearman_relax.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
@@ -27,16 +37,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml
index b5ab8500f9..c18cec9fde 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_spearman_relax.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/rome_etrusco_e.xml" attachpoint="helmet"/>
@@ -14,12 +14,24 @@
   </group>
   <group>
     <variant frequency="1" name="armour-texture-Color root">
-      <textures><texture file="skeletal/rome_isp_e_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isp_e_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="armour-texture-White root">
-      <textures><texture file="skeletal/rome_isp_e_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isp_e_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_spearman_relax.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
@@ -34,16 +46,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml
index cb721fe9a3..1936baef82 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_swordsman_shield_relax.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/rome_monte_a.xml" attachpoint="helmet"/>
@@ -29,6 +29,14 @@
       </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_swordsman_shield_relax.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
@@ -43,16 +51,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml
index b96f6026ca..30ffcd7025 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_swordsman_shield_relax.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/rome_monte_b.xml" attachpoint="helmet"/>
@@ -14,15 +14,29 @@
   </group>
   <group>
     <variant frequency="1" name="pectoral--plain">
-      <textures><texture file="skeletal/rome_isw_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isw_b.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="pectoral--muscle">
-      <textures><texture file="skeletal/rome_isw_b_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isw_b_2.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="pectoral">
-      <textures><texture file="skeletal/rome_isw_b_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_isw_b_3.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_swordsman_shield_relax.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
@@ -37,16 +51,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c.xml
new file mode 100644
index 0000000000..f60baae3b2
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_swordsman_shield_ready.xml">
+      <props>
+        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/rome_monte_su.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/rome_scutum_su.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Scale-Brass">
+      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
+      <textures>
+        <texture file="skeletal/rome_su1_extraordinarii.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="Cuirass and pteruges">
+      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
+      <textures>
+        <texture file="skeletal/rome_su1_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Cuirass">
+      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
+      <textures>
+        <texture file="skeletal/samnite_isp_e_1.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="pectoral-tripledisc">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <textures>
+        <texture file="skeletal/kart_csp_a_1.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="pectoral-square">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <textures>
+        <texture file="skeletal/kart_csp_a_2.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="pectoral-muscle">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <textures>
+        <texture file="skeletal/kart_csp_a_3.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml
new file mode 100644
index 0000000000..e5d2832dd0
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_swordsman_shield_ready.xml">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/rome_coolus_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/rome_scutum_marian.xml" attachpoint="shield"/>
+      </props>
+      <textures>
+        <texture file="skeletal/rome_su3_marian_legion.dds" name="baseTex"/>
+        <texture file="skeletal/rome_su3_marian_legion_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml
new file mode 100644
index 0000000000..22d09c2e56
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_swordsman_shield_ready.xml">
+      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/rome_imp_gallic_g.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/rome_scutum_legionnaire.xml" attachpoint="shield"/>
+      </props>
+      <textures>
+        <texture file="skeletal/rome_su4_imperial_legion.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml
new file mode 100644
index 0000000000..c5da761523
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_swordsman_shield_ready.xml">
+      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/rome_imp_gallic_g_cent.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/rome_scutum_marian.xml" attachpoint="shield"/>
+        <prop actor="props/units/capes/swordsman_shield_ready.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="skeletal/imp_rome_su1_a.dds" name="baseTex"/>
+        <texture file="skeletal/imp_rome_su1_a_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/death_infantry.xml">
+      <props>
+        <prop actor="props/units/capes/swordsman_shield_ready.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml
index e402eafcb9..8359cca4c2 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_swordsman_shield_relax.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
@@ -24,6 +24,14 @@
       </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_swordsman_shield_relax.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
@@ -38,16 +46,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/onager_operator_a.xml b/binaries/data/mods/public/art/actors/units/romans/onager_operator_a.xml
index dd9da8642f..442b02135f 100644
--- a/binaries/data/mods/public/art/actors/units/romans/onager_operator_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/onager_operator_a.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -18,6 +18,7 @@
     </variant>
   </group>
   <group>
+    <variant frequency="1" name="Idle"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/onager_operator_b.xml b/binaries/data/mods/public/art/actors/units/romans/onager_operator_b.xml
index 41e8781ead..142300b4d3 100644
--- a/binaries/data/mods/public/art/actors/units/romans/onager_operator_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/onager_operator_b.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -18,6 +18,7 @@
     </variant>
   </group>
   <group>
+    <variant frequency="1" name="Idle"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/onager_operator_c.xml b/binaries/data/mods/public/art/actors/units/romans/onager_operator_c.xml
index 7687d3a3d1..16b10c8b17 100644
--- a/binaries/data/mods/public/art/actors/units/romans/onager_operator_c.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/onager_operator_c.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
@@ -12,13 +12,13 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/heads/rome_monte_e.xml" attachpoint="helmet"/>
       </props>
-            <textures>
+      <textures>
         <texture file="skeletal/rome_isw_a.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
-
   <group>
+    <variant frequency="1" name="Idle"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/romans/scorpio_operator.xml b/binaries/data/mods/public/art/actors/units/romans/scorpio_operator.xml
index 8dd57d36da..692af6d5ed 100644
--- a/binaries/data/mods/public/art/actors/units/romans/scorpio_operator.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/scorpio_operator.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_ladder.xml b/binaries/data/mods/public/art/actors/units/romans/siege_ladder.xml
index a339d6b69d..dcb8b76d28 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_ladder.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_ladder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_onager.xml b/binaries/data/mods/public/art/actors/units/romans/siege_onager.xml
index 968077e393..75ebdb9fcc 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_onager.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_onager.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_onager_pivot.xml b/binaries/data/mods/public/art/actors/units/romans/siege_onager_pivot.xml
index 04dfe3caa6..5cc0f3eceb 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_onager_pivot.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_onager_pivot.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <group>
     <variant frequency="100" name="Rome Onager">
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_ram.xml b/binaries/data/mods/public/art/actors/units/romans/siege_ram.xml
index f631f4b6f8..0f53b12824 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_ram.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_ram.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_rock.xml b/binaries/data/mods/public/art/actors/units/romans/siege_rock.xml
index 96ec40385e..331b006a74 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_rock.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_rock.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_rock_packed.xml b/binaries/data/mods/public/art/actors/units/romans/siege_rock_packed.xml
index 87fcf50df1..62463108e8 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_rock_packed.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_rock_packed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"  ?>
 <actor version="1">
 
   <castshadow/>
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot.xml b/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot.xml
index 81f64fe64f..782c7bc86b 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <group>
     <variant frequency="1" name="Rome ballista pivot">
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot_packed.xml b/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot_packed.xml
index af575d6e6e..ff5cd90364 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot_packed.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_rock_pivot_packed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <group>
     <variant frequency="1" name="Rome ballista pivot">
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_scorpio.xml b/binaries/data/mods/public/art/actors/units/romans/siege_scorpio.xml
index 80b322a31b..18dfafc2cf 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_scorpio.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_scorpio.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/siege_scorpio_packed.xml b/binaries/data/mods/public/art/actors/units/romans/siege_scorpio_packed.xml
index 90f6c608b0..5ba4a3ab55 100644
--- a/binaries/data/mods/public/art/actors/units/romans/siege_scorpio_packed.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/siege_scorpio_packed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"  ?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/trader.xml b/binaries/data/mods/public/art/actors/units/romans/trader.xml
index d6c576cf4e..866dddcdcd 100644
--- a/binaries/data/mods/public/art/actors/units/romans/trader.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/trader.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/romans/trader_h.xml b/binaries/data/mods/public/art/actors/units/romans/trader_h.xml
index 6dc178b9ff..33bd5c4d11 100644
--- a/binaries/data/mods/public/art/actors/units/romans/trader_h.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/trader_h.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>