diff --git a/binaries/data/mods/public/art/actors/units/celts/boudicca_horse.xml b/binaries/data/mods/public/art/actors/units/celts/boudicca_horse.xml
index 45408ab798..49d607217a 100644
--- a/binaries/data/mods/public/art/actors/units/celts/boudicca_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/boudicca_horse.xml
@@ -7,11 +7,11 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="100"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="80"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
         <animation name=""/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/public/art/actors/units/celts/caradoc.xml b/binaries/data/mods/public/art/actors/units/celts/caradoc.xml
index fa6ae18cd6..0c88324585 100644
--- a/binaries/data/mods/public/art/actors/units/celts/caradoc.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/caradoc.xml
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="100"/>
         <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="85"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="6"/>
-        <animation file="infantry/sword/move/run/isw_s_def_em_off.dae" name="Run" speed="6"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="6"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="100"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Attack" speed="100"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Attack" speed="100"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="267"/>
+		<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_hero.dae</mesh>
       <props>
@@ -27,7 +29,5 @@
       <texture>skeletal/celt_caradoc.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a.xml
index d47f8bf551..95589a93a9 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a.xml
@@ -7,10 +7,10 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml
index 23e52c42e4..2c9e7a9307 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml
@@ -7,10 +7,10 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="80"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e.xml
index 29bcddaa89..adba54d0d4 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e.xml
@@ -7,10 +7,10 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a.xml
index 872eee081c..cbe79cf572 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a.xml
@@ -7,11 +7,11 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="90"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="85"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a_r.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a_r.xml
index 827b250ff1..20712ef4b5 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_a_r.xml
@@ -7,10 +7,13 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
-        <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="250"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="250"/>
+        <animation file="biped/rider_sword_death_a.psa" name="death" speed="240"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="250"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="250"/>
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b.xml
index 09681ea46a..d7855d81d1 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b.xml
@@ -7,11 +7,11 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="105"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="95"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b_r.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b_r.xml
index 8470b6c361..20cac65896 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_b_r.xml
@@ -7,10 +7,13 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
-        <animation file="biped/rider_sword_death_a.psa" name="death" speed="200"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="250"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="250"/>
+        <animation file="biped/rider_sword_death_a.psa" name="death" speed="240"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="250"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="250"/>
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e.xml
index 196c93eed1..d3131cb3c7 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e.xml
@@ -7,12 +7,11 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="100"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="80"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
-        <animation name=""/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e_r.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e_r.xml
index 435f9ac22a..4e0d0dd181 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_swordsman_e_r.xml
@@ -7,10 +7,13 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
-        <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="250"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="250"/>
+        <animation file="biped/rider_sword_death_a.psa" name="death" speed="240"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="250"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="250"/>
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml b/binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml
index 30c33d2a58..3e424ecc55 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml
@@ -7,11 +7,11 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="10"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="200"/>
-        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="250"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <colour>0 0 0</colour>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
index 8cf0ffdcfa..5d090530e6 100644
--- a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
-        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
-        <animation file="female/f_lumber_01.dae" name="gather_wood" speed="100"/>
-        <animation file="female/f_farm_01.dae" name="gather_grain" speed="150"/>
-        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="100"/>
-        <animation file="female/f_gather_01.dae" name="gather_meat" speed="100"/>
-        <animation file="female/f_mine_01.dae" name="gather_stone" speed="150"/>
-        <animation file="female/f_mine_01.dae" name="gather_metal" speed="150"/>
-        <animation file="female/f_build_01.dae" name="Build" speed="150"/>
-        <animation file="female/f_death_01.dae" name="Death" speed="100"/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
+        <animation file="female/f_lumber_01.dae" name="gather_tree" speed="50"/>
+        <animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
+        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
+        <animation file="female/f_gather_01.dae" name="gather_meat" speed="25"/>
+        <animation file="female/f_mine_01.dae" name="gather_rock" speed="140"/>
+        <animation file="female/f_mine_01.dae" name="gather_ore" speed="140"/>
+        <animation file="female/f_build_01.dae" name="Build" speed="40"/>
+        <animation file="female/f_death_01.dae" name="Death" speed="120"/>
       </animations>
       <mesh>skeletal/f_dress.dae</mesh>
       <props>
@@ -32,10 +31,10 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
-    <variant name="gather_wood">
+    <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_grain">
@@ -51,16 +50,23 @@
         <prop attachpoint="l_hand"/>
       </props>
     </variant>
-    <variant name="gather_stone">
+    <variant name="gather_meat">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
       <props>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
-    <variant name="gather_metal">
+    <variant name="gather_ore">
       <props>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="Build">
diff --git a/binaries/data/mods/public/art/actors/units/celts/healer.xml b/binaries/data/mods/public/art/actors/units/celts/healer.xml
index 249f4fc8e5..e70579dca4 100644
--- a/binaries/data/mods/public/art/actors/units/celts/healer.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/healer.xml
@@ -1,30 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_staff_walk_a.dae" name="Walk" speed="20"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_dress_cuffs.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_celt_su3.xml" attachpoint="head"/>
         <prop actor="props/units/cape_m_long.xml" attachpoint="shoulders"/>
         <prop actor="props/units/heads/celt_hood_priest.xml" attachpoint="helmet"/>
+        <prop actor="props/units/staff.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="healer-outfit-1">
       <texture>skeletal/celt_healer_2.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
index c7e75a12c7..0849778720 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
@@ -10,22 +8,23 @@
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation event="0.4" file="biped/not used/ijv_def_02.psa" load="0" name="Melee" speed="100"/>
         <animation event="0.4" file="biped/not used/ijv_def_03.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
+        <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
@@ -35,7 +34,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="skin 01">
       <texture>skeletal/celt_ijv_a_01.dds</texture>
@@ -71,9 +69,12 @@
       <texture>skeletal/celt_ijv_a_11.dds</texture>
     </variant>
   </group>
-
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant frequency="100" name="Idle">
+      <props>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
     <variant name="Melee">
       <props>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
@@ -82,49 +83,57 @@
         <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
-    <variant name="gather_wood">
+    <variant name="gather_tree">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_grain">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="gather_fruit">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
-    <variant name="gather_stone">
+    <variant name="gather_meat">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
-    <variant name="gather_metal">
+    <variant name="gather_rock">
       <props>
+		<prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
         <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="Build">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
index c2e983dd82..e6ded00217 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
@@ -9,22 +9,23 @@
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.4" file="biped/not used/ijv_def_02.psa" load="0" name="Melee" speed="100"/>
         <animation file="biped/not used/ijv_def_03.psa" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
+        <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
@@ -45,44 +46,54 @@
         <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
-    <variant name="gather_wood">
+    <variant name="gather_tree">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_grain">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="gather_fruit">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
-    <variant name="gather_metal">
+    <variant name="gather_meat">
       <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
         <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
-    <variant name="gather_stone">
+    <variant name="gather_rock">
       <props>
-        <prop actor="" attachpoint="shield"/>
+		<prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="Build">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
index 44a3401206..7d3b65c345 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
+        <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_tights.dae</mesh>
       <props>
@@ -34,7 +33,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="Tattoos-1">
       <texture>skeletal/celt_ijv_e_01.dds</texture>
@@ -49,7 +47,6 @@
       <texture>skeletal/kart_isw_a_02.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="100" name="Idle">
       <props>
@@ -64,49 +61,64 @@
         <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
-    <variant name="gather_wood">
+    <variant name="gather_tree">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="gather_grain">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="gather_fruit">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
         <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="Build">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_a.xml
index 3145fa84f1..d708e81c5f 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_a.xml
@@ -7,24 +7,25 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="gather_meat" speed="325"/>
+        <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
@@ -80,46 +81,46 @@
         <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
       </props>
     </variant>
-    <variant name="gather_wood">
+    <variant name="gather_tree">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_grain">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_fruit">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
         <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+		<prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="Build">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml
index ca9f4bb2b3..4caf07359a 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml
@@ -7,24 +7,25 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="gather_meat" speed="350"/>
+        <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
@@ -59,46 +60,46 @@
         <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
       </props>
     </variant>
-    <variant name="gather_wood">
+    <variant name="gather_tree">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_grain">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_fruit">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
         <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+		<prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+		<prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="Build">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_e.xml
index 0e2ff54ef7..b2a4802b9c 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_e.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="100"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="80"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="85"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="gather_meat" speed="300"/>
+        <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
@@ -35,7 +35,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="Chain Mail-1">
       <texture>skeletal/celt_isw_e_01.dds</texture>
@@ -44,7 +43,6 @@
       <texture>skeletal/celt_isw_e_02.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
@@ -54,51 +52,55 @@
         <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
       </props>
     </variant>
-    <variant name="gather_wood">
+    <variant name="gather_tree">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="gather_grain">
       <props>
-        <prop actor="" attachpoint="shield"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="gather_fruit">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
         <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
     <variant name="Build">
       <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
       </props>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/super_unit_1.xml b/binaries/data/mods/public/art/actors/units/celts/super_unit_1.xml
index 97415708e1..6fe46d2a63 100644
--- a/binaries/data/mods/public/art/actors/units/celts/super_unit_1.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/super_unit_1.xml
@@ -6,17 +6,23 @@
       <animations>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
-        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="80"/>
-        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="70"/>
-        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="100"/>
-        <animation file="biped/inf_sword_ready_c.dae" name="Idle" speed="100"/>
-        <animation file="biped/inf_sword_ready_d.dae" name="Idle" speed="100"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_02.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_03.psa" name="Attack" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="85"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="50"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_c.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_d.dae" name="Idle" speed="110"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="80"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Attack" speed="80"/>
+		<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/super_unit_2.xml b/binaries/data/mods/public/art/actors/units/celts/super_unit_2.xml
index f7cdaaf9a5..4ab7607086 100644
--- a/binaries/data/mods/public/art/actors/units/celts/super_unit_2.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/super_unit_2.xml
@@ -7,11 +7,11 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="10"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Melee" speed="95"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Melee" speed="110"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/vercingetorix_horse.xml b/binaries/data/mods/public/art/actors/units/celts/vercingetorix_horse.xml
index 0f1533a9b7..94f5989be8 100644
--- a/binaries/data/mods/public/art/actors/units/celts/vercingetorix_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/vercingetorix_horse.xml
@@ -7,11 +7,11 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="10"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="200"/>
-        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="250"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <colour>0 0 0</colour>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
index f313e04cb8..ae98d74ae1 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
@@ -6,6 +6,7 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
         <animation file="female/f_lumber_01.dae" name="gather_tree" speed="50"/>
         <animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
         <animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/healer.xml b/binaries/data/mods/public/art/actors/units/hellenes/healer.xml
index c7b2e9ab2a..ef5a1ad9cd 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/healer.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/healer.xml
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
         <animation file="biped/inf_staff_idle_a.dae" name="Idle" speed="200"/>
         <animation file="biped/inf_staff_walk_a.dae" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="70"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_dress_a.pmd</mesh>
       <props>
@@ -17,7 +15,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="healer-robe-1">
       <props>
@@ -29,7 +26,5 @@
       <texture>skeletal/hele_healer_2.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml
index 810e651b46..d8cefe4dd1 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml
@@ -19,7 +19,7 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-		<animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml
index 516bc4a326..ba0c5dabd0 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml
@@ -6,7 +6,7 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="75"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="100"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml
index f5c82ecdec..382cc09fd1 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml
@@ -6,7 +6,7 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
         <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="75"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
index 5762e495a7..0a51bf334e 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
@@ -6,7 +6,7 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.25" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml
index e264a5ef64..510e5dba82 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml
@@ -11,7 +11,7 @@
         <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
+        <animation file="biped/inf_hoplite_atk_a.psa" name="gather_meat" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
@@ -21,7 +21,6 @@
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
@@ -86,15 +85,6 @@
         <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
       </props>
     </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
     <variant name="gather_rock">
       <props>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml
index d29a03541a..2282644dd3 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml
@@ -11,7 +11,7 @@
         <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
+        <animation file="biped/inf_hoplite_atk_a.psa" name="gather_meat" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
@@ -21,7 +21,6 @@
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
@@ -72,14 +71,6 @@
         <prop attachpoint="helmet"/>
       </props>
     </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
     <variant name="gather_rock">
       <props>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml
index 9b2aec8a55..d410449176 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml
@@ -6,12 +6,12 @@
       <animations>
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
-		 <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
+		<animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
         <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
         <animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
+        <animation file="biped/inf_hoplite_atk_a.psa" name="gather_meat" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
@@ -94,15 +94,6 @@
         <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
       </props>
     </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
     <variant name="gather_rock">
       <props>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds b/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds
index a4dd12ae28..63661d4ee7 100644
--- a/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds
+++ b/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0e29e9abf27ff4176321c17e4e1ca80702de877a02e1dd5ca632583036d1a11
+oid sha256:4021775a475b033c662f9867f294770704b7d6994d2759ba13b1a695756a62b1
 size 349680
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.png b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.png
new file mode 100644
index 0000000000..9dca91f96d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc1e0e95d3e8dee2bca9aa610600ff2edf45f85715920385ef68bd2187e553e6
+size 582321
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.xml b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.xml
new file mode 100644
index 0000000000..fd20571b59
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
+
+<Terrains>
+	<Terrain groups="city" movementclass="city" mmap="230 227 198" />
+</Terrains>
diff --git a/binaries/data/mods/public/maps/scenarios/Arcadia II.pmp b/binaries/data/mods/public/maps/scenarios/Arcadia II.pmp
index 631e3832aa..af75df68dc 100644
--- a/binaries/data/mods/public/maps/scenarios/Arcadia II.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Arcadia II.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edaddd28c474a578699e187c65b2e7bd690d33fad777c79ffb1daff5793e5e5e
-size 370020
+oid sha256:ad04a58c8fd4881b0f900f53c3ae51490ed7d0f57c651e2f98eff54c918553ed
+size 370043
diff --git a/binaries/data/mods/public/maps/scenarios/Arcadia II.xml b/binaries/data/mods/public/maps/scenarios/Arcadia II.xml
index 4f8e994708..2e7aa76083 100644
--- a/binaries/data/mods/public/maps/scenarios/Arcadia II.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Arcadia II.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c5e3906eb219c1401bd5b09d61c63c8095ddca1671fcb12fc1082e2308ed329
-size 706499
+oid sha256:dd36736e9fa7222df07c766beff34157b3edae813b105fd671f6dc3281861b74
+size 704579
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml b/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml
index 339ca62dfd..272d040ea2 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml
@@ -13,7 +13,7 @@
     <Actor>structures/celts/fortress_briton.xml</Actor>
   </VisualActor>
   <Footprint replace="">
-    <Circle radius="8.0"/>
+    <Circle radius="8.5"/>
     <Height>16.0</Height>
   </Footprint>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_house.xml b/binaries/data/mods/public/simulation/templates/structures/celt_house.xml
index da1f69cf6b..07f1c6e259 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_house.xml
@@ -8,4 +8,11 @@
   <VisualActor>
     <Actor>structures/celts/house.xml</Actor>
   </VisualActor>
+  <Footprint replace="">
+    <Circle radius="5.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml b/binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml
index a06118c673..e56986c297 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml
@@ -15,7 +15,7 @@
     <Actor>structures/celts/special.xml</Actor>
   </VisualActor>
   <Footprint replace="">
-    <Circle radius="8.0"/>
+    <Circle radius="9.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_temple.xml b/binaries/data/mods/public/simulation/templates/structures/celt_temple.xml
index d6622a9341..6eb5cb6ef9 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_temple.xml
@@ -8,6 +8,13 @@
   <Cost>
     <PopulationBonus>7</PopulationBonus>
   </Cost>
+  <Footprint replace="">
+    <Circle radius="8.0"/>
+    <Height>16.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="15.0" depth="15.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/celts/temple.xml</Actor>
   </VisualActor>