diff --git a/binaries/data/mods/public/art/actors/units/celts/boudicca_chariot.xml b/binaries/data/mods/public/art/actors/units/celts/boudicca_chariot.xml
index 0af3866219..7a126ebf42 100644
--- a/binaries/data/mods/public/art/actors/units/celts/boudicca_chariot.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/boudicca_chariot.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant>
       <animations>
@@ -20,7 +18,5 @@
       <texture>structural/celt_chariot_b.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml b/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml
index 9588c7fa60..d8f65f6821 100644
--- a/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
@@ -10,7 +8,7 @@
         <animation file="female/f_chariot_idle_01.dae" name="Walk" speed="20"/>
         <animation file="female/f_chariot_run_01.dae" name="Run" speed="10"/>
         <animation file="female/f_death_01.dae" name="Death" speed="100"/>
-        <animation file="female/f_jav_atk_01.dae" name="melee" speed="100"/>
+        <animation event="0.6" file="female/f_jav_atk_01.dae" load="0" name="melee" speed="120"/>
       </animations>
       <mesh>skeletal/f_tunic.dae</mesh>
       <props>
@@ -21,7 +19,6 @@
       <texture>skeletal/celt_boudicca_2.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant name="Melee">
       <props>
@@ -31,7 +28,5 @@
       </props>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a_r.xml
index 916ddc2277..5332237688 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_a_r.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
@@ -15,12 +13,12 @@
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="pants-01">
       <texture>skeletal/celt_ijv_a_01.dds</texture>
@@ -56,7 +54,5 @@
       <texture>skeletal/celt_ijv_a_11.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml
index d4411faf37..1c91132b43 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
@@ -22,7 +20,5 @@
       <texture>skeletal/celt_ijv_b_01.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e_r.xml
index fc8ae8a865..f8262bbdcf 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_e_r.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
@@ -16,13 +14,12 @@
       <props>
         <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
       <texture>skeletal/celt_ijv_e_01.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/super_unit_4_d.xml b/binaries/data/mods/public/art/actors/units/celts/super_unit_4_d.xml
index 1a3efab741..8a0f9cb61e 100644
--- a/binaries/data/mods/public/art/actors/units/celts/super_unit_4_d.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/super_unit_4_d.xml
@@ -1,20 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cav_chariot_rider_idle_a.dae" name="Idle" speed="20"/>
         <animation file="biped/cav_chariot_rider_idle_a.dae" name="Walk" speed="20"/>
         <animation file="biped/cav_chariot_rider_run_a.dae" name="Run" speed="5"/>
-        <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>
       <props>
         <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
@@ -22,7 +15,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="d-Tattoos-1">
       <mesh>skeletal/m_tights.dae</mesh>
@@ -53,7 +45,5 @@
       <texture>skeletal/kart_isw_a_05.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
index 0a51bf334e..59d5641c71 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
@@ -21,7 +21,7 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-		<animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
@@ -50,7 +50,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
       <props>
-	    <prop actor="" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
@@ -73,32 +73,32 @@
       <props>
         <prop attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
-		<prop attachpoint="shield"/>
+        <prop attachpoint="shield"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
     <variant name="gather_fruit">
       <props>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
-		<prop attachpoint="shield"/>
+        <prop attachpoint="shield"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
     <variant name="gather_rock">
       <props>
-		<prop attachpoint="r_hand"/>
-		<prop attachpoint="shield"/>
-		<prop attachpoint="helmet"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="gather_ore">
       <props>
         <prop attachpoint="r_hand"/>
-		<prop attachpoint="shield"/>
+        <prop attachpoint="shield"/>
         <prop attachpoint="helmet"/>
-		<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="Build">
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml
index 0af4f754d1..2efb60b59d 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_2.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
@@ -10,7 +8,7 @@
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="80"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Walk" speed="40"/>
-        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" name="Melee" speed="100"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
@@ -18,7 +16,7 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-		<animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
@@ -31,7 +29,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="Ekdromos-Chiton-01">
       <texture>skeletal/hele_su1_01.dds</texture>
@@ -43,7 +40,6 @@
       <texture>skeletal/hele_su1_03.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="100" name="Idle "/>
     <variant name="Melee">
@@ -54,7 +50,5 @@
       </props>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml b/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml
index 80825ac8cd..ecfafa950c 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml
@@ -9,12 +9,12 @@
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="80"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="walk" speed="40"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="run" speed="30"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" name="melee" speed="75"/>
+        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="melee" speed="75"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-		<animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
diff --git a/binaries/data/mods/public/art/meshes/props/ring.dae b/binaries/data/mods/public/art/meshes/props/ring.dae
new file mode 100644
index 0000000000..b28197cd46
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/ring.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fed64f120141337817435655a1ee13529e74ad3d6a7bf027eaec81ef29fa360
+size 5721
diff --git a/binaries/data/mods/public/maps/scenarios/We are Legion.xml b/binaries/data/mods/public/maps/scenarios/We are Legion.xml
index ecff97d73a..003894d9b9 100644
--- a/binaries/data/mods/public/maps/scenarios/We are Legion.xml	
+++ b/binaries/data/mods/public/maps/scenarios/We are Legion.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd40b1a849483493771cfcbaf97e8d9d837ece703d2e64c9b248f679fb220de4
-size 11512
+oid sha256:033de64654e540f0b4bbe5e1e59e7f2d812a6f9dc13219d065ce57b61323f942
+size 36573
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
index 7c3006916e..a9442d2300 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -16,4 +16,9 @@
       <RepeatTime>1500</RepeatTime>
     </Ranged>
   </Attack>
+  <Sound>
+    <SoundGroups>
+      <attack>attack/weapon/arrowfly.xml</attack>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
index 55048f79f3..6ae741e88e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -6,32 +6,32 @@
     <Tooltip>Bonused vs. Infantry Archer and Cavalry Swordsman.</Tooltip>
   </Identity>
   <Cost>
-    <BuildTime>15</BuildTime>
+    <BuildTime>12</BuildTime>
     <Resources>
       <food>100</food>
-      <wood>70</wood>
+      <wood>50</wood>
     </Resources>
   </Cost>
   <Health>
-    <Max>150</Max>
+    <Max>120</Max>
   </Health>
   <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>8.0</Crush>
+    <Hack>3.0</Hack>
+    <Pierce>3.0</Pierce>
+    <Crush>2.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
+    <WalkSpeed>10.8</WalkSpeed>
     <Run>
-      <Speed>23.0</Speed>
+      <Speed>32.4</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>30.0</Pierce>
+      <Pierce>35.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>40</MaxRange>
+      <MaxRange>44</MaxRange>
       <MinRange>16.0</MinRange>
       <ProjectileSpeed>30.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index 814b4f498b..6e506618b2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_cavalry">
   <Identity>
-    <GenericName>Hero</GenericName>
+    <GenericName>Hero Cavalry</GenericName>
     <Classes datatype="tokens">Hero Cavalry</Classes>
   </Identity>
   <Minimap>
@@ -9,57 +9,59 @@
   </Minimap>
   <Cost>
     <Population>2</Population>
-    <BuildTime>80</BuildTime>
+    <BuildTime>50</BuildTime>
     <Resources>
-      <food>150</food>
-      <metal>25</metal>
+      <food>100</food>
+	  <wood>0</wood>
+	  <stone>0</stone>
+      <metal>250</metal>
     </Resources>
   </Cost>
   <Loot>
     <xp>1000</xp>
-    <food>15</food>
+    <food>0</food>
     <wood>10</wood>
     <stone>10</stone>
     <metal>100</metal>
   </Loot>
   <Health>
-    <Max>400</Max>
+    <Max>500</Max>
     <RegenRate>0.5</RegenRate>
   </Health>
   <Stamina>
-    <Max>1500</Max>
+    <Max>2500</Max>
   </Stamina>
   <Armour>
-    <Hack>0.0</Hack>
-    <Pierce>0.0</Pierce>
-    <Crush>15.0</Crush>
+    <Hack>11.0</Hack>
+    <Pierce>13.0</Pierce>
+    <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>9.0</WalkSpeed>
+    <WalkSpeed>8.4</WalkSpeed>
     <Run>
-      <Speed>22.5</Speed>
-      <Range>600.0</Range>
+      <Speed>25.2</Speed>
+      <Range>1000.0</Range>
       <RangeMin>16.0</RangeMin>
     </Run>
   </UnitMotion>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
   <Attack>
     <Melee>
-      <Hack>1.0</Hack>
+      <Hack>25.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>3.6</MaxRange>
+      <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Charge>
-      <Hack>3.0</Hack>
+      <Hack>75.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>3.6</MaxRange>
+      <MaxRange>6.0</MaxRange>
     </Charge>
   </Attack>
-  <Vision>
-    <Range>68</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/sword.xml</attack>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
new file mode 100644
index 0000000000..63191adbad
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_super_cavalry_javelinist">
+  <Identity>
+    <GenericName>Hero Cavalry Javelinist</GenericName>
+    <Classes datatype="tokens">Hero Cavalry Ranged</Classes>
+  </Identity>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
+  <Cost>
+    <Population>2</Population>
+    <BuildTime>45</BuildTime>
+    <Resources>
+      <food>100</food>
+	  <wood>200</wood>
+	  <stone>0</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <xp>1000</xp>
+    <food>0</food>
+    <wood>10</wood>
+    <stone>10</stone>
+    <metal>100</metal>
+  </Loot>
+  <Health>
+    <Max>450</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Armour>
+    <Hack>8.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.6</WalkSpeed>
+    <Run>
+      <Speed>28.8</Speed>
+      <Range>1000.0</Range>
+      <RangeMin>16.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Ranged>
+      <Pierce>40.0</Pierce>
+    </Ranged>
+  </Attack>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
new file mode 100644
index 0000000000..b99f639d84
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Identity>
+    <GenericName>Hero Cavalry Spearman</GenericName>
+    <Classes datatype="tokens">Hero Cavalry</Classes>
+  </Identity>
+  <Cost>
+    <Resources>
+      <food>100</food>
+	  <wood>200</wood>
+	  <stone>0</stone>
+      <metal>50</metal>
+    </Resources>
+  </Cost>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>14.0</Pierce>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.0</WalkSpeed>
+    <Run>
+      <Speed>24.0</Speed>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>20.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+    <Charge>
+      <Hack>30.0</Hack>
+      <Pierce>60.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
+    </Charge>
+  </Attack>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
new file mode 100644
index 0000000000..a141e271aa
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Identity>
+    <GenericName>Hero Cavalry Swordsman</GenericName>
+    <Classes datatype="tokens">Hero Cavalry</Classes>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
index daed2fb138..af0e1917cf 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -8,10 +8,10 @@
     <Type>hero</Type>
   </Minimap>
   <Cost>
-    <BuildTime>60</BuildTime>
+    <BuildTime>40</BuildTime>
     <Resources>
-      <food>75</food>
-      <metal>25</metal>
+      <food>50</food>
+      <metal>200</metal>
     </Resources>
   </Cost>
   <Loot>
@@ -22,42 +22,42 @@
     <metal>100</metal>
   </Loot>
   <Health>
-    <Max>300</Max>
+    <Max>400</Max>
     <RegenRate>0.5</RegenRate>
   </Health>
   <Stamina>
-    <Max>1200</Max>
+    <Max>1500</Max>
   </Stamina>
   <Armour>
-    <Hack>0.0</Hack>
-    <Pierce>0.0</Pierce>
-    <Crush>12.0</Crush>
+    <Hack>10.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed>5.6</WalkSpeed>
     <Run>
-      <Speed>17.5</Speed>
+      <Speed>16.8</Speed>
       <Range>600.0</Range>
       <RangeMin>8.0</RangeMin>
     </Run>
   </UnitMotion>
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
+      <Hack>25.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>4.8</MaxRange>
+      <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Charge>
-      <Hack>30.0</Hack>
+      <Hack>50.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>600.0</MaxRange>
+      <MaxRange>5.0</MaxRange>
     </Charge>
   </Attack>
   <Vision>
-    <Range>60</Range>
+    <Range>80</Range>
   </Vision>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
new file mode 100644
index 0000000000..3f11625071
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_super_infantry_javelinist">
+  <Identity>
+    <GenericName>Hero Infantry Javelinist</GenericName>
+    <Classes datatype="tokens">Hero Infantry Ranged</Classes>
+  </Identity>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
+  <Cost>
+    <BuildTime>35</BuildTime>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
+  </Cost>
+  <Loot>
+    <xp>1000</xp>
+    <food>10</food>
+    <wood>10</wood>
+    <stone>10</stone>
+    <metal>100</metal>
+  </Loot>
+  <Health>
+    <Max>350</Max>
+    <RegenRate>0.2</RegenRate>
+  </Health>
+  <Armour>
+    <Hack>8.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>40.0</Pierce>
+    </Ranged>
+  </Attack>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
new file mode 100644
index 0000000000..4fa67b571f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry">
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry</Classes>
+  </Identity>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <Stamina>
+    <Max>1200</Max>
+  </Stamina>
+  <Armour>
+    <Hack>12.0</Hack>
+    <Pierce>11.0</Pierce>
+    <Crush>11.0</Crush>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>4.0</WalkSpeed>
+    <Run>
+      <Speed>12.0</Speed>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Melee>
+      <Hack>12.0</Hack>
+      <Pierce>27.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>7.0</MaxRange>
+    </Melee>
+    <Charge>
+      <Hack>18.0</Hack>
+      <Pierce>40.0</Pierce>
+      <MaxRange>7.0</MaxRange>
+    </Charge>
+  </Attack>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
new file mode 100644
index 0000000000..d898a02e79
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry">
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry</Classes>
+  </Identity>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <UnitMotion>
+    <WalkSpeed>5.2</WalkSpeed>
+    <Run>
+      <Speed>15.6</Speed>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>20.0</Pierce>
+      <Crush>0.0</Crush>
+    </Melee>
+    <Charge>
+      <Hack>20.0</Hack>
+      <Pierce>40.0</Pierce>
+    </Charge>
+  </Attack>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
new file mode 100644
index 0000000000..069351dc2b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry">
+  <Identity>
+    <GenericName>Hero</GenericName>
+    <Classes datatype="tokens">Hero Infantry</Classes>
+  </Identity>
+  <Health>
+    <Max>400</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Stamina>
+    <Max>1500</Max>
+  </Stamina>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>10.0</Crush>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.6</WalkSpeed>
+    <Run>
+      <Speed>16.8</Speed>
+      <Range>600.0</Range>
+      <RangeMin>8.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Melee>
+      <Hack>25.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+    <Charge>
+      <Hack>50.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+    </Charge>
+  </Attack>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+  <Sound>
+    <SoundGroups>
+      <attack>attack/weapon/sword.xml</attack>
+      <death>actor/human/death/death.xml</death>
+    </SoundGroups>
+  </Sound>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index bac0ff7c01..aa2cb7b4f3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -24,7 +24,7 @@
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>30.0</Pierce>
+      <Pierce>35.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>40</MaxRange>
       <MinRange>12.0</MinRange>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super.xml b/binaries/data/mods/public/simulation/templates/template_unit_super.xml
index 4bfe5c7fe4..06a6a5881d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super.xml
@@ -6,7 +6,7 @@
   </Identity>
   <Loot>
     <xp>150</xp>
-    <food>5</food>
+    <food>0</food>
     <wood>5</wood>
     <stone>5</stone>
     <metal>10</metal>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml
index bf3443ddc6..5114b66510 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml
@@ -6,6 +6,7 @@
   </Identity>
   <Cost>
     <Population>2</Population>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
       <wood>0</wood>
@@ -32,6 +33,9 @@
       <RangeMin>10.0</RangeMin>
     </Run>
   </UnitMotion>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
   <Attack>
     <Melee>
       <Hack>35.0</Hack>
@@ -55,9 +59,6 @@
   <Obstruction>
     <Unit radius="1.0"/>
   </Obstruction>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
   <Sound>
     <SoundGroups>
       <death>actor/fauna/death/death_horse.xml</death>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry_javelinist.xml
new file mode 100644
index 0000000000..648bada5fe
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry_javelinist.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_super_cavalry">
+  <Identity>
+    <GenericName>Super Cavalry Javelinist</GenericName>
+    <Classes datatype="tokens">Cavalry Ranged</Classes>
+  </Identity>
+  <Cost>
+    <Resources>
+      <food>100</food>
+      <wood>80</wood>
+    </Resources>
+  </Cost>
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>6.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.6</WalkSpeed>
+    <Run>
+      <Speed>28.8</Speed>
+      <Range>1000.0</Range>
+      <RangeMin>10.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>38.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>56</MaxRange>
+      <MinRange>16.0</MinRange>
+      <ProjectileSpeed>30.0</ProjectileSpeed>
+      <PrepareTime>1200</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Unit radius="1.0"/>
+  </Obstruction>
+  <Sound>
+    <SoundGroups>
+      <death>actor/fauna/death/death_horse.xml</death>
+      <attack>attack/weapon/arrowfly.xml</attack>
+    </SoundGroups>
+  </Sound>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_javelinist.xml
index 6ab229f2dc..52fde03eee 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_javelinist.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_super_infantry">
   <Identity>
-    <GenericName>Super Ranged</GenericName>
+    <GenericName>Super Infantry Javelinist</GenericName>
     <Classes datatype="tokens">Ranged</Classes>
   </Identity>
   <Cost>
     <BuildTime>12</BuildTime>
     <Resources>
       <food>50</food>
-      <wood>80</wood>
+      <wood>200</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
@@ -39,4 +39,9 @@
       <RepeatTime>2000</RepeatTime>
     </Ranged>
   </Attack>
+  <Sound>
+    <SoundGroups>
+      <attack>attack/weapon/arrowfly.xml</attack>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml
index 5aeb77ad06..59b14c2f89 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml
@@ -4,45 +4,9 @@
     <GenericName>Super Ranged</GenericName>
     <Classes datatype="tokens">Ranged</Classes>
   </Identity>
-  <Cost>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <food>75</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>150</Max>
-  </Health>
-  <Stamina>
-    <Max>800</Max>
-  </Stamina>
-  <Armour>
-    <Hack>0.0</Hack>
-    <Pierce>0.0</Pierce>
-    <Crush>12.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
-    <Run>
-      <Speed>17.5</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>55.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>28</MaxRange>
-      <MinRange>8.0</MinRange>
-      <ProjectileSpeed>25.0</ProjectileSpeed>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-    </Ranged>
-  </Attack>
-  <Vision>
-    <Range>48</Range>
-  </Vision>
+  <Sound>
+    <SoundGroups>
+      <attack>attack/weapon/arrowfly.xml</attack>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
index d19b652e75..bd05b037d2 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
@@ -9,37 +9,27 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>10</food>
-    <wood>4</wood>
-    <metal>2</metal>
-  </Loot>
-  <Stamina>
-    <Max>825</Max>
-  </Stamina>
+  <Health>
+    <Max>130</Max>
+  </Health>
   <Armour>
-    <Hack>2.2</Hack>
-    <Pierce>4.2</Pierce>
-    <Crush>8.2</Crush>
+    <Hack>3.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>3.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>11.2</WalkSpeed>
+    <WalkSpeed>11.44</WalkSpeed>
     <Run>
-      <Speed>22.9</Speed>
+      <Speed>34.32</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>32.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>40.0</MaxRange>
+      <Pierce>36.0</Pierce>
+      <MaxRange>48</MaxRange>
     </Ranged>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_a.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>56</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml
index d19b3fdcd6..3d4bb25ab1 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml
@@ -9,24 +9,15 @@
   <Promotion>
     <Entity>celt_cavalry_javelinist_a</Entity>
   </Promotion>
-  <Cost>
-    <BuildTime>15</BuildTime>
-  </Cost>
   <Armour>
-    <Pierce>3.0</Pierce>
-    <Crush>7.0</Crush>
+    <Hack>2.0</Hack>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>15.0</WalkSpeed>
+    <WalkSpeed>11.88</WalkSpeed>
     <Run>
-      <Speed>26.0</Speed>
+      <Speed>35.64</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Pierce>32.0</Pierce>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
index 945dca7b21..7d6531d7d0 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
@@ -6,37 +6,27 @@
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>10</food>
-    <wood>4</wood>
-    <metal>3</metal>
-  </Loot>
-  <Stamina>
-    <Max>850</Max>
-  </Stamina>
+  <Health>
+    <Max>140</Max>
+  </Health>
   <Armour>
-    <Hack>2.4</Hack>
-    <Pierce>4.4</Pierce>
-    <Crush>8.4</Crush>
+    <Hack>4.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>4.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>11.3</WalkSpeed>
+    <WalkSpeed>10.56</WalkSpeed>
     <Run>
-      <Speed>23.1</Speed>
+      <Speed>31.68</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>34.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>40.0</MaxRange>
+      <Pierce>37.0</Pierce>
+      <MaxRange>52</MaxRange>
     </Ranged>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_e.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
index 74f5a47448..346ed076ca 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
@@ -9,45 +9,26 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>14</food>
-    <wood>4</wood>
-    <metal>2</metal>
-  </Loot>
-  <Health>
-    <Max>163</Max>
-  </Health>
-  <Stamina>
-    <Max>825</Max>
-  </Stamina>
   <Armour>
-    <Hack>3.2</Hack>
-    <Pierce>10.2</Pierce>
-    <Crush>12.2</Crush>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>6.05</WalkSpeed>
+    <WalkSpeed>9.24</WalkSpeed>
     <Run>
-      <Speed>28.9</Speed>
+      <Speed>27.72</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Melee>
-      <Hack>16.0</Hack>
-      <Pierce>6.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>3.6</MaxRange>
+      <Hack>21.0</Hack>
     </Melee>
     <Charge>
-      <Hack>46.0</Hack>
-      <Pierce>16.0</Pierce>
-      <MaxRange>3.6</MaxRange>
+      <Hack>63.0</Hack>
     </Charge>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_spearman_a.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>64</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
index 11e46d9a76..7bd3b16acb 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
@@ -12,27 +12,30 @@
     <Entity>celt_cavalry_spearman_a</Entity>
   </Promotion>
   <Cost>
-    <BuildTime>15</BuildTime>
+    <BuildTime>10</BuildTime>
     <Population>1</Population>
     <Resources>
-      <food>90</food>
+      <food>75</food>
       <wood>0</wood>
     </Resources>
   </Cost>
   <Health>
-    <Max>50</Max>
+    <Max>100</Max>
   </Health>
   <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>5.0</Crush>
+    <Hack>3.0</Hack>
+    <Pierce>3.0</Pierce>
+    <Crush>3.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>10.0</WalkSpeed>
+    <WalkSpeed>9.68</WalkSpeed>
     <Run>
-      <Speed>25</Speed>
+      <Speed>29.04</Speed>
     </Run>
   </UnitMotion>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
@@ -40,7 +43,7 @@
       <Crush>0.0</Crush>
     </Melee>
     <Charge>
-      <Hack>40.0</Hack>
+      <Hack>60.0</Hack>
       <Pierce>0.0</Pierce>
     </Charge>
   </Attack>
@@ -54,7 +57,4 @@
   <Obstruction>
     <Unit radius="1.0"/>
   </Obstruction>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
index 8f23d1089b..88b47ba718 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
@@ -6,45 +6,26 @@
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>14</food>
-    <wood>5</wood>
-    <metal>3</metal>
-  </Loot>
-  <Health>
-    <Max>165</Max>
-  </Health>
-  <Stamina>
-    <Max>850</Max>
-  </Stamina>
   <Armour>
-    <Hack>3.4</Hack>
-    <Pierce>10.4</Pierce>
-    <Crush>12.4</Crush>
+    <Hack>6.0</Hack>
+    <Pierce>6.0</Pierce>
+    <Crush>6.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>6.15</WalkSpeed>
+    <WalkSpeed>8.8</WalkSpeed>
     <Run>
-      <Speed>29.1</Speed>
+      <Speed>26.4</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Melee>
-      <Hack>17.0</Hack>
-      <Pierce>7.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>3.6</MaxRange>
+      <Hack>22.0</Hack>
     </Melee>
     <Charge>
-      <Hack>47.0</Hack>
-      <Pierce>17.0</Pierce>
-      <MaxRange>3.6</MaxRange>
+      <Hack>66.0</Hack>
     </Charge>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_spearman_e.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>68</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
index dcf8ebed4d..dcf6588107 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
@@ -9,40 +9,29 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>14</food>
-    <wood>4</wood>
-    <metal>2</metal>
-  </Loot>
   <Health>
-    <Max>163</Max>
+    <Max>140</Max>
   </Health>
-  <Stamina>
-    <Max>825</Max>
-  </Stamina>
-  <Armour>
-    <Hack>3.2</Hack>
-    <Pierce>10.2</Pierce>
-    <Crush>12.2</Crush>
-  </Armour>
   <UnitMotion>
-    <WalkSpeed>10.2</WalkSpeed>
+    <WalkSpeed>9.68</WalkSpeed>
     <Run>
-      <Speed>19.9</Speed>
+      <Speed>29.04</Speed>
     </Run>
   </UnitMotion>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>6.0</Crush>
+  </Armour>
   <Attack>
     <Melee>
-      <Hack>19.0</Hack>
+      <Hack>21.0</Hack>
     </Melee>
     <Charge>
-      <Hack>53.0</Hack>
+      <Hack>63.0</Hack>
     </Charge>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_swordsman_a.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>64</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml
index e530b34b89..628afbad36 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml
@@ -9,35 +9,15 @@
   <Promotion>
     <Entity>celt_cavalry_swordsman_a</Entity>
   </Promotion>
-  <Cost>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <wood>10</wood>
-      <metal>20</metal>
-    </Resources>
-  </Cost>
   <Armour>
     <Hack>3.0</Hack>
-    <Pierce>9.0</Pierce>
-    <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>14.0</WalkSpeed>
+    <WalkSpeed>10.12</WalkSpeed>
     <Run>
-      <Speed>25.5</Speed>
+      <Speed>30.36</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>18.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-    </Melee>
-    <Charge>
-      <Hack>54.0</Hack>
-      <Pierce>0.0</Pierce>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_swordsman_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
index 46bef0eb56..4ea6536ad4 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
@@ -6,40 +6,29 @@
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>14</food>
-    <wood>5</wood>
-    <metal>2</metal>
-  </Loot>
   <Health>
-    <Max>165</Max>
+    <Max>150</Max>
   </Health>
-  <Stamina>
-    <Max>850</Max>
-  </Stamina>
-  <Armour>
-    <Hack>3.4</Hack>
-    <Pierce>10.4</Pierce>
-    <Crush>12.4</Crush>
-  </Armour>
   <UnitMotion>
-    <WalkSpeed>10.3</WalkSpeed>
+    <WalkSpeed>9.24</WalkSpeed>
     <Run>
-      <Speed>20.1</Speed>
+      <Speed>27.72</Speed>
     </Run>
   </UnitMotion>
+  <Armour>
+    <Hack>7.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
   <Attack>
     <Melee>
-      <Hack>21.0</Hack>
+      <Hack>22.0</Hack>
     </Melee>
     <Charge>
-      <Hack>55.0</Hack>
+      <Hack>66.0</Hack>
     </Charge>
   </Attack>
   <VisualActor>
     <Actor>units/celts/cavalry_swordsman_e.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>68</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
index 78af2ff4df..a49ffd4df1 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_ranged">
+<Entity parent="template_unit_hero_cavalry_javelinist">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Boudicca</SpecificName>
@@ -11,20 +11,16 @@
     <Population>4</Population>
     <BuildTime>50</BuildTime>
     <Resources>
-      <food>180</food>
+      <food>200</food>
       <wood>100</wood>
-      <metal>250</metal>
+      <metal>100</metal>
     </Resources>
   </Cost>
   <Health>
-    <Max>350</Max>
+    <Max>500</Max>
   </Health>
-  <Stamina>
-    <Max>1000</Max>
-  </Stamina>
   <Armour>
     <Hack>7.0</Hack>
-    <Pierce>12.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
@@ -33,18 +29,12 @@
       <Speed>26.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>50.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>30</MaxRange>
-      <MinRange>0.0</MinRange>
-      <ProjectileSpeed>30.0</ProjectileSpeed>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-    </Ranged>
-  </Attack>
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
   </VisualActor>
@@ -55,10 +45,4 @@
   <Obstruction>
     <Unit radius="1.5"/>
   </Obstruction>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
index e2b2a85285..5117db227f 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
+<Entity parent="template_unit_hero_infantry_swordsman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brennus</SpecificName>
@@ -7,52 +7,22 @@
     <History>Brennus is the name which the Roman historians give to the famous leader of the Gauls who took Rome in the time of Camillus. According to Geoffrey, the brothers invaded Gaul and sacked Rome in 390 B.C., "proving" that Britons had conquered Rome, the greatest civilization in the world, long before Rome conquered the Britons. We know from many ancient sources which predate Geoffrey that Rome was indeed sacked in 390 B.C., and that the raid was led by a man named Brennus, but he and his invading horde were Gallic, not British. In this episode several features of Geoffrey's editing method can be seen: he modified the historical Brennus, created the brother Belinus, borrowed the Gallic invasion, but omitted the parts where the Gauls seemed weak or foolish. His technique is both additive and subtractive. Like the tale of Trojan origin, the story of the sack of Rome is not pure fabrication; it is a creative rearrangement of the available facts, with details added as necessary. By virtue of their historical association, Beli and Bran are often muddled with the earlier brothers Belinus and Brennus (the sons of Porrex) who contended for power in northern Britain in around 390 BC, and were regarded as gods in old Celtic tradition.</History>
     <Icon>units/celt_hero_brennus.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>45</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>250</wood>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>220</Max>
-  </Health>
-  <Stamina>
-    <Max>700</Max>
-  </Stamina>
   <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>9.0</Hack>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>10.0</WalkSpeed>
+    <WalkSpeed>6.16</WalkSpeed>
     <Run>
-      <Speed>20.0</Speed>
+      <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>25.0</Crush>
-      <RepeatTime>1500</RepeatTime>
-    </Melee>
-    <Charge>
-      <Hack>60.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>50.0</Crush>
-      <MaxRange>5.0</MaxRange>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/celts/brennus.xml</Actor>
-  </VisualActor>
   <Auras>
     <Courage>
       <Radius>20</Radius>
       <Bonus>5</Bonus>
     </Courage>
   </Auras>
+  <VisualActor>
+    <Actor>units/celts/brennus.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
index f6968c0453..a0dc2b8e3e 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
+<Entity parent="template_unit_hero_infantry_spearman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Britomartus</SpecificName>
@@ -7,45 +7,15 @@
     <History> The story of how Marcus Claudius Marcellus killed a Gallic leader at Clastidium (222 BC) is typical of such encounters. Advancing with a smallish army, Marcellus met a combined force of Insubrian Gauls and Gaesatae at Clastidium. The Gallic army advanced with the usual rush and terrifying cries, and their king, Britomartus, picking out Marcellus by means of his badges of rank, made for him, shouting a challenge and brandishing his spear. Britomartus was an outstanding figure not only for his size but also for his adornments; for he was resplendent in bright colours and his armour shone with gold and silver. This armour, thought Marcellus, would be a fitting offering to the gods. He charged the Gaul, pierced his bright breastplate and cast him to the ground. It was an easy task to kill Britomartus and strip him of his armour.</History>
     <Icon>units/celt_hero_britomartus.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>50</BuildTime>
-    <Resources>
-      <food>80</food>
-      <wood>0</wood>
-      <metal>400</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>200</Max>
-  </Health>
-  <Stamina>
-    <Max>500</Max>
-  </Stamina>
   <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>14.0</Pierce>
-    <Crush>20.0</Crush>
+    <Hack>9.0</Hack>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed>5.72</WalkSpeed>
     <Run>
-      <Speed>14.0</Speed>
+      <Speed>17.16</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>0.0</Hack>
-      <Pierce>50.0</Pierce>
-      <Crush>0.0</Crush>
-      <RepeatTime>1500</RepeatTime>
-    </Melee>
-    <Charge>
-      <Hack>0.0</Hack>
-      <Pierce>150.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/britomartus.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
index 2c68e85b68..01bec007bb 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
+<Entity parent="template_unit_hero_infantry_swordsman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Caratacos</SpecificName>
@@ -7,51 +7,30 @@
     <History>Caratacos's name is better known in its Romanized form, Caratacus. Under this name he is remembered as a fierce defender of Britain against the Romans after their invasion in 43 AD. Son of King Cynvelin of the Catuvellauni tribe, Caratacos fought for nine years against the Romans with little success, eventually fleeing to the tribes in Wales, where he was defeated decisively. Finally he entered Northern Britain, where was handed over to the Romans. Taken to Rome, Caratacos was allowed to live by the Emperor Claudius and died in Italy.</History>
     <Icon>units/celt_hero_caratacos.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>50</BuildTime>
-    <Resources>
-      <food>150</food>
-      <metal>175</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>225</Max>
-  </Health>
-  <Stamina>
-    <Max>700</Max>
-  </Stamina>
   <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>14.0</Crush>
+    <Hack>8.0</Hack>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
+    <WalkSpeed>6.16</WalkSpeed>
     <Run>
-      <Speed>17.0</Speed>
+      <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>50.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <RepeatTime>1500</RepeatTime>
-    </Melee>
-    <Charge>
-      <Hack>150.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/celts/caradoc.xml</Actor>
-  </VisualActor>
   <Auras>
     <Courage>
       <Radius>20</Radius>
       <Bonus>5</Bonus>
     </Courage>
   </Auras>
+  <Attack>
+    <Melee>
+      <Hack>27.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>54.0</Hack>
+    </Charge>
+  </Attack>
+  <VisualActor>
+    <Actor>units/celts/caradoc.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
index d0a624cf4e..1dfed14280 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
+<Entity parent="template_unit_hero_cavalry_swordsman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Cynvelin</SpecificName>
@@ -7,55 +7,22 @@
     <History>Cynvelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cynvelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacos’s capture. According to legend, the Apostle Paul baptized Cynvelin into Christianity before he died in Italy.</History>
     <Icon>units/celt_hero_cynvelin.png</Icon>
   </Identity>
-  <Cost>
-    <Population>2</Population>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <food>135</food>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>250</Max>
-  </Health>
-  <Stamina>
-    <Max>1000</Max>
-  </Stamina>
   <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>14.0</Pierce>
-    <Crush>14.0</Crush>
+    <Hack>10.0</Hack>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>9.0</WalkSpeed>
+    <WalkSpeed>9.24</WalkSpeed>
     <Run>
-      <Speed>22.0</Speed>
+      <Speed>27.72</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>40.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <RepeatTime>1500</RepeatTime>
-    </Melee>
-    <Charge>
-      <Hack>120.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/celts/cynvelin_horse.xml</Actor>
-  </VisualActor>
-  <Vision>
-    <Range>68</Range>
-  </Vision>
   <Auras>
     <Heal>
       <Radius>25</Radius>
       <Speed>1000</Speed>
     </Heal>
   </Auras>
+  <VisualActor>
+    <Actor>units/celts/cynvelin_horse.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
index 0238db0f9c..e52544c13d 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
+<Entity parent="template_unit_hero_cavalry_swordsman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Vercingetorix</SpecificName>
@@ -8,45 +8,34 @@
     <Icon>units/celt_hero_vercingetorix.png</Icon>
   </Identity>
   <Cost>
-    <BuildTime>50</BuildTime>
     <Resources>
-      <food>150</food>
-      <metal>300</metal>
+      <metal>260</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>300</Max>
-  </Health>
-  <Stamina>
-    <Max>2000</Max>
-  </Stamina>
   <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>13.0</Pierce>
-    <Crush>13.0</Crush>
+    <Hack>10.0</Hack>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>9.0</WalkSpeed>
+    <WalkSpeed>9.24</WalkSpeed>
     <Run>
-      <Speed>22.0</Speed>
+      <Speed>27.72</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>50.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>150.0</Hack>
-      <MaxRange>5.0</MaxRange>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/celts/vercingetorix_horse.xml</Actor>
-  </VisualActor>
   <Auras>
     <Courage>
       <Radius>20</Radius>
       <Bonus>5</Bonus>
     </Courage>
   </Auras>
+  <Attack>
+    <Melee>
+      <Hack>27.0</Hack>
+    </Melee>
+    <Charge>
+      <Hack>54.0</Hack>
+    </Charge>
+  </Attack>
+  <VisualActor>
+    <Actor>units/celts/vercingetorix_horse.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
index 290045fc92..39772929a5 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
@@ -9,38 +9,27 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>1</food>
-    <wood>13</wood>
-    <stone>1</stone>
-    <metal>2</metal>
-  </Loot>
   <Health>
-    <Max>83</Max>
+    <Max>100</Max>
   </Health>
-  <Stamina>
-    <Max>525</Max>
-  </Stamina>
   <Armour>
-    <Hack>1.2</Hack>
-    <Pierce>5.2</Pierce>
-    <Crush>2.2</Crush>
+    <Hack>3.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>9.2</WalkSpeed>
+    <WalkSpeed>7.48</WalkSpeed>
     <Run>
-      <Speed>17.9</Speed>
+      <Speed>22.44</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Ranged>
-      <Pierce>35.0</Pierce>
+      <Pierce>36.0</Pierce>
+      <MaxRange>44</MaxRange>
     </Ranged>
   </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_a.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>52</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml
index 27136e2980..5c0c8544b5 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml
@@ -9,16 +9,13 @@
   <Promotion>
     <Entity>celt_infantry_javelinist_a</Entity>
   </Promotion>
-  <Cost>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <wood>45</wood>
-    </Resources>
-  </Cost>
+  <Armour>
+    <Hack>2.0</Hack>
+  </Armour>
   <UnitMotion>
-    <WalkSpeed>9.0</WalkSpeed>
+    <WalkSpeed>7.92</WalkSpeed>
     <Run>
-      <Speed>17.8</Speed>
+      <Speed>23.76</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
index 25691a4b88..c03fbc29c3 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
@@ -6,38 +6,27 @@
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
-  <Loot>
-    <food>1</food>
-    <wood>13</wood>
-    <stone>1</stone>
-    <metal>3</metal>
-  </Loot>
   <Health>
-    <Max>85</Max>
+    <Max>110</Max>
   </Health>
-  <Stamina>
-    <Max>550</Max>
-  </Stamina>
   <Armour>
-    <Hack>1.4</Hack>
-    <Pierce>5.4</Pierce>
-    <Crush>2.4</Crush>
+    <Hack>4.0</Hack>
+    <Pierce>5.0</Pierce>
+    <Crush>4.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>9.3</WalkSpeed>
+    <WalkSpeed>6.6</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed>19.8</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Ranged>
-      <Pierce>40.0</Pierce>
+      <Pierce>37.0</Pierce>
+      <MaxRange>48</MaxRange>
     </Ranged>
   </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_e.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>56</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
index 57f1f3d1c6..03a6b17750 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
@@ -10,20 +10,17 @@
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
   <Health>
-    <Max>93</Max>
+    <Max>110</Max>
   </Health>
-  <Stamina>
-    <Max>325</Max>
-  </Stamina>
   <Armour>
-    <Hack>5.2</Hack>
-    <Pierce>3.2</Pierce>
-    <Crush>10.2</Crush>
+    <Hack>4.0</Hack>
+    <Pierce>6.0</Pierce>
+    <Crush>6.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>7.2</WalkSpeed>
+    <WalkSpeed>6.16</WalkSpeed>
     <Run>
-      <Speed>14.9</Speed>
+      <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
   <Attack>
@@ -32,14 +29,11 @@
       <Pierce>16.0</Pierce>
     </Melee>
     <Charge>
-      <Hack>33.0</Hack>
-      <Pierce>13.0</Pierce>
+      <Hack>12.0</Hack>
+      <Pierce>32.0</Pierce>
     </Charge>
   </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_spearman_a.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>56</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
index 8c2dfea343..ce7e9dcdc0 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
@@ -9,41 +9,18 @@
   <Promotion>
     <Entity>celt_infantry_spearman_a</Entity>
   </Promotion>
-  <Cost>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <wood>45</wood>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>90</Max>
-  </Health>
-  <Stamina>
-    <Max>300</Max>
-  </Stamina>
   <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>3.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>3.0</Hack>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed>6.6</WalkSpeed>
     <Run>
-      <Speed>14.8</Speed>
+      <Speed>19.8</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Charge>
-      <Hack>32.0</Hack>
-      <Pierce>12.0</Pierce>
-    </Charge>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_spearman_b.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>52</Range>
-  </Vision>
   <Builder>
     <Entities datatype="tokens">
       -structures/{civ}_fortress
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
index dbbf9397f5..1e999f28cd 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
@@ -7,20 +7,17 @@
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
   <Health>
-    <Max>95</Max>
+    <Max>120</Max>
   </Health>
-  <Stamina>
-    <Max>350</Max>
-  </Stamina>
   <Armour>
-    <Hack>5.4</Hack>
-    <Pierce>3.4</Pierce>
-    <Crush>10.4</Crush>
+    <Hack>6.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>7.0</Crush>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>7.3</WalkSpeed>
+    <WalkSpeed>5.72</WalkSpeed>
     <Run>
-      <Speed>15.1</Speed>
+      <Speed>17.16</Speed>
     </Run>
   </UnitMotion>
   <Attack>
@@ -29,14 +26,11 @@
       <Pierce>17.0</Pierce>
     </Melee>
     <Charge>
-      <Hack>34.0</Hack>
-      <Pierce>14.0</Pierce>
+      <Hack>14.0</Hack>
+      <Pierce>34.0</Pierce>
     </Charge>
   </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_spearman_e.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml
index 8d7e696d91..f1b46fbb67 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super_ranged">
+<Entity parent="template_unit_super_cavalry_javelinist">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brythonic Carbanto</SpecificName>
@@ -19,12 +19,8 @@
   <Health>
     <Max>200</Max>
   </Health>
-  <Stamina>
-    <Max>2500</Max>
-  </Stamina>
   <Armour>
     <Hack>5.0</Hack>
-    <Pierce>6.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
   <UnitMotion>
@@ -33,18 +29,6 @@
       <Speed>30.0</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>38.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>56</MaxRange>
-      <MinRange>16.0</MinRange>
-      <ProjectileSpeed>30.0</ProjectileSpeed>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/super_unit_4.xml</Actor>
   </VisualActor>
@@ -55,8 +39,4 @@
   <Obstruction>
     <Unit radius="1.5"/>
   </Obstruction>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
-  
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml
index fe13044fe9..f8209d80bd 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super_cavalry">
+<Entity parent="template_unit_super_cavalry_spearman">
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Gallic Brihent</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml
index 9c16ddc25a..737e01152d 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml
@@ -7,42 +7,25 @@
     <History>Two-handed swordsmen from Briton. These men are veteran soldiers who offer their lives in service to their Brythonic lords.</History>
     <Icon>units/celt_super_infantry_brit.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <food>65</food>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>100</Max>
-  </Health>
   <Armour>
-    <Hack>12.0</Hack>
-    <Pierce>2.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>9.0</Hack>
+    <Pierce>5.0</Pierce>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed>6.16</WalkSpeed>
     <Run>
-      <Speed>16.5</Speed>
+      <Speed>18.48</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Melee>
-      <Hack>35.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <RepeatTime>1500</RepeatTime>
+      <Hack>25.0</Hack>
     </Melee>
     <Charge>
-      <Hack>85.0</Hack>
-      <MaxRange>3.0</MaxRange>
+      <Hack>50.0</Hack>
     </Charge>
   </Attack>
   <VisualActor>
     <Actor>units/celts/super_unit_3.xml</Actor>
   </VisualActor>
-  
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml
index 72478c846d..6ca4cd1a8b 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml
@@ -26,5 +26,4 @@
   <VisualActor>
     <Actor>units/celts/super_unit_1.xml</Actor>
   </VisualActor>
-  
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
index 10479cc984..855b20d890 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
@@ -1,54 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
+<Entity parent="template_unit_hero_cavalry_swordsman">
   <Identity>
     <Civ>hele</Civ>
-    <SpecificName>Alexander</SpecificName>
+    <SpecificName>Alexander The Great</SpecificName>
     <Tooltip>Hero Aura: Increased Cavalry and Super Cavalry Attack and Speed. "Herocide" attack bonus vs. enemy Heroes.</Tooltip>
     <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>
     <Icon>units/hele_hero_alexander.png</Icon>
   </Identity>
   <Cost>
-    <BuildTime>80</BuildTime>
     <Resources>
-      <wood>12</wood>
-      <metal>97</metal>
+      <metal>300</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <Stamina>
-    <Max>1385</Max>
-  </Stamina>
   <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>17.0</Pierce>
     <Crush>20.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.4</WalkSpeed>
-    <Run>
-      <Speed>18.5</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>45.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>157.5</Hack>
-    </Charge>
-  </Attack>
+  <Vision>
+    <Range>110</Range>
+  </Vision>
+  <Auras>
+    <Fear>
+      <Radius>80</Radius>
+      <Bonus>15</Bonus>
+    </Fear>
+  </Auras>
   <VisualActor>
     <Actor>units/hellenes/alexander.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>64</Range>
-  </Vision>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>15</Bonus>
-    </Courage>
-  </Auras>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
index 76db02f3c0..5da12a8711 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
+<Entity parent="template_unit_hero_infantry_pikeman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Demetrius</SpecificName>
@@ -7,47 +7,8 @@
     <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>
     <Icon>units/hele_hero_demetrius.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>55</BuildTime>
-    <Resources>
-      <wood>51</wood>
-      <metal>73</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>375</Max>
-  </Health>
-  <Stamina>
-    <Max>920</Max>
-  </Stamina>
-  <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>15.0</Pierce>
-    <Crush>22.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>4.7</WalkSpeed>
-    <Run>
-      <Speed>11.75</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>24.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>7.0</MaxRange>
-    </Melee>
-    <Charge>
-      <Hack>40.5</Hack>
-      <Pierce>48.0</Pierce>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/hellenes/demetrius.xml</Actor>
-  </VisualActor>
   <Vision>
-    <Range>36</Range>
+    <Range>88</Range>
   </Vision>
   <Auras>
     <Courage>
@@ -55,4 +16,7 @@
       <Bonus>5</Bonus>
     </Courage>
   </Auras>
+  <VisualActor>
+    <Actor>units/hellenes/demetrius.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
index 52c6fca5a3..753606f35b 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
+<Entity parent="template_unit_hero_infantry_spearman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Leonidas</SpecificName>
@@ -9,41 +9,11 @@
   </Identity>
   <Cost>
     <Resources>
-      <wood>35</wood>
-      <metal>150</metal>
+      <metal>110</metal>
     </Resources>
   </Cost>
-  <Stamina>
-    <Max>990</Max>
-  </Stamina>
-  <Armour>
-    <Hack>16.0</Hack>
-    <Pierce>21.0</Pierce>
-    <Crush>21.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.0</WalkSpeed>
-    <Run>
-      <Speed>12.5</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
-    </Melee>
-    <Charge>
-      <Hack>60.0</Hack>
-      <Pierce>60.0</Pierce>
-      <Crush>0.0</Crush>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/hellenes/leonidas.xml</Actor>
-  </VisualActor>
   <Vision>
-    <Range>32</Range>
+    <Range>88</Range>
   </Vision>
   <Auras>
     <Fear>
@@ -51,4 +21,19 @@
       <Bonus>5</Bonus>
     </Fear>
   </Auras>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>25.0</Pierce>
+      <MaxRange>6.0</MaxRange>
+    </Melee>
+    <Charge>
+      <Hack>20.0</Hack>
+      <Pierce>50.0</Pierce>
+      <MaxRange>6.0</MaxRange>
+    </Charge>
+  </Attack>
+  <VisualActor>
+    <Actor>units/hellenes/leonidas.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
index 5e43620ace..743f7f1d5f 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
+<Entity parent="template_unit_hero_cavalry_spearman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Philip II</SpecificName>
@@ -7,44 +7,8 @@
     <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>
     <Icon>units/hele_hero_philip.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>76</BuildTime>
-    <Resources>
-      <metal>93</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>480</Max>
-  </Health>
-  <Stamina>
-    <Max>1340</Max>
-  </Stamina>
-  <Armour>
-    <Hack>14.0</Hack>
-    <Pierce>11.0</Pierce>
-    <Crush>22.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.9</WalkSpeed>
-    <Run>
-      <Speed>17.25</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>32.0</Hack>
-      <Crush>3.0</Crush>
-    </Melee>
-    <Charge>
-      <Hack>112</Hack>
-      <Crush>9.0</Crush>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/hellenes/philip_horse.xml</Actor>
-  </VisualActor>
   <Vision>
-    <Range>64</Range>
+    <Range>110</Range>
   </Vision>
   <Auras>
     <Courage>
@@ -52,4 +16,7 @@
       <Bonus>5</Bonus>
     </Courage>
   </Auras>
+  <VisualActor>
+    <Actor>units/hellenes/philip_horse.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
index 9bef812fce..2d6c4301a8 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
+<Entity parent="template_unit_hero_infantry_swordsman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Themistocles</SpecificName>
@@ -7,41 +7,8 @@
     <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>
     <Icon>units/hele_hero_themistocles.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>56</BuildTime>
-    <Resources>
-      <metal>137</metal>
-    </Resources>
-  </Cost>
-  <Stamina>
-    <Max>990</Max>
-  </Stamina>
-  <Armour>
-    <Hack>16.0</Hack>
-    <Pierce>21.0</Pierce>
-    <Crush>21.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.0</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>30.0</Hack>
-      <Crush>3.0</Crush>
-    </Melee>
-    <Charge>
-      <Hack>70.0</Hack>
-      <Crush>7.5</Crush>
-    </Charge>
-  </Attack>
-  <VisualActor>
-    <Actor>units/hellenes/themistocles.xml</Actor>
-  </VisualActor>
   <Vision>
-    <Range>32</Range>
+    <Range>88</Range>
   </Vision>
   <Auras>
     <Fear>
@@ -49,4 +16,7 @@
       <Bonus>5</Bonus>
     </Fear>
   </Auras>
+  <VisualActor>
+    <Actor>units/hellenes/themistocles.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
index 8ac3fc3b93..7b73f82ee5 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_ranged">
+<Entity parent="template_unit_hero_infantry_javelinist">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Xenophon</SpecificName>
@@ -7,44 +7,14 @@
     <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>
     <Icon>units/hele_hero_xenophon.png</Icon>
   </Identity>
-  <Cost>
-    <BuildTime>56</BuildTime>
-    <Resources>
-      <wood>50</wood>
-      <metal>82</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>380</Max>
-  </Health>
-  <Stamina>
-    <Max>1005</Max>
-  </Stamina>
-  <Armour>
-    <Hack>12.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>22.0</Crush>
-  </Armour>
   <UnitMotion>
-    <WalkSpeed>9.0</WalkSpeed>
+    <WalkSpeed>8.8</WalkSpeed>
     <Run>
-      <Speed>16.0</Speed>
+      <Speed>17.6</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>60.0</Pierce>
-      <Crush>5.0</Crush>
-      <MaxRange>28.0</MaxRange>
-      <MinRange>8.0</MinRange>
-    </Ranged>
-  </Attack>
-  <VisualActor>
-    <Actor>units/hellenes/xenophon.xml</Actor>
-  </VisualActor>
   <Vision>
-    <Range>48</Range>
+    <Range>88</Range>
   </Vision>
   <Auras>
     <Courage>
@@ -52,4 +22,7 @@
       <Bonus>5</Bonus>
     </Courage>
   </Auras>
+  <VisualActor>
+    <Actor>units/hellenes/xenophon.xml</Actor>
+  </VisualActor>
 </Entity>