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	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml	(working copy)
@@ -8,12 +8,6 @@
       <MaxRange>7.0</MaxRange>
 	</Melee>
   </Attack>
-  <Auras>
-    <Fear>
-      <Radius>80</Radius>
-      <Bonus>15</Bonus>
-    </Fear>
-  </Auras>
   <Cost>
     <Resources>
       <metal>300</metal>
Index: binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/celt_tavern.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/other/celt_tavern.xml	(working copy)
@@ -1,30 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
-  <Auras>
-    <Heal>
-      <Radius>30</Radius>
-      <Speed>1000</Speed>
-    </Heal>
-  </Auras>
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>100</wood>
-      <stone>100</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="18.0" depth="18.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1500</Max>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Auras>
+    <Heal>
+      <Modification>
+        <Value>Health/RegenRate</Value>
+        <Multiply>1.5</Multiply>
+      </Modification>
+      <AffectedPlayers>Player MutualAlly</AffectedPlayers>
+      <Classes>Unit</Classes>
+      <Radius>50</Radius>
+    </Heal>
+  </Auras>
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>200</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>100</wood>
+      <stone>100</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="18.0" depth="18.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Health>
+    <Max>1500</Max>
+    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
     <Civ>celt</Civ>
     <GenericName>Tavern</GenericName>
     <SpecificName>Taberna</SpecificName>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(working copy)
@@ -1,31 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <Auras>
-    <Heal>
-      <Radius>40</Radius>
-      <Speed>1000</Speed>
-    </Heal>
-  </Auras>
-  <BuildRestrictions>
-    <Category>Temple</Category>
-  </BuildRestrictions>
-  <Cost>
-    <PopulationBonus>5</PopulationBonus>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <stone>300</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="19.0" depth="31.5"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>20</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>3</BuffHeal>
-    <LoadingRange>2</LoadingRange>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic">
+  <Auras>
+    <Heal>
+      <Modification>
+        <Value>Health/RegenRate</Value>
+        <Multiply>1.5</Multiply>
+      </Modification>
+      <AffectedPlayers>Player MutualAlly</AffectedPlayers>
+      <Classes>Unit</Classes>
+      <Radius>80</Radius>
+    </Heal>
+  </Auras>
+  <BuildRestrictions>
+    <Category>Temple</Category>
+  </BuildRestrictions>
+  <Cost>
+    <PopulationBonus>5</PopulationBonus>
+    <BuildTime>200</BuildTime>
+    <Resources>
+      <stone>300</stone>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="19.0" depth="31.5"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>20</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <List datatype="tokens">Support Infantry Cavalry</List>
+    <BuffHeal>3</BuffHeal>
+    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml	(working copy)
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
-  <Auras>
-    <Infidelity>
-      <Radius>20</Radius>
-      <Time>0</Time>
-    </Infidelity>
-  </Auras>
   <Health>
     <DeathType>remain</DeathType>
   </Health>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(working copy)
@@ -17,13 +17,14 @@
     </Slaughter>
   </Attack>
   <Auras>
-    <Allure>
-      <Radius>25</Radius>
-    </Allure>
-    <Infidelity>
-      <Radius>10</Radius>
-      <Time>10</Time>
-    </Infidelity>
+   <Support>
+    <Modification>
+        <Value>Builder/Rate ResoureGatherer/BaseSpeed</Value>
+        <Multiply>1.1</Multiply>
+    </Modification>
+    <Classes>CitizenSoldier</Classes>
+    <Radius>30</Radius>
+   </Support> 
   </Auras>
   <Builder>
     <Rate>1.0</Rate>
Index: binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml	(working copy)
@@ -1,16 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_javelinist">
   <Auras>
-    <Courage>
+    <Armour>
+      <Modification>
+        <Value>Armour/Hack Armour/Pierce Armour/Crush</Value>
+        <Add>2</Add>
+      </Modification>
       <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
+      <Classes>Unit</Classes>
+    </Armour>
+    <Speed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.15</Multiply>
+      </Modification>
+      <Radius>20</Radius>
+      <Classes>Unit</Classes>
+    </Speed>
+    <PeltastSpeed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.15</Multiply>
+      </Modification>
+      <Template/>
+      <Classes>Javelin</Classes>
+    </PeltastSpeed>
   </Auras>
   <Identity>
     <Civ>athen</Civ>
 	<GenericName>Iphicrates</GenericName>
     <SpecificName>Iphikratēs</SpecificName>
-    <Tooltip>Hero Aura: All units in his formation +15% speed and +15% armor. All Peltasts +15% speed.</Tooltip>
+    <Tooltip>Hero Aura: All units in his formation +15% speed and +2 armour. All Peltasts +15% speed.</Tooltip>
     <History>.</History>
     <Icon>units/hele_hero_xenophon.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml	(working copy)
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
   <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
+    <Construction>
+      <Modification>
+        <Value>Builder/Rate</Value>
+        <Multiply>1.2</Multiply>
+      </Modification>
+      <Radius>80</Radius>
+      <Classes>Worker</Classes>
+    </Construction>
+    <Temple>
+      <Modification>
+        <Value>Cost/Resources/stone</Value>
+        <Multiply>0.7</Multiply>
+      </Modification>
+      <Template/>
+      <Classes>Temple</Classes>
+    </Temple>
   </Auras>
   <Identity>
     <Civ>athen</Civ>
 	<GenericName>Pericles</GenericName>
     <SpecificName>Periklēs</SpecificName>
-    <Tooltip>Hero Aura: Buildings construct much faster within his vision. Temples are much cheaper during his lifetime.
+    <Tooltip>Hero Aura: Buildings construct 20% faster within his vision. Temples are 30% cheaper during his lifetime.
 Melee 2x vs. all cavalry.</Tooltip>
     <History>Pericles was the foremost Athenian politician of the 5th Century.</History>
     <Icon>units/athen_hero_pericles.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml	(working copy)
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
-  </Auras>
+<Entity parent="units/hele_hero_themistocles">
   <Identity>
     <Civ>athen</Civ>
-	<GenericName>Themistocles</GenericName>
-    <SpecificName>Themistoklês</SpecificName>
-    <Tooltip>Hero Aura: When garrisoned in a ship, all nearby warships are 20% faster. Ships are also built 20% faster during his lifespan.</Tooltip>
-    <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>
   <VisualActor>
     <Actor>units/athenians/themistocles.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(working copy)
@@ -1,52 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_javelinist">
-  <Armour>
-    <Hack>7</Hack>
-    <Pierce>7</Pierce>
-    <Crush>8</Crush>
-  </Armour>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
-  <Cost>
-    <Population>4</Population>
-    <BuildTime>50</BuildTime>
-    <Resources>
-      <food>200</food>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
-    <Height>5.0</Height>
-  </Footprint>
+<Entity parent="units/celt_hero_boudicca">
   <Identity>
     <Civ>brit</Civ>
-    <Classes datatype="tokens">Chariot</Classes>
-    <SpecificName>Boudicca</SpecificName>
-    <Tooltip>Hero Aura: Increased Attack and Speed for Champion Units.</Tooltip>
-    <History>Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colours over which a thick cloak was fastened by a brooch.</History>
-    <Icon>units/celt_hero_boudicca.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="1.5"/>
-  </Obstruction>
-  <Sound>
-    <SoundGroups>
-      <select>voice/hellenes/civ/female/civ_female_select.xml</select>
-      <order_walk>voice/hellenes/civ/female/civ_female_walk.xml</order_walk>
-      <order_attack>voice/hellenes/civ/female/civ_female_go_out_against.xml</order_attack>
-      <order_gather>voice/hellenes/civ/female/civ_female_gather_together.xml</order_gather>
-      <order_repair>voice/hellenes/civ/female/civ_female_repair.xml</order_repair>
-      <order_garrison>voice/hellenes/civ/female/civ_female_garrison.xml</order_garrison>
-      <death>actor/human/death/female_death.xml</death>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>units/celts/boudicca_chariot.xml</Actor>
-  </VisualActor>
 </Entity>
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	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml	(working copy)
@@ -5,12 +5,6 @@
     <Pierce>6</Pierce>
     <Crush>6</Crush>
   </Armour>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Boudicca</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml	(working copy)
@@ -1,32 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
-  <Armour>
-    <Hack>6</Hack>
-    <Pierce>6</Pierce>
-    <Crush>7</Crush>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Hack>27.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>54.0</Hack>
-    </Charge>
-  </Attack>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
+<Entity parent="units/celt_hero_caratacos">
   <Identity>
     <Civ>brit</Civ>
-    <SpecificName>Caratacos</SpecificName>
-    <Tooltip>Hero Aura: Increased Speed for all units during his lifetime.</Tooltip>
-    <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>
-  <VisualActor>
-    <Actor>units/celts/caradoc.xml</Actor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_cynvelin.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_cynvelin.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_cynvelin.xml	(working copy)
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
-  <Armour>
-    <Hack>10</Hack>
-  </Armour>
-  <Auras>
-    <Heal>
-      <Radius>25</Radius>
-      <Speed>1000</Speed>
-    </Heal>
-  </Auras>
+<Entity parent="units/celt_hero_cynvelin">
   <Identity>
     <Civ>brit</Civ>
-    <SpecificName>Cynvelin</SpecificName>
-    <Tooltip>Hero Aura: Has a large and powerful Healing Aura, only useful when idle.</Tooltip>
-    <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>
-  <VisualActor>
-    <Actor>units/celts/cynvelin_horse.xml</Actor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml	(working copy)
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
+  <Auras>
+    <Attack>
+      <Modification>
+        <Value>Attack/Melee/Hack Attack/Melee/Crush Attack/Melee/Pierce</Value>
+        <Add>2</Add>
+      </Modification>
+      <Classes>Cavalry</Classes>
+      <Radius>80</Radius>
+    </Attack>
+  </Auras>
   <Identity>
     <Civ>cart</Civ>
 	<GenericName>Maharbal</GenericName>
     <SpecificName>Maharbaʿal</SpecificName>
-	<Tooltip>Hero Aura: "Cavalry Commander." +20% Attack for cavalry within his aura.</Tooltip>
+	<Tooltip>Hero Aura: "Cavalry Commander." +2 Attack for cavalry within his aura.</Tooltip>
     <History>Maharbal was Hannibal Barca's "brash young cavalry commander" during the 2nd Punic War. He is credited with turning the wing of the legions at Cannae resulting in defeat in which 30,000 of 50,000 Romans were lost, as well as significant contributions to the winning of many other battles during the 2nd Punic War. He is known for having said, after the battle of Cannae, "Hannibal, you know how to win the victory; just not what to do with it."</History>
     <Icon>units/cart_hero_maharbal.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml	(working copy)
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_javelinist">
   <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
+    <Speed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.15</Multiply>
+      </Modification>
+      <Classes>Champion</Classes>
+      <Template/>
+    </Speed>
+    <Attack>
+      <Modification>
+        <Value>Attack/Melee/Hack Attack/Ranged/Pierce</Value>
+        <Add>+5</Add>
+      </Modification>
+      <Classes>Champion</Classes>
+      <Template/>
+    </Attack>
   </Auras>
   <Cost>
     <Population>4</Population>
@@ -23,7 +35,7 @@
     <Civ>celt</Civ>
     <Classes datatype="tokens">Chariot</Classes>
     <SpecificName>Boudicca</SpecificName>
-    <Tooltip>Hero Aura: Increased Attack and Speed for Champion Units.</Tooltip>
+    <Tooltip>Hero Aura: +5 Hack or Pierce Attack and 15% faster speed for Champion Units during lifetime.</Tooltip>
     <History>Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colours over which a thick cloak was fastened by a brooch.</History>
     <Icon>units/celt_hero_boudicca.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml	(working copy)
@@ -3,12 +3,6 @@
   <Armour>
     <Hack>9</Hack>
   </Armour>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Brennus</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml	(working copy)
@@ -4,15 +4,19 @@
     <Hack>9</Hack>
   </Armour>
   <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
+    <Gathering>
+      <Modification>
+        <Value>ResourceGatherer/BaseSpeed</Value>
+        <Multiply>1.5</Multiply>
+      </Modification>
+      <Classes>Worker</Classes>
+      <Template/>
+    </Gathering>
   </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Britomartus</SpecificName>
-    <Tooltip>Hero Aura: Gathering rates increased during his lifetime.</Tooltip>
+    <Tooltip>Hero Aura: Gathering rates increased by 50% during his lifetime.</Tooltip>
     <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>
Index: binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml	(working copy)
@@ -9,15 +9,19 @@
     </Charge>
   </Attack>
   <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
+    <Speed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.25</Multiply>
+      </Modification>
+      <Classes>Unit</Classes>
+      <Formation/>
+    </Speed>
   </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Caratacos</SpecificName>
-    <Tooltip>Hero Aura: Increased Speed for all units during his lifetime.</Tooltip>
+    <Tooltip>Hero Aura: Increased Speed for all units in his formation.</Tooltip>
     <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>
Index: binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml	(working copy)
@@ -2,14 +2,18 @@
 <Entity parent="template_unit_hero_cavalry_swordsman">
   <Auras>
     <Heal>
-      <Radius>25</Radius>
-      <Speed>1000</Speed>
+      <Modification>
+        <Value>Health/RegenRate</Value>
+        <Add>0.5</Add>
+      </Modification>
+      <Radius>80</Radius>
+      <Classes>Unit</Classes>
     </Heal>
   </Auras>
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Cynvelin</SpecificName>
-    <Tooltip>Hero Aura: Has a large and powerful Healing Aura, only useful when idle.</Tooltip>
+    <Tooltip>Hero Aura: Has a large and powerful Healing Aura.</Tooltip>
     <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>
Index: binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml	(working copy)
@@ -9,10 +9,14 @@
     </Charge>
   </Attack>
   <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
+    <Attack>
+      <Modification>
+        <Value>Attack/Melee/Hack Attack/Melee/Crush Attack/Ranged/Pierce</Value>
+        <Add>2</Add>
+      </Modification>
+      <Radius>80</Radius>
+      <Classes>Infantry Cavalry</Classes>
+    </Attack>
   </Auras>
   <Cost>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml	(working copy)
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
-  <Armour>
-    <Hack>7</Hack>
-  </Armour>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
+<Entity parent="units/celt_hero_brennus">
   <Identity>
     <Civ>gaul</Civ>
-    <SpecificName>Brennus</SpecificName>
-    <Tooltip>Hero Aura: +5 Metal loot for every enemey unit killed.</Tooltip>
-    <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>
-  <VisualActor>
-    <Actor>units/celts/brennus.xml</Actor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml	(working copy)
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_spearman">
-  <Armour>
-    <Hack>9</Hack>
-  </Armour>
-  <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
-  </Auras>
+<Entity parent="units/celt_hero_britomartus">
   <Identity>
     <Civ>gaul</Civ>
-    <SpecificName>Britomartus</SpecificName>
-    <Tooltip>Hero Aura: Gathering rates increased during his lifetime.</Tooltip>
-    <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>
-  <VisualActor>
-    <Actor>units/celts/britomartus.xml</Actor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml	(working copy)
@@ -1,32 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
-  <Attack>
-    <Melee>
-      <Hack>27.0</Hack>
-    </Melee>
-    <Charge>
-      <Hack>54.0</Hack>
-    </Charge>
-  </Attack>
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
-  <Cost>
-    <Resources>
-      <metal>260</metal>
-    </Resources>
-  </Cost>
+<Entity parent="units/celt_hero_vercingetorix">
   <Identity>
     <Civ>gaul</Civ>
-    <SpecificName>Vercingetorix</SpecificName>
-    <Tooltip>Hero Aura: Increased attack for all units within his aura.</Tooltip>
-    <History>The most famous of all Celts, Vercingetorix lead the rebelling Gallic tribes against the might of Rome and Julius Caesar's veteran army in 54 BC. Although successful in defeating several Roman forces, Vercingetorix was unable to defeat Caesar, who eventually surrounded the Celtic leaders in the town of Alesia along with 100,000 men. When a relief army arrived to lift the epic siege, the Romans were out numbered 7 to 1 but still defeated the Celts. Vercingetorix surrendered and was executed.</History>
-    <Icon>units/celt_hero_vercingetorix.png</Icon>
   </Identity>
-  <VisualActor>
-    <Actor>units/celts/vercingetorix_horse.xml</Actor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml	(working copy)
@@ -4,10 +4,22 @@
     <Crush>20</Crush>
   </Armour>
   <Auras>
-    <Fear>
-      <Radius>80</Radius>
-      <Bonus>15</Bonus>
-    </Fear>
+    <Speed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.15</Multiply>
+      </Modification>
+      <Template/>
+      <Classes>Cavalry</Classes>
+    </Speed>
+    <Attack>
+      <Modification>
+        <Value>Attack/Melee/Hack Attack/Ranged/Pierce</Value>
+        <Add>2</Add>
+      </Modification>
+      <Template/>
+      <Classes>Cavalry</Classes>
+    </Attack>
   </Auras>
   <Cost>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml	(working copy)
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_pikeman">
   <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
+    <SiegeAttack>
+      <Modification>
+        <Value>Attack/Ranged/Pierce Attack/Ranged/Crush Attack/Melee/Crush</Value>
+        <Add>5</Add>
+      </Modification>
+      <Classes>Siege</Classes>
+      <Template/>
+    </SiegeAttack>
+    <SiegeRange>
+      <Modification>
+        <Value>Attack/Ranged/MaxRange</Value>
+        <Add>10</Add>
+      </Modification>
+      <Classes>Siege</Classes>
+      <Template/>
+    </SiegeRange>
   </Auras>
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Demetrius The Besieger</GenericName>
     <SpecificName>Dēmḗtrios Poliorkḗtēs</SpecificName>
-    <Tooltip>Hero Aura: Increased Range and Attack for Siege Engines.</Tooltip>
+    <Tooltip>Hero Aura: Increased Range and Attack for Siege Engines during his lifetime.</Tooltip>
     <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>
Index: binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml	(working copy)
@@ -18,10 +18,22 @@
     </Charge>
   </Attack>
   <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
+    <Attack>
+      <Modification>
+        <Value>Attack/Melee/Hack Attack/Charge/Hack</Value>
+        <Add>3</Add>
+      </Modification>
+      <Classes>Spear</Classes>
+      <Template/>
+    </Attack>
+    <Armour>
+      <Modification>
+        <Value>Armour/Hack Armour/Pierce Armour/Crush</Value>
+        <Add>1</Add>
+      </Modification>
+      <Classes>Spear</Classes>
+      <Template/>
+    </Armour>
   </Auras>
   <Cost>
     <Resources>
@@ -36,7 +48,7 @@
     <Civ>hele</Civ>
 	<GenericName>Leonidas I</GenericName>
     <SpecificName>Leōnídēs</SpecificName>
-    <Tooltip>Hero Aura: Increased Spartiate and Hoplite Attack.</Tooltip>
+    <Tooltip>Hero Aura: Increased Spartiate and Hoplite Attack. +3 Hack attack and +1 armour during his lifetime.</Tooltip>
     <History>The king of Sparta, who fought and died at the battle of Thermopylae in 480 BC. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw.</History>
     <Icon>units/hele_hero_leonidas.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml	(working copy)
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
   <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
+    <Champion>
+        <Modification>
+          <Value>Attack/Melee/Hack Attack/Melee/Crush Attack/Ranged/Pierce</Value>
+          <Add>3</Add>
+        </Modification>
+        <Classes>Champion</Classes>
+      <Template/>
+    </Champion>
   </Auras>
   <Identity>
     <Civ>hele</Civ>
Index: binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml	(working copy)
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
+    <SailingSpeed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.5</Multiply>
+      </Modification>
+      <GarrisoningStructure/>
+      <Classes>Ship</Classes>
+    </SailingSpeed>
+    <ConstructionSpeed>
+      <Modification>
+        <Value>Cost/BuildTime</Value>
+        <Multiply>0.8</Multiply>
+      </Modification>
+      <Classes>Ship</Classes>
+      <Template/>
+    </ConstructionSpeed>
   </Auras>
   <Identity>
     <Civ>hele</Civ>
 	<GenericName>Themistocles</GenericName>
     <SpecificName>Themistoklês</SpecificName>
-    <Tooltip>Hero Aura: Increased Move Speed and decreased Build Time for Warships.</Tooltip>
+    <Tooltip>Hero Aura: When garrisoned in a ship, that ship is 50% faster. Ships are also built 20% faster during his lifespan.</Tooltip>
     <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>
Index: binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml	(working copy)
@@ -1,10 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_javelinist">
   <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
+    <Armour>
+      <Modification>
+        <Value>Armour/Hack Armour/Pierce Armour/Crush</Value>
+        <Add>2</Add>
+      </Modification>
+      <Formation/>
+      <Classes>Unit</Classes>
+    </Armour>
+    <Speed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.15</Multiply>
+      </Modification>
+      <Formation/>
+      <Classes>Unit</Classes>
+    </Speed>
+ 	<PeltastSpeed>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.15</Multiply>
+      </Modification>
+      <Template/>
+      <Classes>Javelin</Classes>
+    </PeltastSpeed>
   </Auras>
   <Identity>
     <Civ>hele</Civ>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml	(working copy)
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
-  <Armour>
-    <Crush>20</Crush>
-  </Armour>
+<Entity parent="units/hele_hero_alexander">
   <Attack>
     <Melee>
 	  <Bonuses>
@@ -22,28 +19,17 @@
     </Charge>
   </Attack>
   <Auras>
-    <Fear>
-      <Radius>80</Radius>
-      <Bonus>15</Bonus>
-    </Fear>
+    <Terrirory>
+      <Modification>
+        <Value>TerritoryInfluence/Radius</Value>
+        <Multiply>1.25</Multiply>
+      </Modification>
+      <Template/>
+      <Classes>Structure</Classes>
+    </Terrirory>
   </Auras>
-  <Cost>
-    <Resources>
-      <metal>300</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>mace</Civ>
-    <GenericName>Alexander The Great</GenericName>
-    <SpecificName>Mégās Aléxandros</SpecificName>
     <Tooltip>Hero Aura: +25% territory effect for all buildings while he lives. "Herocide": +20% 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>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>units/macedonians/alexander.xml</Actor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml	(working copy)
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <GenericName>Crateros</GenericName>
     <SpecificName>Kraterós</SpecificName>
-    <Tooltip>Trusted general under Alexander the Great.</Tooltip>
+    <Tooltip>Trusted general under Alexander the Great. Hero Aura: TBD</Tooltip>
     <History>.</History>
     <Icon>units/mace_hero_craterus.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml	(working copy)
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
+<Entity parent="units/hele_hero_demetrius">
   <Identity>
     <Civ>mace</Civ>
-    <GenericName>Demetrius The Besieger</GenericName>
-    <SpecificName>Dēmḗtrios Poliorkḗtēs</SpecificName>
-    <Tooltip>Hero Aura: Increased Range and Attack for Siege Engines.</Tooltip>
-    <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>
-  <Vision>
-    <Range>66</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/macedonians/demetrius.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml	(working copy)
@@ -1,23 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Courage>
-  </Auras>
+<Entity parent="units/hele_hero_philip">
   <Identity>
     <Civ>mace</Civ>
-    <GenericName>Philip II of Macedon</GenericName>
-    <SpecificName>Phílippos B' ho Makedṓn</SpecificName>
-    <Tooltip>Hero Aura: Increased Attack for Champion Units.</Tooltip>
-    <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>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>units/macedonians/philip_horse.xml</Actor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml	(working copy)
@@ -1,77 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
-  <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
-  <Heal>
-    <Range>20</Range>
-    <HP>12</HP>
-    <Rate>2000</Rate>
-    <UnhealableClasses datatype="tokens"/>
-    <HealableClasses datatype="tokens">Organic</HealableClasses>
-  </Heal>
-  <Cost>
-    <Population>2</Population>
-    <BuildTime>60</BuildTime>
-    <Resources>
-      <food>100</food>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_support_healer">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>8.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Auras>
+    <MaxHealth>
+	  <Modification>
+		<Value>Health/Max</Value>
+		<Multiply>1.25</Multiply>
+	  </Modification>
+	  <Classes>Unit</Classes>
+	  <!--<Radius>80</Radius>-->
+	  <Template/>
+    </MaxHealth>
+  </Auras>
+  <Heal>
+    <HP>12</HP>
+  </Heal>
+  <Cost>
+    <Population>2</Population>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>600</Max>
-    <RegenRate>0.5</RegenRate>
-  </Health>
-  <Identity>
-    <Civ>maur</Civ>
-    <Classes datatype="tokens">Hero Organic</Classes>
-	<GenericName>Acharya Chanakya</GenericName>
-    <SpecificName>Acharya Chanakya</SpecificName>
-    <Icon>units/maur_hero_chanakya.png</Icon>
-	<Tooltip>Hero Healer.
-Hero Special: "Teacher." TBD.</Tooltip>
-    <History>TBD.</History>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-  </Identity>
-  <Minimap>
-    <Type>hero</Type>
-  </Minimap>
-  <Selectable>
-    <Overlay>
-      <AlwaysVisible/>
-      <Texture>
-        <MainTexture>star/256x256.png</MainTexture>
-        <MainTextureMask>star/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>voice/hellenes/civ/civ_male_select.xml</select>
-      <order_walk>voice/hellenes/civ/civ_male_ack.xml</order_walk>
-      <walk>actor/human/movement/walk.xml</walk>
-      <run>actor/human/movement/run.xml</run>
-      <death>actor/human/death/death.xml</death>
-      <trained>actor/singlesteps/steps_gravel.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <TrainingRestrictions>
-    <Category>Hero</Category>
-  </TrainingRestrictions>
-  <UnitMotion>
-    <WalkSpeed>7.5</WalkSpeed>
-    <Run>
-      <Speed>12.0</Speed>
-      <Range>200.0</Range>
-      <RangeMin>0.0</RangeMin>
-    </Run>
-  </UnitMotion>
-  <Vision>
-    <Range>30</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>units/mauryans/hero_chanakya.xml</Actor>
-  </VisualActor>
-</Entity>
+  <Health>
+    <Max>600</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
+  <Identity>
+    <Civ>maur</Civ>
+    <Classes datatype="tokens">Hero</Classes>
+	<GenericName>Acharya Chanakya</GenericName>
+    <SpecificName>Acharya Chanakya</SpecificName>
+    <Icon>units/maur_hero_chanakya.png</Icon>
+	<Tooltip>Hero Healer.
+Hero Special: "Teacher." TBD.</Tooltip>
+    <History>TBD.</History>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+  <Minimap>
+    <Type>hero</Type>
+  </Minimap>
+  <Promotion disable=""/>
+  <Selectable>
+    <Overlay>
+      <AlwaysVisible/>
+      <Texture>
+        <MainTexture>star/256x256.png</MainTexture>
+        <MainTextureMask>star/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <trained>actor/singlesteps/steps_gravel.xml</trained>
+    </SoundGroups>
+  </Sound>
+  <TrainingRestrictions>
+    <Category>Hero</Category>
+  </TrainingRestrictions>
+  <VisualActor>
+    <Actor>units/mauryans/hero_chanakya.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml	(working copy)
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
+  <Auras>
+    <Lead>
+      <Modification>
+        <Value>Attack/Melee/Hack Attack/Melee/Crush Attack/Ranged/Pierce</Value>
+        <Add>3</Add>
+      </Modification>
+      <Classes>Cavalry</Classes>
+      <Radius>80</Radius>
+    </Lead>
+  </Auras>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Cyrus II The Great</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(working copy)
@@ -12,6 +12,24 @@
       <MinRange>12.0</MinRange>
     </Ranged>
   </Attack>
+  <Auras>
+    <Leadership>
+      <Modification>
+        <Value>UnitMotion/WalkSpeed UnitMotion/Run/Speed</Value>
+        <Multiply>1.25</Multiply>
+      </Modification>
+      <Classes>Infantry</Classes>
+      <Template/>
+    </Leadership>
+    <Leadership>
+      <Modification>
+        <Value>Trader/GainMultiplier</Value>
+        <Multiply>1.5</Multiply>
+      </Modification>
+      <Classes>Trader</Classes>
+      <Template/>
+    </Leadership>
+  </Auras>
   <Cost>
     <Population>4</Population>
     <BuildTime>50</BuildTime>
@@ -35,8 +53,8 @@
     <SpecificName>Darayavahush I</SpecificName>
     <Icon>units/pers_hero_darius.png</Icon>
 	<Tooltip>Hero Scythe Chariot Archer.
-Hero Aura: "Leadership." Boosts Movement Speed of all nearby units.
-Hero Aura: "Merchant of the Empire." Boosts profitablity of trade during his lifetime.
+Hero Aura: "Leadership." Boosts Movement Speed of all infantry.
+Hero Aura: "Merchant of the Empire." Boosts profitablity of trade.
 Ranged attack 2x vs. spearmen. Ranged attack 1.5x vs. Swordsmen.</Tooltip>
     <History>(King, 521 BC - 486 BC) The son of Vishtaspa (Hystaspes), the satrap of Parthia and Hyrcania; a great administrator as well as a decent general, Darius introduced the division of the empire into satrapies and conquered NW India, Thrace and Macedonia. He was called the 'Merchant of the Empire'.</History>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml	(working copy)
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_archer">
+  <Auras>
+    <Administrator>
+      <Modification>
+        <Value>Builder/Rate ResourceGatherer/BaseSpeed</Value>
+        <Multiply>1.25</Multiply>
+      </Modification>
+      <Classes>Worker</Classes>
+      <Radius>80</Radius>
+    </Administrator>
+  </Auras>
   <Identity>
     <Civ>pers</Civ>
 	<GenericName>Xerxes I</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(working copy)
@@ -7,6 +7,16 @@
       <MinRange>12.0</MinRange>
     </Ranged>
   </Attack>
+  <Auras>
+    <Administrator>
+      <Modification>
+        <Value>Builder/Rate ResourceGatherer/BaseSpeed</Value>
+        <Multiply>1.25</Multiply>
+      </Modification>
+      <Classes>Worker</Classes>
+      <Radius>80</Radius>
+    </Administrator>
+  </Auras>
   <Cost>
     <Population>4</Population>
     <BuildTime>40</BuildTime>
Index: binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml	(working copy)
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>10</Bonus>
-    </Courage>
-  </Auras>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Marcus Claudius Marcellus</SpecificName>
     <Icon>units/rome_hero_marcellus.png</Icon>
+    <Tooltip>Hero Aura: TBD</Tooltip>
     <History>Marcus Claudius Marcellus, 268 - 208 BC, a soldier of the first war with Carthage, a hero of the Second Punic War, and victor over the Gauls at Clastidium. Plutarch describes him as a man of war, strong in body and constitution, with an iron will to fight on. As a general he was immensely capable, standing alongside Scipio Africanus and Claudius Nero as the most effective Roman generals of the entire Second Punic War. In addition to his military achievements Marcellus was a fan of Greek culture and arts, which he enthusiastically promoted in Rome. He met his demise when his men were ambushed near Venusia. In honor of the respect the people held for him, Marcellus was granted the title of "Sword of Rome".</History>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml	(working copy)
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
   <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>10</Bonus>
-    </Courage>
+    <Armour>
+      <Modification>
+        <Value>Armour/Hack Armour/Pierce Armour.Crush</Value>
+        <Add>3</Add>
+      </Modification>
+      <Radius>80</Radius>
+      <Classes>Unit</Classes>
+    </Armour>
   </Auras>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Quinctus Fabius Maximus</SpecificName>
     <Icon>units/rome_hero_maximus.png</Icon>
+    <Tooltip>Hero Aura: Nearby units have +3 armour</Tooltip>
     <History>Maximus was dictator of Rome for six months during the Second Punic War. Instead of attacking the most powerful Hannibal, he started a very effective war of attrition against him, securing the nickname "Cunctator" or Delayer.</History>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml	(working copy)
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Courage>
-      <Radius>20</Radius>
-      <Bonus>10</Bonus>
-    </Courage>
-  </Auras>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Scipio Africanus</SpecificName>
     <Icon>units/rome_hero_scipio.png</Icon>
+    <Tooltip>Hero aura: TBD</Tooltip>
     <History>He was the first really successful Roman general. His campaigns in Spain and Africa helped to bring Carthage to its knees during the Second Punic War. He defeated Hannibal at the Battle of Zama in 202 BC.</History>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml	(working copy)
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Auras>
-    <Fear>
-      <Radius>20</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
+    <Attack>
+      <Modification>
+        <Value>Attack/Ranged/Pierce</Value>
+        <Add>2</Add>
+      </Modification>
+      <Classes>Skirmisher</Classes>
+      <Radius>80</Radius>
+    </Attack>
+    <Armour>
+      <Modification>
+        <Value>Armour/Pierce</Value>
+        <Add>3</Add>
+      </Modification>
+      <Classes>Skirmisher</Classes>
+      <Radius>80</Radius>
+    </Armour>
   </Auras>
   <Identity>
     <Civ>spart</Civ>
Index: binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml	(revision 13634)
+++ binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml	(working copy)
@@ -1,36 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_spearman">
-  <Armour>
-    <Hack>10</Hack>
-    <Pierce>10</Pierce>
-    <Crush>10</Crush>
-  </Armour>
-  <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>
-  <Auras>
-    <Fear>
-      <Radius>8</Radius>
-      <Bonus>5</Bonus>
-    </Fear>
-  </Auras>
+<Entity parent="units/hele_hero_leonidas">
   <Identity>
     <Civ>spart</Civ>
-	<GenericName>Leonidas I</GenericName>
-    <SpecificName>Leōnídēs</SpecificName>
-    <Tooltip>Hero Aura: Increased Spartiate and Hoplite Attack.
-Counters: 2x vs. all cavalry.</Tooltip>
-    <History>The king of Sparta, who fought and died at the battle of Thermopylae in 480 BC. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw.</History>
-    <Icon>units/spart_hero_leonidas.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/leonidas.xml</Actor>
