Index: binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Soldier", "Elephant"],
+	"affects": ["Champion"],
 	"modifications": [
 		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
@@ -12,6 +12,6 @@
 		{ "value": "Attack/Capture/Value", "add": 2 }
 	],
 	"auraName": "Warrior Queen",
-	"auraDescription": "+20% attack and +2 capture for soldiers and elephants.",
+	"auraDescription": "+20% attack and +2 capture for champion units and elephants.",
 	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
 }
Index: binaries/data/mods/public/simulation/data/technologies/kushites/choose_amun.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/kushites/choose_amun.json
+++ binaries/data/mods/public/simulation/data/technologies/kushites/choose_amun.json
@@ -0,0 +1,12 @@
+{
+	"pair": "kushites/pair_unlock_temples",
+	"genericName": "Follow Amun",
+	"description": ".",
+	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 0},
+	"requirements": {"all": [{"tech": "phase_city"}, {"civ": "kush"}]},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "architecture.png",
+	"researchTime": 0,
+	"tooltip": "Set your state religion to favour the all-powerful god Amun. Get rewarded for your faith by receiving access to unique technologies.",
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/kushites/choose_apedemak.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/kushites/choose_apedemak.json
+++ binaries/data/mods/public/simulation/data/technologies/kushites/choose_apedemak.json
@@ -0,0 +1,12 @@
+{
+	"pair": "kushites/pair_unlock_temples",
+	"genericName": "Follow Apedemak",
+	"description": ".",
+	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 0},
+	"requirements": {"all": [{"tech": "phase_city"}, {"civ": "kush"}]},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "architecture.png",
+	"researchTime": 0,
+	"tooltip": "Turn out the Egyptian impostor Amun and worship the true god of Kush, Apedmemak the Warrior.",
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/kushites/pair_unlock_temples.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/kushites/pair_unlock_temples.json
+++ binaries/data/mods/public/simulation/data/technologies/kushites/pair_unlock_temples.json
@@ -0,0 +1,6 @@
+{
+	"genericName": "Follow Amun vs. Follow Apedemak",
+	"top": "kushites/choose_amun",
+	"bottom": "kushites/choose_apedemak",
+	"requirements": { "civ": "kush" }
+}
Index: binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
+++ binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
@@ -4,9 +4,9 @@
 	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 500 },
 	"requirements": {
 		"all": [
-			{ "tech": "phase_city" }, { "civ": "kush" }]
+			{ "tech": "phase_city" }, { "tech": "kushites/choose_amun" }, { "civ": "kush" }]
 	},
-	"requirementsTooltip": "Unlocked in City Phase.",
+	"requirementsTooltip": "Unlocked in City Phase. Requires the Follow Amun technology.",
 	"icon": "high_priest.png",
 	"researchTime": 60,
 	"tooltip": "Train elite rank healers.",
Index: binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
+++ binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
@@ -3,8 +3,18 @@
   <Auras datatype="tokens">teambonuses/kush_player_team_bonus</Auras>
   <EntityLimits>
     <Limits>
+	  <AmunTemple>1</AmunTemple>
+	  <ApedemakTemple>1</ApedemakTemple>
       <PyramidSmall>4</PyramidSmall>
       <PyramidLarge>2</PyramidLarge>
     </Limits>
+    <LimitRemovers>
+      <AmunTemple>
+        <RequiredTechs datatype="tokens">kushites/choose_amun</RequiredTechs>
+      </AmunTemple>
+      <ApedemakTemple>
+        <RequiredTechs datatype="tokens">kushites/choose_apedemak</RequiredTechs>
+      </ApedemakTemple>
+    </LimitRemovers>
   </EntityLimits>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
+  <Cost>
+    <Resources>
+      <wood>150</wood>
+      <stone>150</stone>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
@@ -14,12 +20,9 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_clubman_b
-      units/{civ}_infantry_merc_javelinist_b
+      units/{civ}_infantry_javelinist_merc_b
       units/{civ}_cavalry_javelinist_b
     </Entities>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/barracks.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml
@@ -17,6 +17,9 @@
       units/{civ}_infantry_archer_b
       units/{civ}_cavalry_javelinist_b
     </Entities>
+    <Technologies datatype="tokens">
+      kushites/pair_unlock_temples
+    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/civic_centre_kush.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
+  <BuildRestrictions>
+    <Category>AmunTemple</Category>
+  </BuildRestrictions>
   <Auras datatype="tokens">
     structures/kush_temple_amun
   </Auras>
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
+  <BuildRestrictions>
+    <Category>ApedemakTemple</Category>
+  </BuildRestrictions>
   <Footprint>
     <Square width="24.0" depth="36.0"/>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack op="add">-1</Hack>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Bonuses>
+        <Bonus1>
+          <Classes>Champion</Classes>
+          <Multiplier>1.3</Multiplier>
+        </Bonus1>
+        <Bonus2>
+          <Classes>Hero</Classes>
+          <Multiplier>1.3</Multiplier>
+        </Bonus2>
+      </Bonuses>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Meroitic Temple Guard</GenericName>
     <SpecificName>rs ‘Iprmk</SpecificName>
+    <Tooltip>Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes.</Tooltip>
     <VisibleClasses datatype="tokens">Axe</VisibleClasses>
     <Classes datatype="tokens">ApedemakGuard</Classes>
     <Icon>units/kush_champion_apedemak.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
@@ -9,7 +9,7 @@
     <Civ>kush</Civ>
     <GenericName>Arakamani</GenericName>
     <SpecificName>‘Irk.‘Imn</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
+    <Icon>units/hele_hero_alexander.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_elephantry_arakamani_m.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
   <Auras datatype="tokens">
-    units/heroes/kush_hero_nastasen
+    units/heroes/kush_hero_nastasen_1
+    units/heroes/kush_hero_nastasen_2
   </Auras>
   <Identity>
     <Civ>kush</Civ>
@@ -8,8 +9,7 @@
     <GenericName>Nastasen</GenericName>
     <SpecificName>Nastasen Ankhkhare</SpecificName>
     <Classes datatype="tokens">Nastasen</Classes>
-    <Icon>units/hele_hero_alexander.png</Icon>
-    <Tooltip>Hero Special: "Gift of Warships" - Allows the training of Ptolemaic trireme-class ships.</Tooltip>
+    <Icon>units/mace_hero_philip.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_cavalry_spearman_nastasen_m.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -6,7 +6,7 @@
   <Attack>
     <Melee>
       <Hack>3.0</Hack>
-      <Crush>5.0</Crush>
+      <Crush>2.5</Crush>
     </Melee>
   </Attack>
   <Builder>
Index: binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
@@ -8,8 +8,9 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
-    <GenericName>Great Warship</GenericName>
+    <GenericName>Ptolemaic Mercenary Trireme</GenericName>
     <SpecificName>shry ‘3</SpecificName>
+    <Classes datatype="tokens">KushTrireme</Classes>
     <Icon>units/ptol_ship_trireme.png</Icon>
   </Identity>
   <VisualActor>