diff --git a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml
index 6e7c573460..ba8e4e0d51 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml
@@ -8,10 +8,6 @@
         <prop actor="props/units/helmets/hele_iar_e.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="epilektos-01">
       <textures>
         <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
       </textures>
@@ -19,29 +15,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_ranged_lithobolos_fire_a.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml
index c4b3241fcf..39b06c3ade 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml
@@ -8,10 +8,6 @@
         <prop actor="props/units/helmets/hele_iar_e.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="epilektos-01">
       <textures>
         <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
       </textures>
@@ -19,29 +15,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_ranged_lithobolos_fire_b.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/champion_unit_gastraphetes.xml b/binaries/data/mods/public/art/actors/units/athenians/champion_unit_gastraphetes.xml
index a0daa8e318..09ed6b8998 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/champion_unit_gastraphetes.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/champion_unit_gastraphetes.xml
@@ -10,10 +10,6 @@
         <prop actor="props/units/weapons/gastraphetes.xml" attachpoint="shield"/>
         <prop actor="props/units/quiver_back.xml" attachpoint="back"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="epilektos-01">
       <textures>
         <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
       </textures>
@@ -24,7 +20,6 @@
     <variant file="biped/attack_ranged_gastraphetes_fire.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/champion_unit_marine.xml b/binaries/data/mods/public/art/actors/units/athenians/champion_unit_marine.xml
index 2078c9d544..f4db6a6487 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/champion_unit_marine.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/champion_unit_marine.xml
@@ -14,13 +14,19 @@
   </group>
   <group>
     <variant frequency="1" name="Texture-Chiton-01">
-      <textures><texture file="skeletal/hele_su1_01.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_su1_01.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Texture-Chiton-02">
-      <textures><texture file="skeletal/hele_su1_02.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_su1_02.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Texture-Chiton-03">
-      <textures><texture file="skeletal/hele_su1_03.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_su1_03.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -28,7 +34,6 @@
     <variant file="biped/attack_melee_swordsman_shieldarm.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/champion_unit_spear.xml b/binaries/data/mods/public/art/actors/units/athenians/champion_unit_spear.xml
index 4d41574686..8f0546a0fd 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/champion_unit_spear.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/champion_unit_spear.xml
@@ -10,18 +10,15 @@
         <prop actor="props/units/shields/athen_round_epilektos.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="epilektos-01">
-      <textures><texture file="skeletal/athen_epilektos_1.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/athen_epilektos_1.png" 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_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
index 152b0975e8..fd12903eb8 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
@@ -14,7 +14,6 @@
     </variant>
   </group>
   <group>
-    <!-- In this group, defined overloads for "Idle", "Walk" and "Run" -->
     <variant file="biped/female_base_walk.xml"/>
     <variant file="biped/female_carry_food.xml"/>
     <variant file="biped/female_carry_meat.xml"/>
@@ -23,7 +22,6 @@
     <variant file="biped/female_carry_metal.xml"/>
   </group>
   <group>
-    <!-- In this group, define overloads for other animation types, since they presumably do not collide with each other -->
     <variant name="Idle" frequency="1"/>
     <variant file="biped/attack_melee_female.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/healer.xml b/binaries/data/mods/public/art/actors/units/athenians/healer.xml
index 6b0a2bc215..6ead48ba58 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/healer.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/healer.xml
@@ -15,11 +15,19 @@
       <props>
         <prop actor="props/units/heads/hele_hood_priest.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/hele_healer_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_healer_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="healer-robe-2">
-      <textures><texture file="skeletal/hele_healer_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_healer_2.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>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml
index eca498f095..dcf93b199d 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_archer_ready.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
@@ -15,12 +15,24 @@
   </group>
   <group>
     <variant frequency="1" name="Tunic-Sleeves">
-      <textures><texture file="skeletal/hele_isp_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_b.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Tunic-Sleeveless">
-      <textures><texture file="skeletal/hele_isp_b_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_b_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_archer_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_archer.xml"/>
@@ -36,16 +48,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/athenians/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
index 3a696b09bc..2d9f84e9a7 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_archer_ready.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
@@ -11,9 +11,19 @@
         <prop actor="props/units/weapons/bow_short.xml" attachpoint="weapon_L"/>
         <prop actor="props/temp/quiver.xml" attachpoint="back"/>
       </props>
-      <textures><texture file="skeletal/hele_tunic.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_tunic.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_archer_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_archer.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/athenians/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
index 88b099a328..a1b884b206 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_archer_ready.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/helmets/hele_iar_e.xml" attachpoint="helmet"/>
@@ -17,6 +17,14 @@
       </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_archer_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_archer.xml"/>
@@ -32,16 +40,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/athenians/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_a.xml
index e2b46cacd1..8a19df8d2e 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_a.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_skirmisher.xml">
+    <variant frequency="1" name="Base">
       <props>
         <prop actor="props/units/heads/floppy_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_thrace.xml" attachpoint="head"/>
@@ -15,17 +15,31 @@
   <group>
     <variant frequency="1" name="Tunic-1">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <textures><texture file="skeletal/hele_ijv_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_ijv_a.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Tunic-2">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <textures><texture file="skeletal/hele_ijv_a_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_ijv_a_2.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Tunic-3">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <textures><texture file="skeletal/hele_ijv_a_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_ijv_a_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"/>
@@ -41,16 +55,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/athenians/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
index 9e1097ee10..e96535839a 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
@@ -2,7 +2,7 @@
 <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_thrace.xml" attachpoint="head"/>
@@ -10,9 +10,19 @@
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
-      <textures><texture file="skeletal/hele_isp_b_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_b_2.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/athenians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_e.xml
index 3692668855..f95215433a 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_e.xml
@@ -2,7 +2,7 @@
 <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/thracian_cap_01.xml" attachpoint="helmet"/>
@@ -16,12 +16,24 @@
   </group>
   <group>
     <variant frequency="1" name="tunic-white">
-      <textures><texture file="skeletal/hele_ijv_e_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_ijv_e_2.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="tunic-brown">
-      <textures><texture file="skeletal/hele_ijv_e_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_ijv_e_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"/>
@@ -37,16 +49,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/athenians/infantry_slinger_a.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_a.xml
index dc9cbf7498..d7833acd14 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_a.xml
@@ -2,7 +2,7 @@
 <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_hele_a.xml" attachpoint="head"/>
@@ -10,12 +10,18 @@
         <prop actor="props/units/weapons/sling.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
       </props>
+      <textures>
+        <texture file="skeletal/hele_isp_b_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Tunic-Sleeveless">
-      <textures><texture file="skeletal/hele_isp_b_2.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"/>
@@ -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/athenians/infantry_slinger_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
index bfce354e74..5d83ffd759 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
@@ -2,7 +2,7 @@
 <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_hele_b.xml" attachpoint="head"/>
@@ -10,9 +10,19 @@
         <prop actor="props/units/weapons/sling.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
       </props>
-      <textures><texture file="skeletal/hele_tunic.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_tunic.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"/>
@@ -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/athenians/infantry_slinger_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
index c51f9550da..64f5150afb 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_slinger_ready.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
@@ -15,6 +15,14 @@
       </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"/>
@@ -30,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/athenians/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
index e2bdbccfc3..c6a7c922f0 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_hoplite.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/shields/hele_round_a.xml" attachpoint="shield_arm"/>
@@ -26,15 +26,29 @@
   </group>
   <group>
     <variant frequency="1" name="Linothorax 1">
-      <textures><texture file="skeletal/hele_isp_a_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_a_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Linothorax 2">
-      <textures><texture file="skeletal/hele_isp_a_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_a_2.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Linothorax 3">
-      <textures><texture file="skeletal/hele_isp_a_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_a_3.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_hoplite.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"/>
@@ -49,16 +63,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/athenians/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
index c83d9b6988..fef67fd69f 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_hoplite.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
@@ -14,15 +14,29 @@
   </group>
   <group>
     <variant frequency="3" name="tunic">
-      <textures><texture file="skeletal/hele_tunic.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_tunic.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="tunic 2">
-      <textures><texture file="skeletal/hele_isp_b_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_b_2.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="tunic 3">
-      <textures><texture file="skeletal/hele_isp_b_3.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_b_3.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_hoplite.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
@@ -37,16 +51,6 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
index d5d0aeab09..595396ff07 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_hoplite.xml">
+    <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/shields/hele_round_e.xml" attachpoint="shield_arm"/>
@@ -26,12 +26,24 @@
   </group>
   <group>
     <variant frequency="1" name="cuirass 1">
-      <textures><texture file="skeletal/hele_isp_e_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_isp_e_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="scale mail 1">
-      <textures><texture file="skeletal/hele_linothorax_scale.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_linothorax_scale.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant file="biped/base_hoplite.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"/>
@@ -46,16 +58,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/athenians/iphicrates.xml b/binaries/data/mods/public/art/actors/units/athenians/iphicrates.xml
index 4ea9c3e533..e5098c62f8 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/iphicrates.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/iphicrates.xml
@@ -20,26 +20,6 @@
     <variant file="biped/attack_ranged_javelinist_heavy.xml"/>
     <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>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml
index 18ad0a7d15..c8433d5316 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml
@@ -19,29 +19,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_ranged_oxybeles_fire_a.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml
index 1739020823..daf575acfc 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml
@@ -19,29 +19,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_ranged_oxybeles_fire_b.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/pericles.xml b/binaries/data/mods/public/art/actors/units/athenians/pericles.xml
index 7ac8a22fc0..90fea737e6 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/pericles.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/pericles.xml
@@ -20,26 +20,6 @@
     <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>playercolor_spec.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/themistocles.xml b/binaries/data/mods/public/art/actors/units/athenians/themistocles.xml
index 7715647073..21ecf7daf2 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/themistocles.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/themistocles.xml
@@ -10,7 +10,9 @@
         <prop actor="props/units/weapons/xiphos_alexander.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/athen_aspis_themistocles.xml" attachpoint="shield_arm"/>
       </props>
-      <textures><texture file="skeletal/hele_themistocles.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_themistocles.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/trader_r.xml b/binaries/data/mods/public/art/actors/units/athenians/trader_r.xml
index 0bf6fc6728..63033ebcc5 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/trader_r.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/trader_r.xml
@@ -9,8 +9,14 @@
         <prop actor="props/units/heads/hele_straw.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/trader_staff.xml" attachpoint="weapon_L"/>
       </props>
-      <textures><texture file="skeletal/hele_trd.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_trd.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>