Index: binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
       <MaxRange>7.0</MaxRange>
Index: binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
       <MaxRange>7.0</MaxRange>
Index: binaries/data/mods/public/simulation/templates/hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/hero.xml
+++ binaries/data/mods/public/simulation/templates/hero.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
   <Attack>
     <Capture>
       <AttackName>Capture</AttackName>
@@ -8,35 +8,45 @@
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
+    <Melee merge="">
+      <Damage>
+        <Hack op="mul">2</Hack>
+        <Pierce op="mul">2</Pierce>
+        <Crush op="mul">2</Crush>
+      </Damage>
+    </Melee>
+    <Ranged merge="">
+      <Damage>
+        <Hack op="mul">2</Hack>
+        <Pierce op="mul">2</Pierce>
+        <Crush op="mul">2</Crush>
+      </Damage>
+      <Projectile>
+        <Spread op="mul">0.5</Spread>
+      </Projectile>
+    </Ranged>
   </Attack>
   <Auras datatype="tokens">
     units/heroes/hero_garrison
   </Auras>
   <Cost>
-    <Population>0</Population>
     <BuildTime>50</BuildTime>
-    <Resources>
-      <food>100</food>
-      <metal>250</metal>
-    </Resources>
   </Cost>
   <Identity>
-    <Classes datatype="tokens">Human</Classes>
-    <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
+    <VisibleClasses datatype="tokens">Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
     <Icon>technologies/laurel_wreath.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
+    <SelectionGroupName disable=""/>
+    <Rank disable=""/>
   </Identity>
   <Loot>
     <xp>400</xp>
-    <food>10</food>
-    <wood>0</wood>
-    <stone>0</stone>
-    <metal>25</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
+  <Promotion disable=""/>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
@@ -53,10 +63,6 @@
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <walk>actor/human/movement/walk.xml</walk>
-      <run>actor/human/movement/walk.xml</run>
-      <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
Index: binaries/data/mods/public/simulation/templates/hero_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/hero_cavalry.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="hero">
+  <Cost>
+    <Resources>
+      <food>300</food>
+      <wood>200</wood>
+      <metal>250</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>1200</Max>
+  </Health>
+  <Loot>
+    <food>30</food>
+    <wood>20</wood>
+    <metal>25</metal>
+  </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>8</Pierce>
+        <Crush>25</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="3.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/hero_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/hero_elephant.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="hero">
+  <Cost>
+    <Resources>
+      <food>600</food>
+      <metal>400</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>1500</Max>
+  </Health>
+  <Loot>
+    <food>60</food>
+    <metal>40</metal>
+  </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>10</Pierce>
+        <Crush>25</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/hero_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/hero_healer.xml
+++ binaries/data/mods/public/simulation/templates/hero_healer.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero">
-  <Attack disable=""/>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="hero">
   <Cost>
     <Resources>
       <food>200</food>
@@ -10,25 +9,16 @@
   </Cost>
   <Heal>
     <Range>20</Range>
-    <RangeOverlay>
-      <LineTexture>heal_overlay_range.png</LineTexture>
-      <LineTextureMask>heal_overlay_range_mask.png</LineTextureMask>
-      <LineThickness>0.35</LineThickness>
-    </RangeOverlay>
     <Health>6</Health>
-    <Interval>2000</Interval>
-    <UnhealableClasses datatype="tokens"/>
-    <HealableClasses datatype="tokens">Human</HealableClasses>
   </Heal>
   <Health>
     <Max>1000</Max>
   </Health>
-  <Identity>
-    <VisibleClasses datatype="tokens">-Soldier Healer Support</VisibleClasses>
-  </Identity>
-  <Position>
-    <Anchor>upright</Anchor>
-  </Position>
+  <Loot>
+    <food>20</food>
+    <wood>15</wood>
+    <metal>20</metal>
+  </Loot>
   <Resistance>
     <Entity>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/hero_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/hero_infantry.xml
+++ binaries/data/mods/public/simulation/templates/hero_infantry.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero">
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="hero">
   <Cost>
     <Resources>
       <food>200</food>
@@ -10,13 +10,11 @@
   <Health>
     <Max>1000</Max>
   </Health>
-  <Identity>
-    <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
-    <GenericName>Hero</GenericName>
-  </Identity>
-  <Position>
-    <Anchor>upright</Anchor>
-  </Position>
+  <Loot>
+    <food>20</food>
+    <wood>20</wood>
+    <metal>15</metal>
+  </Loot>
   <Resistance>
     <Entity>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero">
-  <Cost>
-    <Resources>
-      <food>300</food>
-      <wood>200</wood>
-      <metal>250</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="3.0" depth="6.0"/>
-    <Height>6.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1200</Max>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">FastMoving</Classes>
-    <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
-    <GenericName>Hero Cavalry</GenericName>
-    <Formations datatype="tokens">
-      special/formations/wedge
-    </Formations>
-  </Identity>
-  <Position>
-    <TurnRate>5</TurnRate>
-  </Position>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>10</Hack>
-        <Pierce>8</Pierce>
-        <Crush>25</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="3.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <trained>interface/alarm/alarm_create_cav.xml</trained>
-      <walk>actor/mounted/movement/walk.xml</walk>
-      <run>actor/mounted/movement/walk.xml</run>
-      <death>actor/fauna/death/death_horse.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>7.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <WalkSpeed op="mul">2</WalkSpeed>
-    <RunMultiplier>1.4</RunMultiplier>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
-  <Attack>
-    <Ranged>
-      <AttackName>Bow</AttackName>
-      <Damage>
-        <Pierce>28</Pierce>
-      </Damage>
-      <MaxRange>60</MaxRange>
-      <MinRange>0</MinRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>100</Speed>
-        <Spread>0.4</Spread>
-        <Gravity>50</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="5"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
-    <GenericName>Hero Cavalry Archer</GenericName>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">-2</Hack>
-        <Pierce op="add">-2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.89</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
-  <Attack>
-    <Melee>
-      <AttackName>Axe</AttackName>
-      <Damage>
-        <Hack>27.6</Hack>
-        <Crush>9.2</Crush>
-      </Damage>
-     <MaxRange>4</MaxRange>
-     <PrepareTime>500</PrepareTime>
-     <RepeatTime>1000</RepeatTime>
-     <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
-    <GenericName>Hero Cavalry Axeman</GenericName>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Pierce op="add">1</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
-  <Attack>
-    <Ranged>
-      <AttackName>Crossbow</AttackName>
-      <Damage>
-        <Pierce>80</Pierce>
-      </Damage>
-      <MaxRange>60</MaxRange>
-      <MinRange>0</MinRange>
-      <PrepareTime>2400</PrepareTime>
-      <RepeatTime>3000</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>120</Speed>
-        <Spread>0.4</Spread>
-        <Gravity>30</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="5"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Cavalry Crossbowman</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">-2</Hack>
-        <Pierce op="add">-2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.89</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
-  <Attack>
-    <Ranged>
-      <AttackName>Javelin</AttackName>
-      <Damage>
-        <Pierce>60</Pierce>
-      </Damage>
-      <MaxRange>30</MaxRange>
-      <MinRange>0</MinRange>
-      <PrepareTime>750</PrepareTime>
-      <RepeatTime>1250</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>70</Speed>
-        <Spread>0.8</Spread>
-        <Gravity>35</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="5"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Cavalry Javelineer</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">-2</Hack>
-        <Pierce op="add">-2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
-      <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.89</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
-  <Attack>
-    <Melee>
-      <AttackName>Mace</AttackName>
-      <Damage>
-        <Crush>32</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Cavalry Maceman</GenericName>
-    <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
-  </Identity>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
-  <Attack>
-    <Melee>
-      <AttackName>Spear</AttackName>
-      <Damage>
-        <Hack>16</Hack>
-        <Pierce>12</Pierce>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <Bonuses>
-        <BonusCavMelee>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.75</Multiplier>
-        </BonusCavMelee>
-      </Bonuses>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1250</RepeatTime>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Cavalry Spearman</GenericName>
-    <Tooltip>Counters: 1.75× vs Cavalry.</Tooltip>
-    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">1</Hack>
-        <Pierce op="add">2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry">
-  <Attack>
-    <Melee>
-      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
-      <Damage>
-        <Hack>26</Hack>
-      </Damage>
-     <MaxRange>4</MaxRange>
-     <PrepareTime>375</PrepareTime>
-     <RepeatTime>750</RepeatTime>
-     <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <wood op="add">-50</wood>
-      <metal op="add">50</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
-    <GenericName>Hero Cavalry Swordsman</GenericName>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">1</Hack>
-        <Pierce op="add">1</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero">
-  <Attack>
-    <Capture disable=""/>
-    <Melee>
-      <AttackName>Trunk</AttackName>
-      <Damage>
-        <Hack>60</Hack>
-        <Crush>240</Crush>
-      </Damage>
-      <MaxRange>5</MaxRange>
-      <PrepareTime>750</PrepareTime>
-      <RepeatTime>1500</RepeatTime>
-     <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <food>600</food>
-      <metal>400</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1500</Max>
-  </Health>
-  <Identity>
-    <GenericName>Hero Elephant</GenericName>
-    <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
-  </Identity>
-  <Loot>
-    <food>60</food>
-    <metal>40</metal>
-  </Loot>
-  <Position>
-    <TurnRate>3</TurnRate>
-  </Position>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>10</Hack>
-        <Pierce>10</Pierce>
-        <Crush>25</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/elephant_select.xml</select>
-      <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
-      <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
-      <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
-      <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
-      <walk>actor/mounted/movement/walk.xml</walk>
-      <run>actor/mounted/movement/walk.xml</run>
-      <death>actor/fauna/animal/elephant_death.xml</death>
-      <trained>actor/fauna/animal/elephant_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>10.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Ranged>
-      <AttackName>Bow</AttackName>
-      <Damage>
-        <Pierce>27</Pierce>
-      </Damage>
-      <MaxRange>60</MaxRange>
-      <MinRange>0</MinRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>100</Speed>
-        <Spread>0.4</Spread>
-        <Gravity>50</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
-    <GenericName>Hero Archer</GenericName>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">-2</Hack>
-        <Pierce op="add">-2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
-    </SoundGroups>
-  </Sound>
-  <Turretable/>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Melee>
-      <AttackName>Axe</AttackName>
-      <Damage>
-        <Hack>24</Hack>
-        <Crush>8</Crush>
-      </Damage>
-      <MaxRange>3</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
-    <GenericName>Hero Axeman</GenericName>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">3</Hack>
-        <Pierce op="add">4</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Ranged>
-      <AttackName>Crossbow</AttackName>
-      <Damage>
-        <Pierce>80</Pierce>
-      </Damage>
-      <MaxRange>60</MaxRange>
-      <MinRange>0</MinRange>
-      <PrepareTime>2400</PrepareTime>
-      <RepeatTime>3000</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>120</Speed>
-        <Spread>0.4</Spread>
-        <Gravity>30</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Infantry Crossbowman</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">-2</Hack>
-        <Pierce op="add">-2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
-    </SoundGroups>
-  </Sound>
-  <Turretable/>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Ranged>
-      <AttackName>Javelin</AttackName>
-      <Damage>
-        <Pierce>50</Pierce>
-      </Damage>
-      <MaxRange>30</MaxRange>
-      <MinRange>0</MinRange>
-      <PrepareTime>600</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>70</Speed>
-        <Spread>0.8</Spread>
-        <Gravity>35</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Infantry Javelineer</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">-2</Hack>
-        <Pierce op="add">-2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
-      <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
-    </SoundGroups>
-  </Sound>
-  <Turretable/>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Melee>
-      <AttackName>Mace</AttackName>
-      <Damage>
-        <Crush>28</Crush>
-      </Damage>
-      <MaxRange>3</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Infantry Maceman</GenericName>
-    <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">2</Hack>
-        <Pierce op="add">2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Melee>
-      <AttackName>Pike</AttackName>
-      <Damage>
-        <Hack>8</Hack>
-        <Pierce>12</Pierce>
-      </Damage>
-      <MaxRange>8</MaxRange>
-      <PrepareTime>1000</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Bonuses>
-        <BonusCavMelee>
-          <Classes>Cavalry</Classes>
-          <Multiplier>3.0</Multiplier>
-        </BonusCavMelee>
-      </Bonuses>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Pikeman</GenericName>
-    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
-    <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
-    <Formations datatype="tokens">
-      special/formations/syntagma
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">9</Hack>
-        <Pierce op="add">9</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/pike_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Melee>
-      <AttackName>Spear</AttackName>
-      <Damage>
-        <Hack>12</Hack>
-        <Pierce>10</Pierce>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>450</PrepareTime>
-      <RepeatTime>900</RepeatTime>
-      <Bonuses>
-        <BonusCavMelee>
-          <Classes>Cavalry</Classes>
-          <Multiplier>3.0</Multiplier>
-        </BonusCavMelee>
-      </Bonuses>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <GenericName>Hero Spearman</GenericName>
-    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
-    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
-    <Formations datatype="tokens">
-      special/formations/testudo
-    </Formations>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">4</Hack>
-        <Pierce op="add">4</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry">
-  <Attack>
-    <Melee>
-      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
-      <Damage>
-        <Hack>22</Hack>
-      </Damage>
-      <MaxRange>3</MaxRange>
-      <PrepareTime>375</PrepareTime>
-      <RepeatTime>750</RepeatTime>
-      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <wood op="add">-50</wood>
-      <metal op="add">50</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
-    <GenericName>Hero Swordsman</GenericName>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">4</Hack>
-        <Pierce op="add">4</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_javelineer">
+<Entity parent="hero_infantry|template_unit_champion_infantry_javelineer">
   <Auras datatype="tokens">
     units/heroes/athen_hero_iphicrates_1
     units/heroes/athen_hero_iphicrates_2
Index: binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_hero_infantry_spearman">
+<Entity parent="hero_infantry|hoplite|template_unit_champion_infantry_spearman">
   <Auras datatype="tokens">
     units/heroes/athen_hero_pericles_1
     units/heroes/athen_hero_pericles_2
Index: binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/athen_hero_themistocles_1
     units/heroes/athen_hero_themistocles_2
Index: binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_javelineer">
+<Entity parent="hero_infantry|template_unit_champion_infantry_javelineer">
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_javelineer">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_javelineer">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_cavalry_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_cavalry_javelineer.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_cavalry_javelineer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_javelineer">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_javelineer">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_sword.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_sword.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca_sword.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/brit/hero_caratacos.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/hero_caratacos.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/hero_caratacos.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/brit_hero_caratacos
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/brit_hero_cunobelin
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/hero_cunobelin_infantry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/brit_hero_cunobelin
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/cart/hero_hamilcar.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/hero_hamilcar.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/hero_hamilcar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
Index: binaries/data/mods/public/simulation/templates/units/cart/hero_hannibal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/hero_hannibal.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/hero_hannibal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_elephant_melee">
+<Entity parent="hero_elephant|template_unit_champion_elephant_melee">
   <Auras datatype="tokens">
     units/heroes/cart_hero_hannibal
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/cart/hero_maharbal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/hero_maharbal.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/hero_maharbal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Auras datatype="tokens">
     units/heroes/cart_hero_maharbal
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/gaul/hero_brennus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/hero_brennus.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/hero_brennus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/gaul_hero_brennus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/gaul_hero_vercingetorix
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/hero_vercingetorix_infantry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/gaul_hero_vercingetorix
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/gaul/hero_viridomarus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/hero_viridomarus.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/hero_viridomarus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_spearman">
   <Auras datatype="tokens">
     units/heroes/gaul_hero_viridomarus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/iber/hero_caros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/hero_caros.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/hero_caros.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/iber_hero_caros_1
     units/heroes/iber_hero_caros_2
Index: binaries/data/mods/public/simulation/templates/units/iber/hero_indibil.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/hero_indibil.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/hero_indibil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Auras datatype="tokens">
     units/heroes/iber_hero_indibil
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/iber/hero_indibil_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/hero_indibil_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/hero_indibil_infantry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_spearman">
   <Auras datatype="tokens">
     units/heroes/iber_hero_indibil
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/iber/hero_viriato.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/hero_viriato.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/hero_viriato.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/iber_hero_viriato_1
     units/heroes/iber_hero_viriato_2
Index: binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/kush_hero_amanirenas
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas_infantry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_archer">
+<Entity parent="hero_infantry|template_unit_champion_infantry_archer">
   <Auras datatype="tokens">
     units/heroes/kush_hero_amanirenas
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/kush/hero_arakamani.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/hero_arakamani.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/hero_arakamani.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_elephant_melee">
+<Entity parent="hero_elephant|template_unit_champion_elephant_melee">
   <Auras datatype="tokens">
     units/heroes/kush_hero_arakamani_1
     units/heroes/kush_hero_arakamani_2
Index: binaries/data/mods/public/simulation/templates/units/kush/hero_harsiotef.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/hero_harsiotef.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/hero_harsiotef.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/hero_nastasen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/hero_nastasen.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/hero_nastasen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Auras datatype="tokens">
     units/heroes/kush_hero_nastasen_1
     units/heroes/kush_hero_nastasen_2
Index: binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
Index: binaries/data/mods/public/simulation/templates/units/mace/hero_craterus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/hero_craterus.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/hero_craterus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
Index: binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
Index: binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Auras datatype="tokens">
     units/heroes/mace_hero_philip_ii
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_pikeman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_pikeman">
   <Auras datatype="tokens">
     units/heroes/mace_hero_philip_ii
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Auras datatype="tokens">
     units/heroes/mace_hero_pyrrhus_i
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/maur_hero_ashoka
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka_infantry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_archer">
+<Entity parent="hero_infantry|template_unit_champion_infantry_archer">
   <Auras datatype="tokens">
     units/heroes/maur_hero_ashoka
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/maur/hero_chanakya.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/hero_chanakya.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/hero_chanakya.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_healer">
+<Entity parent="hero_healer|template_unit_support_healer">
   <Auras datatype="tokens">
     units/heroes/maur_hero_chanakya_1
     units/heroes/maur_hero_chanakya_2
Index: binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_elephant_melee">
+<Entity parent="hero_elephant|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Chandragupta Maurya</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Auras datatype="tokens">
     units/heroes/pers_hero_cyrus_ii
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_darius_i
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_archer">
+<Entity parent="hero_infantry|template_unit_champion_infantry_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_xerxes_i
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_xerxes_i
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_archer">
+<Entity parent="hero_infantry|template_unit_champion_infantry_archer">
   <Auras datatype="tokens">
     units/heroes/ptol_hero_cleopatra_vii_1
     units/heroes/ptol_hero_cleopatra_vii_2
Index: binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_elephant_melee">
+<Entity parent="hero_elephant|template_unit_champion_elephant_melee">
   <Auras datatype="tokens">
     units/heroes/ptol_hero_ptolemy_i_1
     units/heroes/ptol_hero_ptolemy_i_2
Index: binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/ptol_hero_ptolemy_iv
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/rome_hero_marcellus_1
     units/heroes/rome_hero_marcellus_2
Index: binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/hero_marcellus_infantry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/rome_hero_marcellus_1
     units/heroes/rome_hero_marcellus_2
Index: binaries/data/mods/public/simulation/templates/units/rome/hero_maximus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/hero_maximus.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/hero_maximus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/rome_hero_maximus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/rome/hero_maximus_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/hero_maximus_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/hero_maximus_infantry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/rome_hero_maximus
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/rome/hero_scipio.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/hero_scipio.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/hero_scipio.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/rome_hero_scipio
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_spearman">
   <Auras datatype="tokens">
     units/heroes/sele_hero_antiochus_iii
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_cavalry_swordsman">
   <Auras datatype="tokens">
     units/heroes/sele_hero_antiochus_iv
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_elephant_melee">
+<Entity parent="hero_elephant|template_unit_champion_elephant_melee">
   <Auras datatype="tokens">
     units/heroes/sele_hero_seleucus_i
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/spart/hero_agis.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/hero_agis.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/hero_agis.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_hero_infantry_spearman">
+<Entity parent="hero_infantry|hoplite|template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/spart/hero_brasidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/hero_brasidas.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/hero_brasidas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="hero_infantry|template_unit_champion_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/spart_hero_brasidas
   </Auras>
Index: binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/hero_leonidas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_hero_infantry_spearman">
+<Entity parent="hero_infantry|hoplite|template_unit_champion_infantry_spearman">
   <Auras datatype="tokens">
     units/heroes/spart_hero_leonidas
   </Auras>