diff --git a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a_m.xml
similarity index 98%
rename from binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a_m.xml
index 58a0f5d677..2e0ff1ea1d 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/iberians/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a_r.xml
index f7eea44837..e0b1275708 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_iber_adv.xml" attachpoint="head"/>
@@ -15,37 +15,32 @@
   </group>
   <group>
     <variant frequency="2" name="Iberian-Tunic-beige">
-      <textures><texture file="skeletal/iber_isw_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Iberian-Tunic-brown">
-      <textures><texture file="skeletal/iber_isw_a_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_a_2.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Iberian-Tunic-pect">
-      <textures><texture file="skeletal/kart_ijv_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/kart_ijv_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
-    <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged">
-    </variant>
-    <variant file="biped/attack_slaughter_shield_cavalry.xml" name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/falcata.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/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/rider/promotion_shield.xml" />
+    <variant file="biped/rider/attack_slaughter_shield_iber.xml"/>
+    <variant file="biped/rider/gather_meat_iber.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_b_m.xml
similarity index 98%
rename from binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_b.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_b_m.xml
index 0c7e96fe03..ff122f1fbb 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/iberians/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_b_r.xml
index 67a15b9346..a7596bac52 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_iber_basic.xml" attachpoint="head"/>
@@ -13,31 +13,22 @@
   </group>
   <group>
     <variant frequency="3" name="tunic-white">
-      <textures><texture file="skeletal/iber_csp_b_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_csp_b_1.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion_shield.xml" name="promotion"/>
-    <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged">
-    </variant>
-    <variant file="biped/attack_slaughter_shield_cavalry.xml" name="attack_slaughter">
-      <props>
-        <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="props/units/weapons/falcata.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/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/rider/promotion_shield.xml" />
+    <variant file="biped/rider/attack_slaughter_shield_iber.xml"/>
+    <variant file="biped/rider/gather_meat_iber.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/champion_unit_2.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_c_m.xml
similarity index 91%
rename from binaries/data/mods/public/art/actors/units/iberians/champion_unit_2.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_c_m.xml
index 62aa9b64cd..20ee9fb351 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/champion_unit_2.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_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_javelin.xml" name="Base">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/iberians/champion_unit_2_r.xml" attachpoint="rider"/>
+        <prop actor="units/iberians/cavalry_javelinist_c_r.xml" attachpoint="rider"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/champion_unit_2_r.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_c_r.xml
similarity index 66%
rename from binaries/data/mods/public/art/actors/units/iberians/champion_unit_2_r.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_c_r.xml
index d7eaf9aab7..76129a1291 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/champion_unit_2_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_c_r.xml
@@ -1,31 +1,37 @@
-<?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 file="biped/base_cavalry_javelin_ready_shield.xml" frequency="1" name="Base">
       <props>
         <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/iber_round_su1.xml" attachpoint="shield"/>
         <prop actor="props/units/heads/iber_helmet_su1.xml" attachpoint="helmet"/>
-        <prop actor="props/units/cape_cav_animated_champ_iber.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/champ_iber.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="rider-quilted armour">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/iber_su2_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_su2_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="rider-plate armour">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <textures><texture file="skeletal/iber_su2_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_su2_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
+    <variant file="biped/rider/attack_slaughter_shield_iber.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_e_m.xml
similarity index 98%
rename from binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_e.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_e_m.xml
index ed8c0b9ced..a3f4f5d1f9 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/iberians/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_e_r.xml
index 3588d98292..62a712e776 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_iber_adv.xml" attachpoint="head"/>
@@ -15,28 +15,27 @@
   </group>
   <group>
     <variant frequency="3" name="Iberian-Tunic-brown">
-      <textures><texture file="skeletal/iber_isp_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isp_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Iberian-Tunic-pect">
-      <textures><texture file="skeletal/iber_isw_e_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_e_1.dds" name="baseTex"/>
+      </textures>
     </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/falcata.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_iber.xml"/>
+    <variant file="biped/rider/gather_meat_iber.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_a_m.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_a.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_a_m.xml
index 4d25b8f80f..0344899f5f 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/iberians/cavalry_spearman_a_r.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_a_r.xml
index 5f712596de..b71c79ae91 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_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_spearman_relax.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_iber_adv.xml" attachpoint="head"/>
@@ -12,19 +12,21 @@
   </group>
   <group>
     <variant frequency="1" name="Elite-Rider-Texture-01">
-      <textures><texture file="skeletal/iber_csp_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_csp_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion.xml" name="promotion"/>
-    <variant file="biped/attack_slaughter_spear_cavalry.xml" name="attack_slaughter"/>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/base_cavalry_spearman_relax.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/promotion_shield.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_iber.xml"/>
+    <variant file="biped/rider/gather_meat_iber.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_b_m.xml
similarity index 98%
rename from binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_b.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_b_m.xml
index 987ba24523..02108c1f77 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/iberians/cavalry_spearman_b_r.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_b_r.xml
index 888d24721b..15da39a424 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_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_spearman_relax.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_iber_basic.xml" attachpoint="head"/>
@@ -12,20 +12,21 @@
   </group>
   <group>
     <variant frequency="1" name="Elite-Rider-Texture-01">
-      <textures><texture file="skeletal/iber_isw_b_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_b_3.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
-    <variant file="biped/rider_promotion.xml" name="promotion"/>
-    <variant file="biped/attack_slaughter_spear_cavalry.xml" name="attack_slaughter"/>
-    <variant name="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/base_cavalry_spearman_relax.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/promotion_shield.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_iber.xml"/>
+    <variant file="biped/rider/gather_meat_iber.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_e_m.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_e.xml
rename to binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_e_m.xml
index 44795b77f3..d0bd639b18 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/iberians/cavalry_spearman_e_r.xml b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_e_r.xml
index 9531564f76..02ab3a9ac2 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/cavalry_spearman_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_spearman_relax_shieldsmall.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_iber_su1.xml" attachpoint="head"/>
@@ -14,23 +14,26 @@
   </group>
   <group>
     <variant frequency="1" name="rider-chainmail">
-      <textures><texture file="skeletal/iber_csp_e_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_csp_e_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="rider-scalemail">
-      <textures><texture file="skeletal/iber_csp_e_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_csp_e_2.dds" name="baseTex"/>
+      </textures>
     </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="carry_meat">
-      <props>
-        <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/base_cavalry_spearman_relax_shieldsmall.xml"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/promotion_shield.xml"/>
+    <variant file="biped/rider/attack_slaughter_shield_iber.xml"/>
+    <variant file="biped/rider/gather_meat_iber.xml"/>
+    <variant file="biped/rider/death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/champion_unit_1.xml b/binaries/data/mods/public/art/actors/units/iberians/champion_unit_1.xml
deleted file mode 100644
index bdd37fb88a..0000000000
--- a/binaries/data/mods/public/art/actors/units/iberians/champion_unit_1.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shieldsmall_fast.xml">
-      <props>
-        <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/iber_round_su1.xml" attachpoint="shield"/>
-        <prop actor="props/units/heads/iber_helmet_su1.xml" attachpoint="helmet"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="2" name="armour-pectoral-1">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/iber_su_inf_1.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="2" name="armour-pectoral-2">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/iber_su_inf_2.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="4" name="armour-chainmail">
-      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/iber_champ_inf_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/iberians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
index 5528a40c96..f5c6f10aba 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/iberians/healer.xml b/binaries/data/mods/public/art/actors/units/iberians/healer.xml
index a14754e600..2547e92fc5 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/healer.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/hero_caros.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_caros.xml
deleted file mode 100644
index 1b495686b8..0000000000
--- a/binaries/data/mods/public/art/actors/units/iberians/hero_caros.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_fast_relax.xml">
-      <mesh>skeletal/new/m_hero_caros.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/iber_helmet_hero_01.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_L"/>
-        <prop actor="props/units/shields/iberian_buckler_elite.xml" attachpoint="shield_arm"/>
-      </props>
-      <textures><texture file="skeletal/iber_hero_caros.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/iberians/hero_indibil_horse.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_cavalry_spearman_indibil_h.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/units/iberians/hero_indibil_horse.xml
rename to binaries/data/mods/public/art/actors/units/iberians/hero_cavalry_spearman_indibil_h.xml
index 62347566ee..1c7e4c45c1 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/hero_indibil_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/hero_cavalry_spearman_indibil_h.xml
@@ -1,17 +1,19 @@
-<?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_spearman.xml" name="Base">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/iberians/hero_indibil_r.xml" attachpoint="rider"/>
+        <prop actor="units/iberians/hero_cavalry_spearman_indibil_r.xml" attachpoint="rider"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="horse-texture-1">
-      <textures><texture file="skeletal/horse_iber_indibil.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/horse_iber_indibil.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/hero_indibil_r.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_cavalry_spearman_indibil_r.xml
similarity index 68%
rename from binaries/data/mods/public/art/actors/units/iberians/hero_indibil_r.xml
rename to binaries/data/mods/public/art/actors/units/iberians/hero_cavalry_spearman_indibil_r.xml
index dd305cb58c..31a2ef1473 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/hero_indibil_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/hero_cavalry_spearman_indibil_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_spearman_relax_shield.xml" frequency="100" name="Base">
+    <variant file="biped/base_cavalry_spearman_relax_shield.xml" frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
@@ -10,8 +10,14 @@
         <prop actor="props/units/shields/iber_scutum_hero.xml" attachpoint="shield"/>
         <prop actor="props/units/heads/iber_helmet_hero_03.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/iber_hero_indibil.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_hero_indibil.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/iberians/hero_indibil_infantry.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_indibil_infantry.xml
deleted file mode 100644
index 272211666a..0000000000
--- a/binaries/data/mods/public/art/actors/units/iberians/hero_indibil_infantry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_spearman_ready.xml">
-      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/iber_helmet_hero_03.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/iber_scutum_hero.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
-      </props>
-      <textures><texture file="skeletal/iber_hero_indibil.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/iberians/hero_infantry_spearman_indibil.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_spearman_indibil.xml
new file mode 100644
index 0000000000..843c2a12de
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_spearman_indibil.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_spearman_ready.xml">
+      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/iber_helmet_hero_03.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/iber_scutum_hero.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
+      </props>
+      <textures>
+        <texture file="skeletal/iber_hero_indibil.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/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml
new file mode 100644
index 0000000000..e9a8eb4b89
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_swordsman_shield_fast_relax.xml">
+      <mesh>skeletal/new/m_hero_caros.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/iber_helmet_hero_01.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_L"/>
+        <prop actor="props/units/shields/iberian_buckler_elite.xml" attachpoint="shield_arm"/>
+      </props>
+      <textures>
+        <texture file="skeletal/iber_hero_caros.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/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_viriato.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_viriato.xml
new file mode 100644
index 0000000000..be16583ceb
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_viriato.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_swordsman_shieldsmall_fast.xml">
+      <mesh>skeletal/new/m_armor_pants.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_iber_hero_1.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/iber_helmet_hero_02.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
+        <prop actor="props/units/shields/iber_round_viriato.xml" attachpoint="shield"/>
+        <prop actor="props/units/capes/iber_viriato.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="skeletal/iber_hero_viriato_pants.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/death_infantry.xml">
+      <props>
+        <prop actor="props/units/capes/iber_viriato.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/hero_viriato.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_viriato.xml
deleted file mode 100644
index 84903e1899..0000000000
--- a/binaries/data/mods/public/art/actors/units/iberians/hero_viriato.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shieldsmall_fast.xml">
-      <mesh>skeletal/new/m_armor_pants.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_iber_hero_1.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/iber_helmet_hero_02.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
-        <prop actor="props/units/shields/iber_round_viriato.xml" attachpoint="shield"/>
-        <prop actor="props/units/cape_iber_viriato.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Viriato-pants-yes">
-      <textures><texture file="skeletal/iber_hero_viriato_pants.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
-    </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/iberians/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a.xml
index 49687c722a..47bdf09e92 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_iber_su1.xml" attachpoint="head"/>
@@ -11,9 +11,19 @@
         <prop actor="props/units/heads/iber_helmet_04.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/iberian_buckler_adv.xml" attachpoint="shield"/>
       </props>
-      <textures><texture file="skeletal/kart_ijv_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/kart_ijv_a_1.dds" 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/iberians/infantry_javelinist_a_fire.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a_fire.xml
index d53cf8433b..6c45d0dc99 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a_fire.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a_fire.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_iber_su1.xml" attachpoint="head"/>
@@ -14,6 +14,14 @@
       <textures><texture file="skeletal/kart_ijv_a_1.dds" 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_fire.xml"/>
@@ -29,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/iberians/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b.xml
index 2d8412bad9..b84266fefc 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_iber_isl_b.xml" attachpoint="head"/>
@@ -10,9 +10,19 @@
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
         <prop actor="props/units/shields/iberian_buckler_basic.xml" attachpoint="shield"/>
       </props>
-      <textures><texture file="skeletal/iber_isw_b_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_b_3.dds" 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"/>
@@ -28,16 +38,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/iberians/infantry_javelinist_b_fire.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b_fire.xml
index c93889ff36..a8a689a4e5 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b_fire.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b_fire.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_iber_isl_b.xml" attachpoint="head"/>
@@ -13,6 +13,14 @@
       <textures><texture file="skeletal/iber_isw_b_3.dds" 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_fire.xml"/>
@@ -28,16 +36,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/iberians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e.xml
index 123dc6b0ad..e8128e7d2f 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
@@ -16,6 +16,14 @@
       </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"/>
@@ -31,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/iberians/infantry_javelinist_e_fire.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e_fire.xml
index d595bc2729..dac6c7baad 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e_fire.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e_fire.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_iber_su1.xml" attachpoint="head"/>
@@ -16,6 +16,14 @@
       </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_fire.xml"/>
@@ -31,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/iberians/infantry_slinger_a.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_a.xml
index 0f75fd75fe..42fc71221e 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_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_slinger_ready.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_adv.xml" attachpoint="head"/>
@@ -10,18 +10,24 @@
         <prop actor="props/units/weapons/sling.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
       </props>
+      <textures>
+        <texture file="skeletal/iber_isw_b_3.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="tunic-beige">
-      <textures><texture file="skeletal/iber_isw_b_3.dds" name="baseTex"/></textures>
-    </variant>
+    <variant file="biped/base_slinger_ready.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_slinger.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/attack_ranged_slinger.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -32,16 +38,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/iberians/infantry_slinger_b.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_b.xml
index 7f1862fde0..d7730d1dec 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_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_slinger_ready.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_isl_b.xml" attachpoint="head"/>
@@ -13,17 +13,29 @@
   </group>
   <group>
     <variant frequency="1" name="tunic-brown">
-      <textures><texture file="skeletal/iber_isl_b_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isl_b_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="tunic-beige">
-      <textures><texture file="skeletal/iber_isl_b_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isl_b_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_slinger_ready.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_slinger.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/attack_ranged_slinger.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.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/iberians/infantry_slinger_e.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_e.xml
index 0ffbbd5c40..2bdbd0c449 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_slinger_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_slinger_ready.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_basic.xml" attachpoint="head"/>
@@ -11,18 +11,24 @@
         <prop actor="props/units/shields/iberian_buckler_adv.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
       </props>
+      <textures>
+        <texture file="skeletal/iber_isl_e_1.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="tunic-quilted-beige">
-      <textures><texture file="skeletal/iber_isl_e_1.dds" name="baseTex"/></textures>
-    </variant>
+    <variant file="biped/base_slinger_ready.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_slinger.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/attack_ranged_slinger.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -33,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/iberians/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_spearman_a.xml
index 592761aab4..49647a83fc 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/shields/iber_scutum_isp.xml" attachpoint="shield"/>
@@ -16,16 +16,28 @@
         <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
         <prop actor="props/units/heads/iber_helmet_04.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/iber_isp_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isp_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Scutarius-Body-Texture-2">
       <props>
         <prop actor="props/units/heads/new/head_iber_adv_hood_1.xml" attachpoint="head"/>
         <prop actor="props/units/heads/iber_helmet_yellow_ridges.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/iber_isp_a_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_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"/>
@@ -40,16 +52,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/iberians/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_spearman_b.xml
index 4c0e8038b5..b4819e170e 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/shields/iber_scutum_isp.xml" attachpoint="shield"/>
@@ -14,12 +14,24 @@
   </group>
   <group>
     <variant frequency="1" name="Iberian-Tunic-beige">
-      <textures><texture file="skeletal/iber_isw_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Iberian-Tunic-brown">
-      <textures><texture file="skeletal/iber_isw_a_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_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/iberians/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_spearman_e.xml
index 008952e665..29d3de0fcd 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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/shields/iber_scutum_isp_e.xml" attachpoint="shield"/>
@@ -14,9 +14,19 @@
   </group>
   <group>
     <variant frequency="1" name="Scale-Mail">
-      <textures><texture file="skeletal/iber_isp_e_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isp_e_1.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"/>
@@ -31,16 +41,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/iberians/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_a.xml
index 3ea218c43b..5344389e5c 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_shieldsmall_fast.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
@@ -14,12 +14,24 @@
   </group>
   <group>
     <variant frequency="1" name="tunic-beige">
-      <textures><texture file="skeletal/iber_isw_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="tunic-brown">
-      <textures><texture file="skeletal/iber_isw_a_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_isw_a_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_swordsman_shieldsmall_fast.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/iberians/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_b.xml
index af1e0cf6c6..a9bd307d91 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_shieldsmall_fast.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_basic.xml" attachpoint="head"/>
@@ -22,6 +22,14 @@
       <textures><texture file="skeletal/iber_isw_b_3.dds" name="baseTex"/></textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_swordsman_shieldsmall_fast.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"/>
@@ -36,16 +44,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/iberians/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_c.xml
new file mode 100644
index 0000000000..6bd3663454
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_c.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_swordsman_shieldsmall_fast.xml">
+      <props>
+        <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/iber_round_su1.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/iber_helmet_su1.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="armour-pectoral-1">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <textures>
+        <texture file="skeletal/iber_su_inf_1.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="armour-pectoral-2">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <textures>
+        <texture file="skeletal/iber_su_inf_2.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="4" name="armour-chainmail">
+      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
+      <textures>
+        <texture file="skeletal/iber_champ_inf_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/iberians/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_e.xml
index db8c79a5f5..8958f0e0fb 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/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_shieldsmall_fast.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
@@ -10,12 +10,18 @@
         <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/heads/iber_helmet_isw_e.xml" attachpoint="helmet"/>
       </props>
+      <textures>
+        <texture file="skeletal/iber_isw_e_1.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="texture-1">
-      <textures><texture file="skeletal/iber_isw_e_1.dds" name="baseTex"/></textures>
-    </variant>
+    <variant file="biped/base_swordsman_shieldsmall_fast.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"/>
@@ -31,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/iberians/trader.xml b/binaries/data/mods/public/art/actors/units/iberians/trader.xml
index 4d02db3f59..78928b8e12 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/trader.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/trader.xml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/celt_trader.dae</mesh>
       <props>
         <prop actor="units/iberians/trader_r.xml" attachpoint="trader"/>
         <prop actor="units/celts/trader_h.xml" attachpoint="donkey"/>
       </props>
-      <textures><texture file="null_white.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="null_white.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/trader_r.xml b/binaries/data/mods/public/art/actors/units/iberians/trader_r.xml
index 8f994fd1ef..7c68406798 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/trader_r.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/trader_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,8 +9,14 @@
         <prop actor="props/units/backpack_celt.xml" attachpoint="back"/>
         <prop actor="props/units/weapons/trader_staff.xml" attachpoint="weapon_L"/>
       </props>
-      <textures><texture file="skeletal/iber_trader_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_trader_1.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>