Index: ps/trunk/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
@@ -11233,7 +11233,7 @@
 			<Actor seed="54098"/>
 		</Entity>
 		<Entity uid="2182">
-			<Template>units/pers/hero_xerxes_chariot</Template>
+			<Template>units/pers/hero_xerxes_i_chariot</Template>
 			<Player>1</Player>
 			<Position x="502.18833" z="854.26935"/>
 			<Orientation y="-2.30327"/>
@@ -13923,7 +13923,7 @@
 			<Actor seed="8982"/>
 		</Entity>
 		<Entity uid="2663">
-			<Template>units/pers/hero_cyrus</Template>
+			<Template>units/pers/hero_cyrus_ii</Template>
 			<Player>1</Player>
 			<Position x="487.53135" z="764.43305"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
@@ -5463,7 +5463,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="925">
-			<Template>units/mace/hero_demetrius</Template>
+			<Template>units/mace/hero_demetrius_i</Template>
 			<Player>2</Player>
 			<Position x="592.82831" z="737.53522"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -4710,7 +4710,7 @@
 			<Actor seed="26780"/>
 		</Entity>
 		<Entity uid="923">
-			<Template>units/mace/hero_alexander</Template>
+			<Template>units/mace/hero_alexander_iii</Template>
 			<Player>1</Player>
 			<Position x="618.9037" z="1376.21436"/>
 			<Orientation y="2.35621"/>
@@ -4724,14 +4724,14 @@
 			<Actor seed="44752"/>
 		</Entity>
 		<Entity uid="925">
-			<Template>units/mace/hero_demetrius</Template>
+			<Template>units/mace/hero_demetrius_i</Template>
 			<Player>1</Player>
 			<Position x="625.8672" z="1382.3844"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46982"/>
 		</Entity>
 		<Entity uid="926">
-			<Template>units/mace/hero_philip</Template>
+			<Template>units/mace/hero_philip_ii</Template>
 			<Player>1</Player>
 			<Position x="628.80585" z="1385.95423"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
@@ -7694,19 +7694,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1539">
-			<Template>units/pers/hero_cyrus</Template>
+			<Template>units/pers/hero_cyrus_ii</Template>
 			<Player>1</Player>
 			<Position x="730.9098" z="798.2522"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1540">
-			<Template>units/pers/hero_darius</Template>
+			<Template>units/pers/hero_darius_i</Template>
 			<Player>1</Player>
 			<Position x="725.22053" z="790.83033"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1541">
-			<Template>units/pers/hero_xerxes</Template>
+			<Template>units/pers/hero_xerxes_i</Template>
 			<Player>1</Player>
 			<Position x="717.31275" z="784.96375"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
@@ -13514,21 +13514,21 @@
 			<Actor seed="33800"/>
 		</Entity>
 		<Entity uid="5494">
-			<Template>units/ptol/hero_cleopatra</Template>
+			<Template>units/ptol/hero_cleopatra_vii</Template>
 			<Player>1</Player>
 			<Position x="354.61005" z="537.62262"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59094"/>
 		</Entity>
 		<Entity uid="5495">
-			<Template>units/ptol/hero_ptolemy_I</Template>
+			<Template>units/ptol/hero_ptolemy_i</Template>
 			<Player>1</Player>
 			<Position x="359.63224" z="541.94086"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49106"/>
 		</Entity>
 		<Entity uid="5496">
-			<Template>units/ptol/hero_ptolemy_IV</Template>
+			<Template>units/ptol/hero_ptolemy_iv</Template>
 			<Player>1</Player>
 			<Position x="365.85984" z="547.7533"/>
 			<Orientation y="2.35621"/>
@@ -14729,7 +14729,7 @@
 			<Actor seed="49184"/>
 		</Entity>
 		<Entity uid="5718">
-			<Template>units/sele/hero_antiochus_great</Template>
+			<Template>units/sele/hero_antiochus_iii</Template>
 			<Player>3</Player>
 			<Position x="1062.18067" z="444.56635"/>
 			<Orientation y="-2.24459"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
@@ -10835,21 +10835,21 @@
 			<Actor seed="13528"/>
 		</Entity>
 		<Entity uid="2609">
-			<Template>units/sele/hero_antiochus_great</Template>
+			<Template>units/sele/hero_antiochus_iii</Template>
 			<Player>1</Player>
 			<Position x="593.6678" z="145.4119"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="44694"/>
 		</Entity>
 		<Entity uid="2610">
-			<Template>units/sele/hero_antiochus_righteous</Template>
+			<Template>units/sele/hero_antiochus_iv</Template>
 			<Player>1</Player>
 			<Position x="589.68903" z="141.11445"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39750"/>
 		</Entity>
 		<Entity uid="2611">
-			<Template>units/sele/hero_seleucus_victor</Template>
+			<Template>units/sele/hero_seleucus_i</Template>
 			<Player>1</Player>
 			<Position x="584.32111" z="134.40409"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
@@ -108,7 +108,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="138">
-			<Template>units/mace/hero_alexander</Template>
+			<Template>units/mace/hero_alexander_iii</Template>
 			<Player>1</Player>
 			<Position x="374.48539" z="976.47889"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -23242,7 +23242,7 @@
 			<Actor seed="2142"/>
 		</Entity>
 		<Entity uid="5412">
-			<Template>units/ptol/hero_cleopatra</Template>
+			<Template>units/ptol/hero_cleopatra_vii</Template>
 			<Player>1</Player>
 			<Position x="778.43415" z="1673.0293"/>
 			<Orientation y="2.35621"/>
@@ -52037,7 +52037,7 @@
 			<Actor seed="11982"/>
 		</Entity>
 		<Entity uid="11614">
-			<Template>units/pers/hero_xerxes_chariot</Template>
+			<Template>units/pers/hero_xerxes_i_chariot</Template>
 			<Player>4</Player>
 			<Position x="1704.25745" z="1662.71692"/>
 			<Orientation y="2.42843"/>
@@ -94788,7 +94788,7 @@
 			<Actor seed="37802"/>
 		</Entity>
 		<Entity uid="19869">
-			<Template>units/ptol/hero_ptolemy_IV</Template>
+			<Template>units/ptol/hero_ptolemy_iv</Template>
 			<Player>5</Player>
 			<Position x="1304.52454" z="933.83356"/>
 			<Orientation y="5.38674"/>
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_1.json
@@ -1,9 +0,0 @@
-{
-	"type": "global",
-	"affects": ["Structure"],
-	"modifications": [
-		{ "value": "TerritoryInfluence/Radius", "multiply": 1.1 }
-	],
-	"auraName": "Imperialism",
-	"auraDescription": "Structures +10% territory influence radius."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_2.json
@@ -1,11 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["CivilCentre"],
-	"affectedPlayers": ["Enemy"],
-	"modifications": [
-		{ "value": "Capturable/GarrisonRegenRate", "multiply": 0.5 }
-	],
-	"auraName": "Conqueror",
-	"auraDescription": "Enemy Civic Centres −50% capture points garrisoned regeneration rate."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_1.json
@@ -0,0 +1,9 @@
+{
+	"type": "global",
+	"affects": ["Structure"],
+	"modifications": [
+		{ "value": "TerritoryInfluence/Radius", "multiply": 1.1 }
+	],
+	"auraName": "Imperialism",
+	"auraDescription": "Structures +10% territory influence radius."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_2.json
@@ -0,0 +1,11 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["CivilCentre"],
+	"affectedPlayers": ["Enemy"],
+	"modifications": [
+		{ "value": "Capturable/GarrisonRegenRate", "multiply": 0.5 }
+	],
+	"auraName": "Conqueror",
+	"auraDescription": "Enemy Civic Centres −50% capture points garrisoned regeneration rate."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
@@ -1,21 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["Siege"],
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/MaxRange", "multiply": 1.1 },
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 1 },
-		{ "value": "Vision/Range", "multiply": 1.1 }
-	],
-	"auraName": "Besieger",
-	"auraDescription": "Siege Engines +1 armor, +20% melee and ranged attack damage, +10% ranged attack range, +10% vision range.",
-	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius_i.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius_i.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius_i.json
@@ -0,0 +1,21 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Siege"],
+	"modifications": [
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/MaxRange", "multiply": 1.1 },
+		{ "value": "Resistance/Entity/Damage/Hack", "add": 1 },
+		{ "value": "Resistance/Entity/Damage/Pierce", "add": 1 },
+		{ "value": "Resistance/Entity/Damage/Crush", "add": 1 },
+		{ "value": "Vision/Range", "multiply": 1.1 }
+	],
+	"auraName": "Besieger",
+	"auraDescription": "Siege Engines +1 armor, +20% melee and ranged attack damage, +10% ranged attack range, +10% vision range.",
+	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
@@ -1,17 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["Champion"],
-	"modifications": [
-		{ "value": "Attack/Capture/Capture", "add": 2 },
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
-	],
-	"auraName": "Rise of Macedon",
-	"auraDescription": "Champions +2 capture attack strength, +20% melee and ranged attack damage.",
-	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip_ii.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip_ii.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip_ii.json
@@ -0,0 +1,17 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Champion"],
+	"modifications": [
+		{ "value": "Attack/Capture/Capture", "add": 2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
+	],
+	"auraName": "Rise of Macedon",
+	"auraDescription": "Champions +2 capture attack strength, +20% melee and ranged attack damage.",
+	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
@@ -1,16 +0,0 @@
-{
-	"type": "global",
-	"affects": ["Soldier"],
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
-		{ "value": "Health/Max", "multiply": 0.85 }
-	],
-	"auraName": "Pyrrhic Victory",
-	"auraDescription": "Soldiers +20% melee and ranged attack damage, −15% health.",
-	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus_i.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus_i.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus_i.json
@@ -0,0 +1,16 @@
+{
+	"type": "global",
+	"affects": ["Soldier"],
+	"modifications": [
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Health/Max", "multiply": 0.85 }
+	],
+	"auraName": "Pyrrhic Victory",
+	"auraDescription": "Soldiers +20% melee and ranged attack damage, −15% health.",
+	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
@@ -1,17 +0,0 @@
-{
-	"type": "range",
-	"radius": 45,
-	"affects": ["Cavalry"],
-	"modifications": [
-		{ "value": "Attack/Capture/Capture", "add": 1 },
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
-	],
-	"auraName": "Forefront Leader",
-	"auraDescription": "Cavalry +1 capture attack strength, +20% melee and ranged attack damage.",
-	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus_ii.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus_ii.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus_ii.json
@@ -0,0 +1,17 @@
+{
+	"type": "range",
+	"radius": 45,
+	"affects": ["Cavalry"],
+	"modifications": [
+		{ "value": "Attack/Capture/Capture", "add": 1 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
+	],
+	"auraName": "Forefront Leader",
+	"auraDescription": "Cavalry +1 capture attack strength, +20% melee and ranged attack damage.",
+	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius.json
@@ -1,9 +0,0 @@
-{
-	"type": "global",
-	"affects": ["Soldier", "Siege", "Trader"],
-	"modifications": [
-		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 }
-	],
-	"auraName": "Leadership",
-	"auraDescription": "Soldiers, Siege Engines, Traders, and Merchant Ships +15% movement speed."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius_i.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius_i.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius_i.json
@@ -0,0 +1,9 @@
+{
+	"type": "global",
+	"affects": ["Soldier", "Siege", "Trader"],
+	"modifications": [
+		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 }
+	],
+	"auraName": "Leadership",
+	"auraDescription": "Soldiers, Siege Engines, Traders, and Merchant Ships +15% movement speed."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes.json
@@ -1,12 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["Worker"],
-	"modifications": [
-		{ "value": "Builder/Rate", "multiply": 1.15 },
-		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 1.15 }
-	],
-	"auraName": "Administrator",
-	"auraDescription": "Workers +15% build rate and gather speed.",
-	"overlayIcon": "art/textures/ui/session/auras/buildgather_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes_i.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes_i.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes_i.json
@@ -0,0 +1,12 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Worker"],
+	"modifications": [
+		{ "value": "Builder/Rate", "multiply": 1.15 },
+		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 1.15 }
+	],
+	"auraName": "Administrator",
+	"auraDescription": "Workers +15% build rate and gather speed.",
+	"overlayIcon": "art/textures/ui/session/auras/buildgather_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_1.json
@@ -1,12 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["Soldier", "Siege"],
-	"modifications": [
-		{ "value": "Attack/Melee/RepeatTime", "multiply": 0.8 },
-		{ "value": "Attack/Ranged/RepeatTime", "multiply": 0.8 }
-	],
-	"auraName": "Patriot",
-	"auraDescription": "Soldiers and Siege Engines −20% melee and ranged attack repeat time.",
-	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_2.json
@@ -1,12 +0,0 @@
-{
-	"type": "range",
-	"radius": 30,
-	"affects": ["Hero"],
-	"affectedPlayers": ["ExclusiveMutualAlly"],
-	"modifications": [
-		{ "value": "Health/Max", "multiply": 1.1 }
-	],
-	"auraName": "Consort",
-	"auraDescription": "Allied Heroes +10% health.",
-	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_3.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_3.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_3.json
@@ -1,11 +0,0 @@
-{
-	"type": "range",
-	"radius": 30,
-	"affects": ["Hero"],
-	"affectedPlayers": ["Enemy"],
-	"modifications": [
-		{ "value": "Health/Max", "multiply": 0.9 }
-	],
-	"auraName": "Consort",
-	"auraDescription": "Enemy Heroes −10% health."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_1.json
@@ -0,0 +1,12 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Soldier", "Siege"],
+	"modifications": [
+		{ "value": "Attack/Melee/RepeatTime", "multiply": 0.8 },
+		{ "value": "Attack/Ranged/RepeatTime", "multiply": 0.8 }
+	],
+	"auraName": "Patriot",
+	"auraDescription": "Soldiers and Siege Engines −20% melee and ranged attack repeat time.",
+	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_2.json
@@ -0,0 +1,12 @@
+{
+	"type": "range",
+	"radius": 30,
+	"affects": ["Hero"],
+	"affectedPlayers": ["ExclusiveMutualAlly"],
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 1.1 }
+	],
+	"auraName": "Consort",
+	"auraDescription": "Allied Heroes +10% health.",
+	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_3.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_3.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_vii_3.json
@@ -0,0 +1,11 @@
+{
+	"type": "range",
+	"radius": 30,
+	"affects": ["Hero"],
+	"affectedPlayers": ["Enemy"],
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 0.9 }
+	],
+	"auraName": "Consort",
+	"auraDescription": "Enemy Heroes −10% health."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
@@ -1,10 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["Pikeman"],
-	"modifications": [
-		{ "value": "Health/Max", "multiply": 1.4 }
-	],
-	"auraName": "Raphia",
-	"auraDescription": "Pikemen +40% health."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_1.json
@@ -1,11 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["Worker"],
-	"modifications": [
-		{ "value": "Builder/Rate", "multiply": 1.1 }
-	],
-	"auraName": "Patron of Construction",
-	"auraDescription": "Workers +10% build rate.",
-	"overlayIcon": "art/textures/ui/session/auras/build_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_2.json
@@ -1,12 +0,0 @@
-{
-	"type": "global",
-	"affects": ["Mercenary"],
-	"modifications": [
-		{ "value": "Cost/Resources/food", "multiply": 0.65 },
-		{ "value": "Cost/Resources/wood", "multiply": 0.65 },
-		{ "value": "Cost/Resources/stone", "multiply": 0.65 },
-		{ "value": "Cost/Resources/metal", "multiply": 0.65 }
-	],
-	"auraName": "Mercenary Patron",
-	"auraDescription": "Mercenaries −35% resource costs."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_i_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_i_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_i_1.json
@@ -0,0 +1,11 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Worker"],
+	"modifications": [
+		{ "value": "Builder/Rate", "multiply": 1.1 }
+	],
+	"auraName": "Patron of Construction",
+	"auraDescription": "Workers +10% build rate.",
+	"overlayIcon": "art/textures/ui/session/auras/build_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_i_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_i_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_i_2.json
@@ -0,0 +1,12 @@
+{
+	"type": "global",
+	"affects": ["Mercenary"],
+	"modifications": [
+		{ "value": "Cost/Resources/food", "multiply": 0.65 },
+		{ "value": "Cost/Resources/wood", "multiply": 0.65 },
+		{ "value": "Cost/Resources/stone", "multiply": 0.65 },
+		{ "value": "Cost/Resources/metal", "multiply": 0.65 }
+	],
+	"auraName": "Mercenary Patron",
+	"auraDescription": "Mercenaries −35% resource costs."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_iv.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_iv.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_iv.json
@@ -0,0 +1,10 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Pikeman"],
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 1.4 }
+	],
+	"auraName": "Raphia",
+	"auraDescription": "Pikemen +40% health."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
@@ -1,12 +0,0 @@
-{
-	"type": "range",
-	"radius": 45,
-	"affects": ["Cavalry"],
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 2 }
-	],
-	"auraName": "Ilarchès",
-	"auraDescription": "Cavalry +2 armor."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_iii.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_iii.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_iii.json
@@ -0,0 +1,12 @@
+{
+	"type": "range",
+	"radius": 45,
+	"affects": ["Cavalry"],
+	"modifications": [
+		{ "value": "Resistance/Entity/Damage/Hack", "add": 2 },
+		{ "value": "Resistance/Entity/Damage/Pierce", "add": 2 },
+		{ "value": "Resistance/Entity/Damage/Crush", "add": 2 }
+	],
+	"auraName": "Ilarchès",
+	"auraDescription": "Cavalry +2 armor."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_iv.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_iv.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_iv.json
@@ -0,0 +1,11 @@
+{
+	"type": "range",
+	"radius": 80,
+	"affects": ["Structure", "Ship", "Siege"],
+	"affectedPlayers": ["Enemy"],
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 0.8 }
+	],
+	"auraName": "Renowned Conqueror",
+	"auraDescription": "Enemy Structures, Ships, and Siege Engines -20% health."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
@@ -1,11 +0,0 @@
-{
-	"type": "range",
-	"radius": 80,
-	"affects": ["Structure", "Ship", "Siege"],
-	"affectedPlayers": ["Enemy"],
-	"modifications": [
-		{ "value": "Health/Max", "multiply": 0.8 }
-	],
-	"auraName": "Renowned Conqueror",
-	"auraDescription": "Enemy Structures, Ships, and Siege Engines -20% health."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_i.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_i.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_i.json
@@ -0,0 +1,14 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Elephant Champion"],
+	"modifications": [
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.2 }
+	],
+	"auraName": "Zooiarchos",
+	"auraDescription": "Champion Elephants +20% melee attack damage, +20% movement speed.",
+	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
@@ -1,14 +0,0 @@
-{
-	"type": "range",
-	"radius": 60,
-	"affects": ["Elephant Champion"],
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
-		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.2 }
-	],
-	"auraName": "Zooiarchos",
-	"auraDescription": "Champion Elephants +20% melee attack damage, +20% movement speed.",
-	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/cheats/createHeros.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/cheats/createHeros.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/cheats/createHeros.json
@@ -4,6 +4,16 @@
 		"Action": "createunits",
 		"DefaultParameter": 1,
 		"isNumeric": true,
-		"Templates": ["units/cart/hero_hamilcar", "units/cart/hero_hannibal", "units/cart/hero_maharbal", "units/rome/hero_marcellus", "units/rome/hero_maximus", "units/rome/hero_scipio", "units/pers/hero_cyrus", "units/pers/hero_darius", "units/pers/hero_xerxes"]
+		"Templates": [
+			"units/cart/hero_hamilcar",
+			"units/cart/hero_hannibal",
+			"units/cart/hero_maharbal",
+			"units/pers/hero_cyrus_ii",
+			"units/pers/hero_darius_i",
+			"units/pers/hero_xerxes_i",
+			"units/rome/hero_marcellus",
+			"units/rome/hero_maximus",
+			"units/rome/hero_scipio"
+		]
 	}
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
@@ -15,9 +15,9 @@
     <Entities datatype="tokens">
       units/{civ}/champion_infantry_a
       units/{civ}/champion_infantry_swordsman
-      units/{civ}/hero_philip
-      units/{civ}/hero_alexander
-      units/{civ}/hero_demetrius
+      units/{civ}/hero_philip_ii
+      units/{civ}/hero_alexander_iii
+      units/{civ}/hero_demetrius_i
     </Entities>
     <Technologies datatype="tokens">
       successors/upgrade_mace_silvershields
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml
@@ -44,9 +44,9 @@
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/hero_cyrus
-      units/{civ}/hero_darius
-      units/{civ}/hero_xerxes
+      units/{civ}/hero_cyrus_ii
+      units/{civ}/hero_darius_i
+      units/{civ}/hero_xerxes_i
     </Entities>
     <Technologies datatype="tokens">
       persians/immortals
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/civil_centre.xml
@@ -16,9 +16,9 @@
       units/{civ}/infantry_pikeman_b
       units/{civ}/infantry_javelineer_b
       units/{civ}/cavalry_archer_b
-      units/{civ}/hero_ptolemy_I
-      units/{civ}/hero_ptolemy_IV
-      units/{civ}/hero_cleopatra
+      units/{civ}/hero_ptolemy_i
+      units/{civ}/hero_ptolemy_iv
+      units/{civ}/hero_cleopatra_vii
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/civil_centre.xml
@@ -9,9 +9,9 @@
       units/{civ}/infantry_spearman_b
       units/{civ}/infantry_javelineer_b
       units/{civ}/cavalry_javelineer_b
-      units/{civ}/hero_seleucus_victor
-      units/{civ}/hero_antiochus_great
-      units/{civ}/hero_antiochus_righteous
+      units/{civ}/hero_seleucus_i
+      units/{civ}/hero_antiochus_iii
+      units/{civ}/hero_antiochus_iv
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
-  <Attack>
-    <Melee>
-      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
-      <Bonuses>
-        <Herocide>
-          <Classes>Hero</Classes>
-          <Multiplier>1.2</Multiplier>
-        </Herocide>
-      </Bonuses>
-    </Melee>
-  </Attack>
-  <Auras datatype="tokens">
-    units/heroes/mace_hero_alexander_1
-    units/heroes/mace_hero_alexander_2
-  </Auras>
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Alexander III the Great</GenericName>
-    <SpecificName>Alexandros ho Megas</SpecificName>
-    <Tooltip>Counters: 1.2× vs Heroes.</Tooltip>
-    <Icon>units/mace_hero_alexander.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/macedonians/hero_cavalry_swordsman_alexander_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_alexander_iii.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+      <Bonuses>
+        <Herocide>
+          <Classes>Hero</Classes>
+          <Multiplier>1.2</Multiplier>
+        </Herocide>
+      </Bonuses>
+    </Melee>
+  </Attack>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_alexander_iii_1
+    units/heroes/mace_hero_alexander_iii_2
+  </Auras>
+  <Identity>
+    <Civ>mace</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Alexander III the Great</GenericName>
+    <SpecificName>Alexandros ho Megas</SpecificName>
+    <Tooltip>Counters: 1.2× vs Heroes.</Tooltip>
+    <Icon>units/mace_hero_alexander.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/macedonians/hero_cavalry_swordsman_alexander_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
-  <Attack>
-    <Melee>
-      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
-    </Melee>
-  </Attack>
-  <Auras datatype="tokens">
-    units/heroes/mace_hero_demetrius
-  </Auras>
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Demetrius I the Besieger</GenericName>
-    <SpecificName>Dēmētrios Poliorkētēs</SpecificName>
-    <Icon>units/mace_hero_demetrius.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/macedonians/hero_infantry_swordsman_demetrius.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_demetrius_i.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_demetrius_i
+  </Auras>
+  <Identity>
+    <Civ>mace</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Demetrius I the Besieger</GenericName>
+    <SpecificName>Dēmētrios Poliorkētēs</SpecificName>
+    <Icon>units/mace_hero_demetrius.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/macedonians/hero_infantry_swordsman_demetrius.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">
-    units/heroes/mace_hero_philip
-  </Auras>
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Philip II of Macedon</GenericName>
-    <SpecificName>Philippos B' ho Makedōn</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/macedonians/hero_cavalry_spearman_philip_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_spearman">
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_philip_ii
+  </Auras>
+  <Identity>
+    <Civ>mace</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Philip II of Macedon</GenericName>
+    <SpecificName>Philippos B' ho Makedōn</SpecificName>
+    <Icon>units/mace_hero_philip.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/macedonians/hero_cavalry_spearman_philip_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_ii_pike.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_pikeman">
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_philip_ii
+  </Auras>
+  <Identity>
+    <Civ>mace</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Philip II of Macedon</GenericName>
+    <SpecificName>Philippos B' ho Makedōn</SpecificName>
+    <Icon>units/mace_hero_philip.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/macedonians/hero_infantry_pikeman_philip.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_pike.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_pike.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_philip_pike.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_pikeman">
-  <Auras datatype="tokens">
-    units/heroes/mace_hero_philip
-  </Auras>
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Philip II of Macedon</GenericName>
-    <SpecificName>Philippos B' ho Makedōn</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/macedonians/hero_infantry_pikeman_philip.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">
-    units/heroes/mace_hero_pyrrhus
-  </Auras>
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Pyrrhus I of Epirus</GenericName>
-    <SpecificName>Pyrrhos ho Epeiros</SpecificName>
-    <Icon>units/mace_hero_pyrrhus.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/macedonians/hero_cavalry_spearman_pyrrhus_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/hero_pyrrhus_i.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_spearman">
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_pyrrhus_i
+  </Auras>
+  <Identity>
+    <Civ>mace</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Pyrrhus I of Epirus</GenericName>
+    <SpecificName>Pyrrhos ho Epeiros</SpecificName>
+    <Icon>units/mace_hero_pyrrhus.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/macedonians/hero_cavalry_spearman_pyrrhus_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">
-    units/heroes/pers_hero_cyrus
-  </Auras>
-  <Identity>
-    <Civ>pers</Civ>
-    <Lang>persian</Lang>
-    <GenericName>Cyrus II The Great</GenericName>
-    <SpecificName>Kuruš</SpecificName>
-    <Icon>units/pers_hero_cyrus.png</Icon>
-  </Identity>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/pers/champion_infantry
-    </Entities>
-    <TechCostMultiplier>
-      <food>1.0</food>
-      <wood>1.0</wood>
-      <stone>1.0</stone>
-      <metal>1.0</metal>
-      <time>1.0</time>
-    </TechCostMultiplier>
-  </ProductionQueue>
-  <VisualActor>
-    <Actor>units/persians/hero_cavalry_spearman_cyrus_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_cyrus_ii.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_spearman">
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_cyrus_ii
+  </Auras>
+  <Identity>
+    <Civ>pers</Civ>
+    <Lang>persian</Lang>
+    <GenericName>Cyrus II The Great</GenericName>
+    <SpecificName>Kuruš</SpecificName>
+    <Icon>units/pers_hero_cyrus.png</Icon>
+  </Identity>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/pers/champion_infantry
+    </Entities>
+    <TechCostMultiplier>
+      <food>1.0</food>
+      <wood>1.0</wood>
+      <stone>1.0</stone>
+      <metal>1.0</metal>
+      <time>1.0</time>
+    </TechCostMultiplier>
+  </ProductionQueue>
+  <VisualActor>
+    <Actor>units/persians/hero_cavalry_spearman_cyrus_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
-  <Auras datatype="tokens">
-    units/heroes/pers_hero_darius
-  </Auras>
-  <Footprint replace="">
-    <Square width="11.0" depth="11.0"/>
-    <Height>6.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>pers</Civ>
-    <Lang>persian</Lang>
-    <GenericName>Darius I the Great</GenericName>
-    <SpecificName>Dārayavahuš</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/pers_hero_darius.png</Icon>
-  </Identity>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
-  <VisualActor>
-    <Actor>units/persians/hero_chariot_archer_darius_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_archer">
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_darius_i
+  </Auras>
+  <Footprint replace="">
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>pers</Civ>
+    <Lang>persian</Lang>
+    <GenericName>Darius I the Great</GenericName>
+    <SpecificName>Dārayavahuš</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Icon>units/pers_hero_darius.png</Icon>
+  </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
+  <VisualActor>
+    <Actor>units/persians/hero_chariot_archer_darius_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_archer">
-  <Auras datatype="tokens">
-    units/heroes/pers_hero_xerxes
-  </Auras>
-  <Identity>
-    <Civ>pers</Civ>
-    <Lang>persian</Lang>
-    <GenericName>Xerxes I</GenericName>
-    <SpecificName>Xšayāršā</SpecificName>
-    <Icon>units/pers_hero_xerxes.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/hero_infantry_archer_xerxes.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_chariot.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_chariot.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
-  <Auras datatype="tokens">
-    units/heroes/pers_hero_xerxes
-  </Auras>
-  <Footprint replace="">
-    <Square width="11.0" depth="11.0"/>
-    <Height>6.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>pers</Civ>
-    <Lang>persian</Lang>
-    <GenericName>Xerxes I</GenericName>
-    <SpecificName>Xšayāršā</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <Icon>units/pers_hero_xerxes.png</Icon>
-  </Identity>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
-  <VisualActor>
-    <Actor>units/persians/hero_chariot_archer_xerxes_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_archer">
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_xerxes_i
+  </Auras>
+  <Identity>
+    <Civ>pers</Civ>
+    <Lang>persian</Lang>
+    <GenericName>Xerxes I</GenericName>
+    <SpecificName>Xšayāršā</SpecificName>
+    <Icon>units/pers_hero_xerxes.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/hero_infantry_archer_xerxes.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_archer">
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_xerxes_i
+  </Auras>
+  <Footprint replace="">
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>pers</Civ>
+    <Lang>persian</Lang>
+    <GenericName>Xerxes I</GenericName>
+    <SpecificName>Xšayāršā</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Icon>units/pers_hero_xerxes.png</Icon>
+  </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
+  <VisualActor>
+    <Actor>units/persians/hero_chariot_archer_xerxes_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_archer">
-  <Auras datatype="tokens">
-    units/heroes/ptol_hero_cleopatra_1
-    units/heroes/ptol_hero_cleopatra_2
-    units/heroes/ptol_hero_cleopatra_3
-  </Auras>
-  <Identity>
-    <Civ>ptol</Civ>
-    <Phenotype>female</Phenotype>
-    <GenericName>Cleopatra VII</GenericName>
-    <SpecificName>Kleopatra H' Philopatōr</SpecificName>
-    <Icon>units/ptol_hero_cleopatra.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/hero_infantry_archer_cleopatra.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_cleopatra_vii.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_archer">
+  <Auras datatype="tokens">
+    units/heroes/ptol_hero_cleopatra_vii_1
+    units/heroes/ptol_hero_cleopatra_vii_2
+    units/heroes/ptol_hero_cleopatra_vii_3
+  </Auras>
+  <Identity>
+    <Civ>ptol</Civ>
+    <Phenotype>female</Phenotype>
+    <GenericName>Cleopatra VII</GenericName>
+    <SpecificName>Kleopatra H' Philopatōr</SpecificName>
+    <Icon>units/ptol_hero_cleopatra.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/ptolemies/hero_infantry_archer_cleopatra.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_I.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_I.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_I.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_elephant_melee">
-  <Auras datatype="tokens">
-    units/heroes/ptol_hero_ptolemy_I_1
-    units/heroes/ptol_hero_ptolemy_I_2
-  </Auras>
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Ptolemy I</GenericName>
-    <SpecificName>Ptolemaios A' Sōter</SpecificName>
-    <Icon>units/ptol_hero_ptolemy_I.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/hero_elephantry_ptolemy_I_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_IV.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_IV.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_IV.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">
-    units/heroes/ptol_hero_ptolemy_IV
-  </Auras>
-  <Identity>
-    <Civ>ptol</Civ>
-    <Classes datatype="tokens">PtolemyIV</Classes>
-    <GenericName>Ptolemy IV</GenericName>
-    <SpecificName>Ptolemaios D' Philopatōr</SpecificName>
-    <Icon>units/ptol_hero_ptolemy_IV.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_i.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_elephant_melee">
+  <Auras datatype="tokens">
+    units/heroes/ptol_hero_ptolemy_i_1
+    units/heroes/ptol_hero_ptolemy_i_2
+  </Auras>
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>Ptolemy I</GenericName>
+    <SpecificName>Ptolemaios A' Sōter</SpecificName>
+    <Icon>units/ptol_hero_ptolemy_I.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/ptolemies/hero_elephantry_ptolemy_I_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/hero_ptolemy_iv.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_swordsman">
+  <Auras datatype="tokens">
+    units/heroes/ptol_hero_ptolemy_iv
+  </Auras>
+  <Identity>
+    <Civ>ptol</Civ>
+    <Classes datatype="tokens">PtolemyIV</Classes>
+    <GenericName>Ptolemy IV</GenericName>
+    <SpecificName>Ptolemaios D' Philopatōr</SpecificName>
+    <Icon>units/ptol_hero_ptolemy_IV.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_great.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_great.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_great.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">
-    units/heroes/sele_hero_antiochus_great
-  </Auras>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Antiochus III the Great</GenericName>
-    <SpecificName>Antiokhos G' Megas</SpecificName>
-    <Icon>units/sele_hero_antiochus_the_great.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/hero_cavalry_spearman_antiochus_the_great_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iii.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_spearman">
+  <Auras datatype="tokens">
+    units/heroes/sele_hero_antiochus_iii
+  </Auras>
+  <Identity>
+    <Civ>sele</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Antiochus III the Great</GenericName>
+    <SpecificName>Antiokhos G' Megas</SpecificName>
+    <Icon>units/sele_hero_antiochus_the_great.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/seleucids/hero_cavalry_spearman_antiochus_the_great_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_iv.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_swordsman">
+  <Auras datatype="tokens">
+    units/heroes/sele_hero_antiochus_iv
+  </Auras>
+  <Identity>
+    <Civ>sele</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Antiochus IV</GenericName>
+    <SpecificName>Antiokhos D' Epiphanēs</SpecificName>
+    <Icon>units/sele_hero_antiochus_the_righteous.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_righteous.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_righteous.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_antiochus_righteous.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">
-    units/heroes/sele_hero_antiochus_righteous
-  </Auras>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Antiochus IV</GenericName>
-    <SpecificName>Antiokhos D' Epiphanēs</SpecificName>
-    <Icon>units/sele_hero_antiochus_the_righteous.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_i.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_elephant_melee">
+  <Auras datatype="tokens">
+    units/heroes/sele_hero_seleucus_i
+  </Auras>
+  <Identity>
+    <Civ>sele</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Seleucus I</GenericName>
+    <SpecificName>Seleukos A' Nikatōr</SpecificName>
+    <Icon>units/sele_hero_seleucus.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/seleucids/hero_elephantry_seleucus_victor_m.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_victor.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_victor.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/hero_seleucus_victor.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_elephant_melee">
-  <Auras datatype="tokens">
-    units/heroes/sele_hero_seleucus_victor
-  </Auras>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Seleucus I</GenericName>
-    <SpecificName>Seleukos A' Nikatōr</SpecificName>
-    <Icon>units/sele_hero_seleucus.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/hero_elephantry_seleucus_victor_m.xml</Actor>
-  </VisualActor>
-</Entity>