diff --git a/binaries/data/mods/official/art/actors/units/celts/brennus.xml b/binaries/data/mods/official/art/actors/units/celts/brennus.xml
index 1d7ca9caf7..d5dac104ae 100644
--- a/binaries/data/mods/official/art/actors/units/celts/brennus.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/brennus.xml
@@ -6,7 +6,7 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="Idle" speed="1"/>
         <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="100"/>
diff --git a/binaries/data/mods/official/art/actors/units/celts/britomartus.xml b/binaries/data/mods/official/art/actors/units/celts/britomartus.xml
index 089cca5833..6778fe781d 100644
--- a/binaries/data/mods/official/art/actors/units/celts/britomartus.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/britomartus.xml
@@ -6,12 +6,13 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="Idle" speed="1"/>
         <animation file="biped/walk_spearshield.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="biped/inf_spear_shield_atk_a.psa" name="Attack" speed="100"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Attack" speed="100"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
       </animations>
       <mesh>skeletal/m_hero_cape.dae</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/caradoc.xml b/binaries/data/mods/official/art/actors/units/celts/caradoc.xml
index 0ccacf3510..4a9954c2bf 100644
--- a/binaries/data/mods/official/art/actors/units/celts/caradoc.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/caradoc.xml
@@ -6,7 +6,7 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="Idle" speed="1"/>
         <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/sword/move/run/isw_s_def_em_off.dae" name="Run" speed="5"/>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cynvelin.xml b/binaries/data/mods/official/art/actors/units/celts/cynvelin.xml
index 76493b8a4c..6fb2777915 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cynvelin.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cynvelin.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" 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/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <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"/>
-      </animations>
-      <mesh>skeletal/m_hero_cape.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_cynelvin.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/celt_cynelvin.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
-        <prop actor="props/temp/l_sheath.xml" attachpoint="l_hip"/>
-      </props>
-      <texture>skeletal/celt_cynelvin.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="Idle" speed="1"/>
+        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
+        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <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"/>
+      </animations>
+      <mesh>skeletal/m_hero_cape.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_cynelvin.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/celt_cynelvin.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
+        <prop actor="props/temp/l_sheath.xml" attachpoint="l_hip"/>
+      </props>
+      <texture>skeletal/celt_cynelvin.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/cavalry_archer_e_r.xml b/binaries/data/mods/official/art/actors/units/persians/cavalry_archer_e_r.xml
index 88860389d9..1d0bb460e5 100644
--- a/binaries/data/mods/official/art/actors/units/persians/cavalry_archer_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/cavalry_archer_e_r.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
-        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <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="100"/>
-        <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"/>
-      </animations>
-      <mesh>skeletal/m_dress_cuffs.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
-        <prop actor="props/temp/quiver.xml" attachpoint="l_hip"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-        <prop actor="props/units/shields/pers_pelta_a_b_reverse.xml" attachpoint="back"/>
-        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
-      </props>
-      <texture>skeletal/pers_car_e_1.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
+        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <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="100"/>
+        <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"/>
+      </animations>
+      <mesh>skeletal/m_dress.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
+        <prop actor="props/temp/quiver.xml" attachpoint="l_hip"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+        <prop actor="props/units/shields/pers_pelta_a_b_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
+      </props>
+      <texture>skeletal/pers_car_e_2.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/infantry_archer_a.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_archer_a.xml
index 885f25ad9c..066314ae45 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_archer_a.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_archer_a.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
-        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <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="100"/>
-        <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"/>
-      </animations>
-      <mesh>skeletal/m_pants.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
-        <prop actor="props/temp/quiver.xml" attachpoint="l_hip"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
-      </props>
-      <texture>skeletal/pers_iar_a_1.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
+        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <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="100"/>
+        <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"/>
+      </animations>
+      <mesh>skeletal/m_pants_tunic.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
+        <prop actor="props/temp/quiver.xml" attachpoint="l_hip"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
+      </props>
+      <texture>skeletal/pers_iar_a_1.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/infantry_archer_b.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_archer_b.xml
index 2f6ca989e0..ee199b3cfb 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_archer_b.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_archer_b.xml
@@ -1,94 +1,94 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
-        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <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="100"/>
-        <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"/>
-      </animations>
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
-        <prop actor="props/temp/quiver.xml" attachpoint="l_hip"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-      <texture>skeletal/pers_iar_b_1.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
+        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <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="100"/>
+        <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"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
+        <prop actor="props/temp/quiver.xml" attachpoint="l_hip"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+      <texture>skeletal/pers_iar_b_1.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_a.xml
index 98ed461d98..c5e3eb3481 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_a.xml
@@ -1,96 +1,104 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<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="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="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
-      </animations>
-      <mesh>skeletal/m_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_pelta_e.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-      </props>
-      <texture>skeletal/pers_ijv_a_1.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <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 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 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 attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<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="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="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
+      </animations>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/pers_pelta_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant>
+      <texture>skeletal/pers_ijv_b_1.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/pers_ijv_b_2.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <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 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 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 attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" 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/official/art/actors/units/persians/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_b.xml
index 4e739c44df..cd8de1fd94 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_b.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<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="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="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
-      </animations>
-      <mesh>skeletal/m_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/pers_pelta_basic.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-      </props>
-      <texture>skeletal/pers_ijv_b_1.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <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 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 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 attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<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="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="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
+      </animations>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/pers_pelta_basic.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+      </props>
+      <texture>skeletal/pers_ijv_a_1.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <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 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 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 attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" 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/official/art/actors/units/persians/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_e.xml
index 59e012ccac..9a281b17ce 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_javelinist_e.xml
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<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="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="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
-      </animations>
-      <mesh>skeletal/m_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_pelta_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-      </props>
-      <texture>skeletal/pers_ijv_e_1.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <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 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 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 attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<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="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="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
+      </animations>
+      <mesh>skeletal/m_pants_tunic.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/pers_pelta_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+      </props>
+      <texture>skeletal/pers_ijv_e_3.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <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 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 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 attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" 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/official/art/actors/units/persians/infantry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_a.xml
index d9efda8d93..1080f53cd6 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_a.xml
@@ -52,7 +52,7 @@
     <variant name="Melee">
       <props>
         <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_b.xml
index af2569264e..5054efb65c 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_b.xml
@@ -49,7 +49,7 @@
     <variant name="Melee">
       <props>
         <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml
index 9ad796835e..927cf240bd 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml
@@ -49,7 +49,7 @@
     <variant name="Melee">
       <props>
         <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
index a90bbfa0a2..53db05853b 100644
--- a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
@@ -6,16 +6,16 @@
   <group>
     <variant frequency="100" name="Mesh">
       <animations>
-        <animation file="cavalry/uber/elephant_idle_01.psa" name="Idle" speed="100"/>
-        <animation file="cavalry/uber/elephant_idle_02.psa" name="Idle" speed="100"/>
-        <animation file="cavalry/uber/elephant_walk_01.psa" name="walk" speed="20"/>
-        <animation file="cavalry/uber/elephant_walk_01.psa" name="run " speed="30"/>
-        <animation file="cavalry/uber/elephant_attack_01.psa" name="melee" speed="100"/>
-        <animation file="cavalry/uber/elephant_attack_02.psa" name="melee" speed="100"/>
-        <animation file="cavalry/uber/elephant_attack_03.psa" name="melee" speed="100"/>
-        <animation file="cavalry/uber/elephant_death_01.psa" name="death" speed="300"/>
+        <animation file="quadraped/elephant_idle_01.dae" name="Idle" speed="100"/>
+        <animation file="quadraped/elephant_idle_02.dae" name="Idle" speed="100"/>
+        <animation file="quadraped/elephant_walk_01.dae" name="walk" speed="20"/>
+        <animation file="quadraped/elephant_run_01.dae" name="run " speed="30"/>
+        <animation file="quadraped/elephant_attack_03.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_attack_02.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_attack_01.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_death_01.dae" name="death" speed="300"/>
       </animations>
-      <mesh>skeletal/elephant_asian.pmd</mesh>
+      <mesh>skeletal/elephant_asian.dae</mesh>
       <props>
         <prop actor="units/persians/super_unit_2_mahout.xml" attachpoint="rider1"/>
         <prop actor="units/persians/super_unit_2_raja.xml" attachpoint="rider2"/>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml
index c74bee52eb..c5b635b922 100644
--- a/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="Base">
-      <animations>
-        <animation file="quadraped/elephant_rider_idle.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/elephant_rider_idle.psa" name="Walk" speed="18"/>
-        <animation file="quadraped/elephant_rider_idle.psa" name="Run" speed="8"/>
-        <animation file="quadraped/elephant_rider_idle.psa" name="melee" speed="50"/>
-      </animations>
-      <props>
-        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Raja-Texture-1">
-      <mesh>skeletal/m_pants.dae</mesh>
-      <texture>skeletal/pers_su2_raja_2.dds</texture>
-    </variant>
-    <variant frequency="1" name="Raja-Texture-2">
-      <mesh>skeletal/m_pants_celt.dae</mesh>
-      <texture>skeletal/pers_su2_raja_1.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Walk" speed="18"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Run" speed="8"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="melee" speed="50"/>
+      </animations>
+      <props>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/floppy_pers_e.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Raja-Texture-1">
+      <mesh>skeletal/m_pants.dae</mesh>
+      <texture>skeletal/pers_su2_raja_2.dds</texture>
+    </variant>
+    <variant frequency="1" name="Raja-Texture-2">
+      <mesh>skeletal/m_pants_celt.dae</mesh>
+      <texture>skeletal/pers_su2_raja_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_car_e_2.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_car_e_2.dds
new file mode 100644
index 0000000000..04ff7e5517
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_car_e_2.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc7e6d274b522a2dc477fc1e204ff819df7aec78d60491e582685abb13431a43
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_ijv_e_3.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_ijv_e_3.dds
new file mode 100644
index 0000000000..edd8b997cb
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_ijv_e_3.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24481f85b030848038d0af57e68138189009218e686c79b7b6089a7527b78cb9
+size 22000
diff --git a/binaries/data/mods/official/entities/structures/hele_theatron.xml b/binaries/data/mods/official/entities/structures/hele_theatron.xml
index e4761049ef..a28256d4e6 100644
--- a/binaries/data/mods/official/entities/structures/hele_theatron.xml
+++ b/binaries/data/mods/official/entities/structures/hele_theatron.xml
@@ -11,9 +11,19 @@
 			<Civ>Hellenes</Civ>
 
 			<History>Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.</History>
+			<Tooltip>Build one of these to take advantage of the Hellenisation civ bonus.</Tooltip>
 		
 		</Id>
 		
+		<Creation>
+			<Foundation>foundation_5x5</Foundation>
+			<Resource>
+				<Wood>200</Wood>
+				<Stone>500</Stone>
+ 			</Resource>
+			<BuildingLimitCategory>Fortress</BuildingLimitCategory>
+		</Creation>
+		
 		<Footprint>
 			<Radius>26.0</Radius>
 			<Height>8.0</Height>
diff --git a/binaries/data/mods/official/entities/structures/hele_wall_gate.xml b/binaries/data/mods/official/entities/structures/hele_wall_gate.xml
index 114ed3dccf..04a08741ba 100644
--- a/binaries/data/mods/official/entities/structures/hele_wall_gate.xml
+++ b/binaries/data/mods/official/entities/structures/hele_wall_gate.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_defense_wall_tower"
->
+<Entity	Parent="template_structure_defense_wall_gate">
 	<Traits>
 	
 		<Id>
 
-			<Specific>(Name)</Specific>
+			<Specific>Pule</Specific>
 
 			<Civ>Hellenes</Civ>
 
diff --git a/binaries/data/mods/official/entities/structures/hele_wall_tower.xml b/binaries/data/mods/official/entities/structures/hele_wall_tower.xml
index c40824c789..2047a1b833 100644
--- a/binaries/data/mods/official/entities/structures/hele_wall_tower.xml
+++ b/binaries/data/mods/official/entities/structures/hele_wall_tower.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_defense_wall_tower"
->
+<Entity	Parent="template_structure_defense_wall_tower">
 	<Traits>
 	
 		<Id>
diff --git a/binaries/data/mods/official/entities/template_structure.xml b/binaries/data/mods/official/entities/template_structure.xml
index 741217a8e8..4211a0bcdb 100644
--- a/binaries/data/mods/official/entities/template_structure.xml
+++ b/binaries/data/mods/official/entities/template_structure.xml
@@ -54,6 +54,14 @@
 			<Permanent>true</Permanent>
 		</Vision>
 	</Traits>
+	
+	<Actions>
+
+		<Create>
+			<Rally/>
+ 		</Create>
+
+	</Actions>
 
 	<Script File="scripts/entity_functions.js" />
 	<Event On="StartProduction" Function="entityStartProduction" />
diff --git a/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml b/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
index 44546db306..209121a304 100644
--- a/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
@@ -15,8 +15,7 @@
 
 			<Classes>Housing, Village, CivilCentre</Classes>
 
-			<Rollover>The heart of the player's empire. Trains economic units, and can only be built on settlements.</Rollover>
-		
+			<Tooltip>The heart of the player's empire. Trains economic units, and can only be built on settlements.</Tooltip>		
 		</Id>
 		
 		<Creation>
diff --git a/binaries/data/mods/official/entities/template_structure_civic_house.xml b/binaries/data/mods/official/entities/template_structure_civic_house.xml
index e483765c5f..2633d677cc 100644
--- a/binaries/data/mods/official/entities/template_structure_civic_house.xml
+++ b/binaries/data/mods/official/entities/template_structure_civic_house.xml
@@ -16,6 +16,7 @@
 			<Classes>Housing, Village</Classes>
 
 			<Rollover>A civic building that increases the player's population.</Rollover>
+			<Tooltip>Adds +5 to population limit.</Tooltip>
 		
 		</Id>
 		
diff --git a/binaries/data/mods/official/entities/template_structure_civic_temple.xml b/binaries/data/mods/official/entities/template_structure_civic_temple.xml
index cdcaaf67f6..35916c90e5 100644
--- a/binaries/data/mods/official/entities/template_structure_civic_temple.xml
+++ b/binaries/data/mods/official/entities/template_structure_civic_temple.xml
@@ -15,7 +15,7 @@
 
 			<Classes>Town</Classes>
 
-			<Rollover>The Temple trains physicians, researches medical technologies, and provides healing to nearby allied organic units.</Rollover>
+			<Tooltip>Trains physicians, researches medical technologies, and provides healing to nearby allied organic units.</Tooltip>
 		
 		</Id>
 		
@@ -58,5 +58,20 @@
 		</Population>
 
 	</Traits>
-
+	<Actions>
+		<Create>
+ 			<List>
+				<Train>
+					<Support_Healer />
+				</Train>
+ 				<Research>
+					<Real_Example />
+				</Research>
+ 			</List>
+ 			<Speed>1</Speed>
+			
+			<Rally/>
+ 		</Create>
+		
+	</Actions>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_structure_defense_scout_tower.xml b/binaries/data/mods/official/entities/template_structure_defense_scout_tower.xml
index 530a027c05..216d1be1c9 100644
--- a/binaries/data/mods/official/entities/template_structure_defense_scout_tower.xml
+++ b/binaries/data/mods/official/entities/template_structure_defense_scout_tower.xml
@@ -13,7 +13,7 @@
 
 			<Classes>Village</Classes>
 
-			<Rollover>Outposts can be built anywhere on a player's land, and garrisoned to provide reconnaissance and defense against attackers.</Rollover>
+			<Tooltip>Provides reconnaissance and defense against attackers when garrisoned.</Tooltip>
 		
 		</Id>
 		
diff --git a/binaries/data/mods/official/entities/template_structure_defense_wall.xml b/binaries/data/mods/official/entities/template_structure_defense_wall.xml
index 258d840eaa..0ce8dfcc11 100644
--- a/binaries/data/mods/official/entities/template_structure_defense_wall.xml
+++ b/binaries/data/mods/official/entities/template_structure_defense_wall.xml
@@ -15,7 +15,7 @@
 
 			<Classes>Village</Classes>
 
-			<Rollover>Build walls to protect a town, close off choke points, and defend resource sites.</Rollover>
+			<Tooltip>Protects a town, closes off choke points, and defends resource sites.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_defense_wall_gate.xml b/binaries/data/mods/official/entities/template_structure_defense_wall_gate.xml
index cbe5e4dce6..01f8b73042 100644
--- a/binaries/data/mods/official/entities/template_structure_defense_wall_gate.xml
+++ b/binaries/data/mods/official/entities/template_structure_defense_wall_gate.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_civic"
->
+<Entity	Parent="template_structure_civic">
 	<Traits>
 	
 		<Id>
@@ -15,7 +13,7 @@
 
 			<Classes>Village</Classes>
 
-			<Rollover>Gates allow allied units access through a wall, but are also its most vulnerable point.</Rollover>
+			<Tooltip>Gates allow allied units access through a wall, but are also its most vulnerable point.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_defense_wall_tower.xml b/binaries/data/mods/official/entities/template_structure_defense_wall_tower.xml
index 9ec83e1328..b32b7ea63b 100644
--- a/binaries/data/mods/official/entities/template_structure_defense_wall_tower.xml
+++ b/binaries/data/mods/official/entities/template_structure_defense_wall_tower.xml
@@ -15,7 +15,7 @@
 
 			<Classes>Village</Classes>
 
-			<Rollover>Towers can be garrisoned to defend a city wall against attackers.</Rollover>
+			<Tooltip>Towers can be garrisoned to defend a city wall against attackers.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_economic_farmstead.xml b/binaries/data/mods/official/entities/template_structure_economic_farmstead.xml
index d122e93ec8..d55a41d04c 100644
--- a/binaries/data/mods/official/entities/template_structure_economic_farmstead.xml
+++ b/binaries/data/mods/official/entities/template_structure_economic_farmstead.xml
@@ -13,7 +13,7 @@
 
 			<Classes>Village</Classes>
 
-			<Rollover>The Farmstead is the centre for food gathering operations. Fields and Corrals must be built at lots adjacent to it.</Rollover>
+			<Tooltip>Gather food within this building's aura.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_economic_market.xml b/binaries/data/mods/official/entities/template_structure_economic_market.xml
index d5882167df..8b804a8de2 100644
--- a/binaries/data/mods/official/entities/template_structure_economic_market.xml
+++ b/binaries/data/mods/official/entities/template_structure_economic_market.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_economic"
->
+<Entity	Parent="template_structure_economic">
 	<Traits>
 	
 		<Id>
@@ -15,7 +13,7 @@
 
 			<Classes>Town</Classes>
 
-			<Rollover>The Market creates trade units and allows resources to be bartered. Traders travel between Markets, generating resources on a successful round-trip.</Rollover>
+			<Tooltip>Creates Trade units and allows resources to be Bartered.</Tooltip>
 		
 		</Id>
 		
diff --git a/binaries/data/mods/official/entities/template_structure_economic_mill.xml b/binaries/data/mods/official/entities/template_structure_economic_mill.xml
index 99463bf7a3..db18976367 100644
--- a/binaries/data/mods/official/entities/template_structure_economic_mill.xml
+++ b/binaries/data/mods/official/entities/template_structure_economic_mill.xml
@@ -13,7 +13,7 @@
 
 			<Classes>Village, Mill</Classes>
 
-			<Rollover>A Mill must be constructed near a source of Wood, Stone or Metal in order to collect them. It also provides technologies that improve gathering of these resources.</Rollover>
+			<Tooltip>Gather Wood, Stone, and Metal within its aura. Researches economic imprevements.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_military_barracks.xml b/binaries/data/mods/official/entities/template_structure_military_barracks.xml
index a47099d774..ad3f166b75 100644
--- a/binaries/data/mods/official/entities/template_structure_military_barracks.xml
+++ b/binaries/data/mods/official/entities/template_structure_military_barracks.xml
@@ -13,7 +13,7 @@
 
 			<Classes>Town</Classes>
 
-			<Rollover>The Barracks trains military units. Technologies may also be researched to improve their equipment.</Rollover>
+			<Tooltip>Trains citizen-soldiers. Research military technology.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_military_dock.xml b/binaries/data/mods/official/entities/template_structure_military_dock.xml
index c1581f91d0..8f29798230 100644
--- a/binaries/data/mods/official/entities/template_structure_military_dock.xml
+++ b/binaries/data/mods/official/entities/template_structure_military_dock.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_military"
->
+<Entity	Parent="template_structure_military">
 	<Traits>
 	
 		<Id>
@@ -15,7 +13,7 @@
 
 			<Classes>Town</Classes>
 
-			<Rollover>Naval vessels are manufactured at this building. A Dock must be built on the shoreline of a body of water.</Rollover>
+			<Tooltip>Manufacture naval vessels here. Also allows for sea trade. Must be built on the shoreline only.</Tooltip>
 		
 		</Id>
 		<Creation>
@@ -50,4 +48,5 @@
 
 	</Traits>
 
+	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_structure_military_fortress.xml b/binaries/data/mods/official/entities/template_structure_military_fortress.xml
index 9de3a6ef3b..401687b497 100644
--- a/binaries/data/mods/official/entities/template_structure_military_fortress.xml
+++ b/binaries/data/mods/official/entities/template_structure_military_fortress.xml
@@ -13,7 +13,7 @@
 
 			<Classes>City</Classes>
 
-			<Rollover>The Fortress represents the pinnacle of a civilisation's military prowess. Heroes, powerful advanced units, and unique technologies are available from this structure.</Rollover>
+			<Tooltip>Trains Heroes and Siege Units. Researches some Special Technologies.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_resource_corral.xml b/binaries/data/mods/official/entities/template_structure_resource_corral.xml
index 2f76704475..33cd427a84 100644
--- a/binaries/data/mods/official/entities/template_structure_resource_corral.xml
+++ b/binaries/data/mods/official/entities/template_structure_resource_corral.xml
@@ -13,7 +13,7 @@
 
 			<Classes>Village</Classes>
 
-			<Rollover>Herd domestic animals into a Corral, and they will provide Food for your civilisation.</Rollover>
+			<Tooltip>Herd domestic animals here and they will provide Food for your civilisation.</Tooltip>
 		
 		</Id>
 
diff --git a/binaries/data/mods/official/entities/template_structure_resource_field.xml b/binaries/data/mods/official/entities/template_structure_resource_field.xml
index f6e407b968..905d1f7ca0 100644
--- a/binaries/data/mods/official/entities/template_structure_resource_field.xml
+++ b/binaries/data/mods/official/entities/template_structure_resource_field.xml
@@ -14,7 +14,7 @@
 
 			<Classes>Resource</Classes>
 
-			<Rollover>Assign an economic unit to a Field to harvest grain and generate Food.</Rollover>
+			<Tooltip>Assign an economic unit to a Field to harvest grain and generate Food.</Tooltip>
 
 			<History>Farming originated around 9500 BC in India and the Middle East. The history of agriculture is a central element of human history, as agricultural progress has been a crucial factor in worldwide socio-economic change. Wealth-building and militaristic specializations rarely seen in hunter-gatherer cultures are commonplace in agricultural and agro-industrial societies—when farmers became capable of producing food beyond the needs of their own families, others in the tribe/nation/empire were freed to devote themselves to projects other than food acquisition.</History>
 		
diff --git a/binaries/data/mods/official/entities/template_unit_infantry.xml b/binaries/data/mods/official/entities/template_unit_infantry.xml
index 54cfdcff7f..fa05700580 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry.xml
@@ -45,6 +45,7 @@
 					<Civil_Centre />
 					<Farmstead />
 					<Field />
+					<Corral />
 					<House />
 					<Market />
 					<Mill />
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
index 0c99141faf..121a7cac77 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
@@ -10,7 +10,7 @@
 			<Icon_Cell>36</Icon_Cell>
 
 			<Classes>Melee</Classes>
-		
+			<Tooltip>Bonused vs. Wall Gates.</Tooltip>		
 		</Id>
 			<Creation>
 				<Resource>
diff --git a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
index 7a9b59bf09..d9431b56d0 100644
--- a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
@@ -51,6 +51,7 @@
 					<Civil_Centre />
 					<Farmstead />
 					<Field />
+					<Corral />
 					<House />
 					<Market />
 					<Mill />
diff --git a/binaries/data/mods/official/entities/template_unit_support_healer.xml b/binaries/data/mods/official/entities/template_unit_support_healer.xml
index 5fb126a105..fe9ee1d4f7 100644
--- a/binaries/data/mods/official/entities/template_unit_support_healer.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_healer.xml
@@ -10,7 +10,7 @@
 			<Icon_Cell>33</Icon_Cell>
 
 			<Classes>Foot</Classes>
-		
+			<Tooltip>Heals units within his Aura.</Tooltip>		
 		</Id>
 		
 		<Creation>
diff --git a/binaries/data/mods/official/entities/template_unit_support_trader.xml b/binaries/data/mods/official/entities/template_unit_support_trader.xml
index 25c200e22d..8d0c87dc24 100644
--- a/binaries/data/mods/official/entities/template_unit_support_trader.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_trader.xml
@@ -13,7 +13,7 @@
 			<Classes>Trade</Classes>
 
 			<Rollover>Trade was a very important part of ancient civilisation - effective trading and control of trade routes equaled wealth. Trade took place by many forms from foot to caravans to merchant ships. One of the most notorious examples of the power of trade was the Silk Road.</Rollover>
-
+			<Tooltip>Trades resources between allied Markets.</Tooltip>
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/entities/units/cart_hero_hannibal.xml b/binaries/data/mods/official/entities/units/cart_hero_hannibal.xml
index 9ce295938a..3e95a73d1d 100644
--- a/binaries/data/mods/official/entities/units/cart_hero_hannibal.xml
+++ b/binaries/data/mods/official/entities/units/cart_hero_hannibal.xml
@@ -18,12 +18,12 @@
  			</Resource>
 		</Creation>		
 		<Armour>
-			<Hack>15.0</Hack>
+			<Hack>13.0</Hack>
 			<Pierce>25.0</Pierce>
 			<Crush>10.0</Crush>
 		</Armour>
 		<Health>
-			<Max>450</Max>
+			<Max>400</Max>
 		</Health>
 		<Footprint>
 			<Radius>2.8</Radius>
@@ -32,10 +32,10 @@
 		<Auras>
 			<Trample>
 				<Radius>4.25</Radius>
-				<Speed>1000</Speed>
+				<Speed>500</Speed>
 				<Duration>3</Duration>
-				<Crush>15.0</Crush>
-				<Hack>12.0</Hack>
+				<Crush>8.0</Crush>
+				<Hack>6.0</Hack>
 				<r>1.0</r>
 				<g>0.1</g>
 				<b>0.2</b>
diff --git a/binaries/data/mods/official/entities/units/hele_hero_alexander.xml b/binaries/data/mods/official/entities/units/hele_hero_alexander.xml
index 27c85f3a42..5b94824bd8 100644
--- a/binaries/data/mods/official/entities/units/hele_hero_alexander.xml
+++ b/binaries/data/mods/official/entities/units/hele_hero_alexander.xml
@@ -12,6 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>The most powerful hero of them all - son of Philip II, king of Macedonia (336 BC - 323 BC). After conquering the rest of the Thracians and quelling the unrest of the Greeks, Alexander embarked on a world-conquest march. Defeating the Persian forces at Granicus (334 BC), Issus (333 BC) and Gaugamela (331 BC), he became master of the Persian Empire. Entering India, he defeated king Porus at Hydaspes (326 BC), but his weary troops made him halt. Died in Babylon at the age of 33 while planning a campaign against Arabia.</History>
+			<Tooltip>Hero Aura: Increased Cavalry and Super Cavalry Attack</Tooltip> 
 		
 		</Id>
 		<Creation>
diff --git a/binaries/data/mods/official/entities/units/hele_hero_demetrius.xml b/binaries/data/mods/official/entities/units/hele_hero_demetrius.xml
index 183293ab56..c348ba508c 100644
--- a/binaries/data/mods/official/entities/units/hele_hero_demetrius.xml
+++ b/binaries/data/mods/official/entities/units/hele_hero_demetrius.xml
@@ -12,6 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>One of the Diadochi, king of Macedonia (294 BC - 288 BC), Demetrius was renowned as one of the bravest and most able successors of Alexander. As the son of Antigonus I Monophtalmus, he fought and won many important battles early on and was proclaimed king, along with his father, in 306 BC. Losing his Asian possessions after the battle of Ipsus, he later won the Macedonian throne. Fearing lest they should be overpowered by Demetrius, the other Diadochi united against him and defeated him.</History>
+			<Tooltip>Hero Aura: Increased Range and Attack for Siege Engines.</Tooltip>
 		
 		</Id>
 		<Creation>
@@ -28,7 +29,12 @@
 		<Health>
 			<Max>250</Max>
 			<RegenRate>0.2</RegenRate>
-		</Health>		
+		</Health>
+		<Stamina>
+			<Max>0</Max>
+			<BarHeight>0</BarHeight>
+			<Bar_Size>0</Bar_Size>
+		</Stamina>		
 	</Traits>
 	<Actions>
 		<Attack>
@@ -45,9 +51,9 @@
 			<Speed>4.5</Speed>
 			<TurningRadius>1.0</TurningRadius>
 			<Run>
-				<Speed>11.0</Speed>
-				<Range>600.0</Range>
-				<RangeMin>5.0</RangeMin>
+				<Speed>0</Speed>
+				<Range>0</Range>
+				<RangeMin>0</RangeMin>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/units/hele_hero_leonidas.xml b/binaries/data/mods/official/entities/units/hele_hero_leonidas.xml
index 8d2cb5fdf9..6c7074e46a 100644
--- a/binaries/data/mods/official/entities/units/hele_hero_leonidas.xml
+++ b/binaries/data/mods/official/entities/units/hele_hero_leonidas.xml
@@ -12,7 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>The king of Sparta, whom fought and died at the battle of Thermopylae in 480 BC. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw.</History>
-		
+			<Tooltip>Hero Aura: Increased Spartiate and Hoplite Attack.</Tooltip>
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/entities/units/hele_hero_philip.xml b/binaries/data/mods/official/entities/units/hele_hero_philip.xml
index 1fa22090b4..708e01a2ef 100644
--- a/binaries/data/mods/official/entities/units/hele_hero_philip.xml
+++ b/binaries/data/mods/official/entities/units/hele_hero_philip.xml
@@ -12,7 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>The king of Macedonia (359 BC - 336 BC), he carried out vast monetary and military reforms in order to make his kingdom the most powerful force in the Greek world. Greatly enlarged the size of Macedonia by conquering much of Thrace and subduing the Greeks. Murdered in Aegae while planning a campaign against Persia.</History>
-		
+			<Tooltip>Hero Aura: Increased Attack for Super Units.</Tooltip>		
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/entities/units/hele_hero_themistocles.xml b/binaries/data/mods/official/entities/units/hele_hero_themistocles.xml
index cdafd602d7..ca8ea4482a 100644
--- a/binaries/data/mods/official/entities/units/hele_hero_themistocles.xml
+++ b/binaries/data/mods/official/entities/units/hele_hero_themistocles.xml
@@ -12,7 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>The general whom persuaded the Athenians to invest their income from silver mines in a war navy of 200 Triremes. A key figure during the Persian Wars, he commanded the victorious Athenian navy at the decisive battle of Salamis in 479 BC. Later, he pursued an active policy against the Persians in the Aegean, thereby laying the foundations of future Athenian power. Ostracised by the Athenians, he was forced to flee to the protection of the Persians.</History>
-		
+			<Tooltip>Hero Aura: Increased Move Speed and decreased Build Time for Warships.</Tooltip>		
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/entities/units/hele_hero_xenophon.xml b/binaries/data/mods/official/entities/units/hele_hero_xenophon.xml
index de5a7ab03d..3e96d9b6b0 100644
--- a/binaries/data/mods/official/entities/units/hele_hero_xenophon.xml
+++ b/binaries/data/mods/official/entities/units/hele_hero_xenophon.xml
@@ -12,7 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>Xenophon (c. 430 B. C. to c. 355 B. C.) was a Greek soldier and (later) historian who was born in Athens of an oligarch family and was a student of Socrates during his youth. He was elected one of the new Greek leaders chosen to lead the army in its retreat out of Persia. Xenophon went on to fight and lead troops in numerous battles then later write numerous books on military tactics, organization and command throughout the remainder of his lifetime.</History>
-		
+			<Tooltip>Hero Aura: Increased Armour and Speed to units within his Formation. Increased Speed to Thracian Peltasts during his lifetime.</Tooltip>		
 		</Id>
 		<Armour>
 			<Hack>9.0</Hack>
diff --git a/binaries/data/mods/official/entities/units/hele_super_cavalry_mace.xml b/binaries/data/mods/official/entities/units/hele_super_cavalry_mace.xml
index dbd09f5386..1aec539866 100644
--- a/binaries/data/mods/official/entities/units/hele_super_cavalry_mace.xml
+++ b/binaries/data/mods/official/entities/units/hele_super_cavalry_mace.xml
@@ -12,6 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>Macedonian noblemen made up this elite cavalry unit, which was key to victory for Macedonian kings starting with Philip II, who increased their number from 600 to several thousand. The Companion Cavalry was also a preferred general stand.</History>
+			<Tooltip>Bonused vs. Cavalry and Archers. Weak vs. Super Units.</Tooltip>
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/entities/units/hele_super_infantry_mace.xml b/binaries/data/mods/official/entities/units/hele_super_infantry_mace.xml
index fb69772700..412623eddc 100644
--- a/binaries/data/mods/official/entities/units/hele_super_infantry_mace.xml
+++ b/binaries/data/mods/official/entities/units/hele_super_infantry_mace.xml
@@ -12,6 +12,8 @@
 			<Civ>Hellenes</Civ>
 
 			<History>'Foot Companions', these were the elite troops from the Macedonian phalanx, whom carried their Sarissas with both hands, the white shields being attached to their armour. The Sarissa and the new tactics they used were developed by Philip II under Theban influence. If properly protected by cavalry on both sides, the Pezhetairoi were virtually invincible to any kind of enemy unit. They were always deployed in deep formations of 16+.</History>
+			<Tooltip>Bonused vs. Cavalry and Infantry. Weak vs. Ranged Units. Uses the Syntagma Formation.</Tooltip>			
+
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/entities/units/hele_super_infantry_polis.xml b/binaries/data/mods/official/entities/units/hele_super_infantry_polis.xml
index 7ed088d037..f75e66aad1 100644
--- a/binaries/data/mods/official/entities/units/hele_super_infantry_polis.xml
+++ b/binaries/data/mods/official/entities/units/hele_super_infantry_polis.xml
@@ -12,7 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>The Spartans had a very peculiar form of government which enabled them to be professional soldiers. It not only enabled them, but actually forced them to be superior soldiers as a small group of Spartans had to dominate an enormous number of subjects and unwilling allies. The Spartan army was superior in Hellas, and in the rest of the known world. No other army was so well trained, and had such excellent equipment. They believed that traditional training was the key to success, and for centuries they were correct, as they never lost a battle in spite of their small numbers. Ironically enough, this concept ended the Spartan supremacy, as the Spartan phalanx could not resist the new sloped Theban phalanx and the invading integrated Macedonian forces. The end of the Spartan power marked the end of the domination of the phalanx.</History>
-		
+			<Tooltip>Bonused vs. Melee Cavalry and Infantry. Weak vs. Ranged Infantry and Ranged Cavalry. Long Train Time. Small bonus vs. All Persian Units.</Tooltip>		
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/entities/units/hele_super_ranged_polis.xml b/binaries/data/mods/official/entities/units/hele_super_ranged_polis.xml
index 86d9b43575..2edcaf6fea 100644
--- a/binaries/data/mods/official/entities/units/hele_super_ranged_polis.xml
+++ b/binaries/data/mods/official/entities/units/hele_super_ranged_polis.xml
@@ -12,7 +12,7 @@
 			<Civ>Hellenes</Civ>
 
 			<History>Ekdromos (literally: out runner) was a development of the hoplite. Development of the hoplite took many twists and turns based on the changing dynamics on the field of battle. Once armies began using Peltasts imported from Thrace something had to be done to counter this barrage of javelins thrown into the midst of a phalanx. The Thebans began to increase the armor of their hoplites, but the Athenians took a completely different approach and lightened the load for their infantry. The Ekdromoi would dash out from the phalanx, close with the enemy ranged units at speed, and cut them down at will. This approach also worked to harass more heavily armed troops as well, the enemy carrying too much weight to catch the vexatious Ekdromoi.</History>
-
+			<Tooltip>Bonused vs. Support Units and Ranged Units. Weak vs. Melee Units. Fast Move Speed.</Tooltip>
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/official/technologies/techtree/techtree-spreadsheet.xls b/binaries/data/mods/official/technologies/techtree/techtree-spreadsheet.xls
index 0ad374d925..803c026c23 100644
Binary files a/binaries/data/mods/official/technologies/techtree/techtree-spreadsheet.xls and b/binaries/data/mods/official/technologies/techtree/techtree-spreadsheet.xls differ