Index: binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_archer_gastraphetes_relax.xml">
-      <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/helmets/hele_boeotian.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/gastraphetes.xml" attachpoint="weapon_L"/>
-        <prop actor="props/units/quiver_back.xml" attachpoint="back"/>
-      </props>
-      <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_ranged_gastraphetes_fire.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_a.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_a.xml
+++ binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_a.xml
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_naked.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_kush_nuba_painted.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/kush_nubian_hex_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/kush_nubian_mace.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Painted skin 1">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_1.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 2">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_2.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 3">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_3.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 3 Red">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_3_red.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 4 all white">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_4.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/base_swordsman_shield_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"/>
-    <variant file="biped/approach_tree.xml"/>
-    <variant file="biped/approach_grain.xml"/>
-    <variant file="biped/approach_fruit.xml"/>
-    <variant file="biped/approach_meat.xml"/>
-    <variant file="biped/approach_rock.xml"/>
-    <variant file="biped/approach_ore.xml"/>
-    <variant file="biped/approach_ruins.xml"/>
-    <variant file="biped/approach_praise.xml"/>
-  </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/death_infantry.xml"/>
-  </group>
-  <material>player_trans_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_b.xml
+++ binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_b.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_naked.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_kush_meroitic.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/kush_nubian_hex_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/kush_nubian_mace.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="Kushite Basic Clubman 01">
-      <textures>
-        <texture file="skeletal/kush_iar_b_01.png" name="baseTex"/>
-        <texture file="skeletal/kush_iar_b_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/base_swordsman_shield_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"/>
-    <variant file="biped/approach_tree.xml"/>
-    <variant file="biped/approach_grain.xml"/>
-    <variant file="biped/approach_fruit.xml"/>
-    <variant file="biped/approach_meat.xml"/>
-    <variant file="biped/approach_rock.xml"/>
-    <variant file="biped/approach_ore.xml"/>
-    <variant file="biped/approach_ruins.xml"/>
-    <variant file="biped/approach_praise.xml"/>
-  </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/death_infantry.xml"/>
-  </group>
-  <material>player_trans_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_e.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_e.xml
+++ binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_e.xml
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_naked.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_kush_nuba_painted.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/maur_earrings_1.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/kush_nubian_hex_e.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/kush_nubian_mace.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Painted skin 1">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_1.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 2">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_2.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 3">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_3.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 3 Red">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_3_red.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Painted skin 4 all white">
-      <textures>
-        <texture file="skeletal/kush_nuba_painted_4.png" name="baseTex"/>
-        <texture file="skeletal/ptol_iar_01_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/base_swordsman_shield_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"/>
-    <variant file="biped/approach_tree.xml"/>
-    <variant file="biped/approach_grain.xml"/>
-    <variant file="biped/approach_fruit.xml"/>
-    <variant file="biped/approach_meat.xml"/>
-    <variant file="biped/approach_rock.xml"/>
-    <variant file="biped/approach_ore.xml"/>
-    <variant file="biped/approach_ruins.xml"/>
-    <variant file="biped/approach_praise.xml"/>
-  </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/death_infantry.xml"/>
-  </group>
-  <material>player_trans_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
+        <prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
       </props>
@@ -26,7 +26,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
+        <prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
       </props>
@@ -26,7 +26,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
@@ -5,7 +5,7 @@
     <variant>
       <mesh>skeletal/horse_persian.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
+        <prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
@@ -27,7 +27,7 @@
     <variant file="quadraped/base_horse_run.xml"/>
     <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
       <props>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_armor_pants.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
-        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_arm"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="pers_isp_a_linothorax_1b">
-      <textures>
-        <texture file="skeletal/pers_linothorax_1_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1c">
-      <textures>
-        <texture file="skeletal/pers_linothorax_1_c.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_linothorax_1f">
-      <textures>
-        <texture file="skeletal/pers_linothorax_1_f.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1b">
-      <textures>
-        <texture file="skeletal/pers_padded_1_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="pers_isp_a_padded_1i">
-      <textures>
-        <texture file="skeletal/pers_padded_1_i.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/rider/cavalry/base_swordsman_relax_shield.xml" frequency="1" name="Swordsman-Relax-Shield"/>
-    <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_pers.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/rider/death_shield.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_kidaris_loose_tan.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="scyth-tunic-old">
-      <textures>
-        <texture file="skeletal/pers_csw_a_02.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scyth-tunic-2a">
-      <textures>
-        <texture file="skeletal/scyth_tunic_basic_1_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scyth-tunic-2b">
-      <textures>
-        <texture file="skeletal/scyth_tunic_basic_1_b.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scyth-tunic-2c">
-      <textures>
-        <texture file="skeletal/scyth_tunic_basic_1_c.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/rider/cavalry/base_swordsman_relax.xml" frequency="1" name="Swordsman-Relax"/>
-    <variant file="biped/rider/carry_meat.xml"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/rider/promotion.xml"/>
-    <variant file="biped/rider/attack_slaughter_pers.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/rider/death.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/pers_conical_a1.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/pers_back_curved_iron.xml" attachpoint="back"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_arm"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Armor Iron Scales">
-      <textures>
-        <texture file="skeletal/pers_su1_anusiya_iron.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scale-1a">
-      <textures>
-        <texture file="skeletal/pers_scale_1_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scale-1c">
-      <textures>
-        <texture file="skeletal/pers_scale_1_c.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scale-1f">
-      <textures>
-        <texture file="skeletal/pers_scale_1_f.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scale-1i">
-      <textures>
-        <texture file="skeletal/pers_scale_1_i.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-top-1b">
-      <textures>
-        <texture file="skeletal/pers_scale_sleeve_top_1_b.png" name="baseTex"/>
-        <texture file="skeletal/pers_scale_sleeve_top_1_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-bottom-1b">
-      <textures>
-        <texture file="skeletal/pers_scale_sleeve_bottom_1_b.png" name="baseTex"/>
-        <texture file="skeletal/pers_scale_sleeve_bottom_1_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="scale-sleeve-full-1b">
-      <textures>
-        <texture file="skeletal/pers_scale_sleeve_full_1_b.png" name="baseTex"/>
-        <texture file="skeletal/pers_scale_sleeve_full_1_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/rider/cavalry/base_swordsman_relax_shield.xml" frequency="1" name="Swordsman-Relax-Shield"/>
-    <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_pers.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/rider/death_shield.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
@@ -7,6 +7,6 @@
     <Entity>units/kush_infantry_clubman_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/kushites/infantry_clubman_a.xml</Actor>
+    <Actor>units/kushites/infantry_maceman_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -32,13 +32,13 @@
     <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
     <GenericName>Nuba Clubman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
-    <Icon>units/kush_infantry_clubman.png</Icon>
+    <Icon>units/kush_infantry_maceman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush_infantry_clubman_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/kushites/infantry_clubman_b.xml</Actor>
+    <Actor>units/kushites/infantry_maceman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
@@ -5,6 +5,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/kushites/infantry_clubman_e.xml</Actor>
+    <Actor>units/kushites/infantry_maceman_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
@@ -26,6 +26,6 @@
     <Icon>units/athen_champion_ranged.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/athenians/infantry_crossbowman_c.xml</Actor>
+    <Actor>units/macedonians/infantry_crossbowman_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
@@ -7,6 +7,6 @@
     <Entity>units/pers_cavalry_axeman_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_a_m.xml</Actor>
+    <Actor>units/persians/cavalry_axeman_a_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
@@ -6,13 +6,13 @@
     <SelectionGroupName>units/pers_cavalry_axeman_b</SelectionGroupName>
     <GenericName>Hyrcanian Cavalry</GenericName>
     <SpecificName>Asabāra Varkaniya</SpecificName>
-    <Icon>units/pers_cavalry_swordsman.png</Icon>
+    <Icon>units/pers_cavalry_axeman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_axeman_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_b_m.xml</Actor>
+    <Actor>units/persians/cavalry_axeman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
@@ -5,6 +5,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_e_m.xml</Actor>
+    <Actor>units/persians/cavalry_axeman_e_m.xml</Actor>
   </VisualActor>
 </Entity>