Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
@@ -15,6 +15,13 @@
     <Gender>female</Gender>
     <Icon>units/celt_hero_boudicca.png</Icon>
   </Identity>
+  <Upgrade>
+    <Unmount>
+      <Entity>units/brit_hero_boudicca_sword</Entity>
+      <Tooltip>Unmount Boudicca so she can fight with a sword.</Tooltip>
+      <Time>5</Time>
+    </Unmount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
@@ -10,6 +10,13 @@
     <Gender>female</Gender>
     <Icon>units/celt_hero_boudicca.png</Icon>
   </Identity>
+  <Upgrade>
+    <Mount>
+      <Entity>units/brit_hero_boudicca</Entity>
+      <Tooltip>Mount Boudicca onto her mighty chariot.</Tooltip>
+      <Time>5</Time>
+    </Mount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/celts/boudicca.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">
-    units/heroes/brit_hero_cunobelin
-  </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
     <Icon>units/celt_hero_cynvelin.png</Icon>
   </Identity>
+  <Upgrade>
+    <Unmount>
+      <Entity>units/brit_hero_cunobelin_infantry</Entity>
+      <Tooltip>Unmount Cunobelin so he can use his aura.</Tooltip>
+      <Time>5</Time>
+    </Unmount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/celts/cunobelin_horse.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
@@ -8,6 +8,13 @@
     <SpecificName>Cunobelin</SpecificName>
     <Icon>units/celt_hero_cunobelin.png</Icon>
   </Identity>
+  <Upgrade>
+    <Mount>
+      <Entity>units/brit_hero_cunobelin</Entity>
+      <Tooltip>Mount Cunobelin onto his horse.</Tooltip>
+      <Time>5</Time>
+    </Mount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/celts/cunobelin.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
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
@@ -10,6 +10,13 @@
     <SpecificName>Phílippos B' ho Makedṓn</SpecificName>
     <Icon>units/hele_hero_philip.png</Icon>
   </Identity>
+  <Upgrade>
+    <Unmount>
+      <Entity>units/mace_hero_philip_pike</Entity>
+      <Tooltip>Unmount Philip so he can fight with a pike.</Tooltip>
+      <Time>5</Time>
+    </Unmount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/macedonians/philip_horse.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
@@ -10,6 +10,13 @@
     <SpecificName>Phílippos B' ho Makedṓn</SpecificName>
     <Icon>units/hele_hero_philip.png</Icon>
   </Identity>
+  <Upgrade>
+    <Mount>
+      <Entity>units/mace_hero_philip</Entity>
+      <Tooltip>Mount Philip onto his horse.</Tooltip>
+      <Time>5</Time>
+    </Mount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/macedonians/philip.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
@@ -9,6 +9,13 @@
     <SpecificName>Xsayarsa I</SpecificName>
     <Icon>units/pers_hero_xerxes.png</Icon>
   </Identity>
+  <Upgrade>
+    <Mount>
+      <Entity>units/pers_hero_xerxes_chariot</Entity>
+      <Tooltip>Mount Xerxes onto his mighty chariot.</Tooltip>
+      <Time>5</Time>
+    </Mount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/persians/hero_xerxes.xml</Actor>
   </VisualActor>
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
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
@@ -1,8 +1,5 @@
 <?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="6.0" depth="12.0"/>
     <Height>5.0</Height>
@@ -14,6 +11,13 @@
     <SpecificName>Xsayarsa I</SpecificName>
     <Icon>units/pers_hero_xerxes.png</Icon>
   </Identity>
+  <Upgrade>
+    <Unmount>
+      <Entity>units/pers_hero_xerxes</Entity>
+      <Tooltip>Unmount Xerxes so he can use his aura.</Tooltip>
+      <Time>5</Time>
+    </Unmount>
+  </Upgrade>
   <VisualActor>
     <Actor>units/persians/hero_xerxes_chariot.xml</Actor>
   </VisualActor>