Index: binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
+++ binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
@@ -4,15 +4,25 @@
 		"sele": "Nisioi"
 	},
 	"description": "The now-extinct Nisian breed of horse was one of the largest and robust horses of ancient times. They were highly sought after by the Seleucids and Persians as both rider and mount gained heavier armor as time progressed.",
-	"cost": { "food": 200, "wood": 0, "stone": 0, "metal": 200 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "any": [{ "civ": "sele" }, { "civ": "pers" }] }] },
+	"cost": { "food": 300, "wood": 0, "stone": 0, "metal": 200 },
+	"requirements": {
+		"all": [
+			{ "tech": "phase_city" },
+			{
+				"any": [
+					{ "civ": "pers" },
+					{ "civ": "sele" }
+				]
+			}
+		]
+	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "nisean_war_horses.png",
 	"researchTime": 60,
-	"tooltip": "All cavalry +20% health.",
+	"tooltip": "Cavalry Spearmen +20% health.",
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.2 }
 	],
-	"affects": ["Cavalry"],
+	"affects": ["Cavalry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/cavalry_movement_speed.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/cavalry_movement_speed.json
+++ binaries/data/mods/public/simulation/data/technologies/cavalry_movement_speed.json
@@ -1,12 +1,12 @@
 {
-	"genericName": "Cavalry Breeding",
-	"description": "Breed the fastest horses.",
-	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 150 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
+	"genericName": "Horse Racing",
+	"description": "Racing competitions encourage people to train their horses to go faster.",
+	"cost": { "food": 450, "wood": 0, "stone": 0, "metal": 150 },
+	"requirements": { "tech": "phase_village" },
+	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "nisean_war_horses.png",
 	"researchTime": 40,
-	"tooltip": "+10% cavalry walk speed.",
+	"tooltip": "Cavalry +10% movement speed.",
 	"modifications": [
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.1 }
 	],
Index: binaries/data/mods/public/simulation/data/technologies/cavalry_training_time.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/cavalry_training_time.json
+++ binaries/data/mods/public/simulation/data/technologies/cavalry_training_time.json
@@ -1,15 +1,14 @@
 {
-	"genericName": "Cavalry Speed Training",
-	"description": "Train your horses to move faster.",
-	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 150 },
-	"supersedes": "speed_cavalry_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
+	"genericName": "Horse Breeding",
+	"description": "Having more horses available makes it easier to replace your losses.",
+	"cost": { "food": 600, "wood": 300, "stone": 0, "metal": 0 },
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "nisean_war_horses.png",
-	"researchTime": 40,
-	"tooltip": "+10% cavalry walk speed.",
+	"researchTime": 50,
+	"tooltip": "Cavalry −10% training time.",
 	"modifications": [
-		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.1 }
+		{ "value": "Cost/BuildTime", "multiply": 0.9 }
 	],
 	"affects": ["Cavalry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/speed_cavalry_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/speed_cavalry_01.json
+++ binaries/data/mods/public/simulation/data/technologies/speed_cavalry_01.json
@@ -1,15 +0,0 @@
-{
-	"genericName": "Cavalry Breeding",
-	"description": "Breed the fastest horses.",
-	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 150 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "nisean_war_horses.png",
-	"researchTime": 40,
-	"tooltip": "+10% cavalry walk speed.",
-	"modifications": [
-		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.1 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/speed_cavalry_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/speed_cavalry_02.json
+++ binaries/data/mods/public/simulation/data/technologies/speed_cavalry_02.json
@@ -1,16 +0,0 @@
-{
-	"genericName": "Cavalry Speed Training",
-	"description": "Train your horses to move faster.",
-	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 150 },
-	"supersedes": "speed_cavalry_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "nisean_war_horses.png",
-	"researchTime": 40,
-	"tooltip": "+10% cavalry walk speed.",
-	"modifications": [
-		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.1 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
+++ binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
@@ -1,18 +0,0 @@
-{
-	"genericName": "Nisean War Horses",
-	"specificName": {
-		"sele": "Nisioi"
-	},
-	"description": "The now-extinct Nisian breed of horse was one of the largest and robust horses of ancient times. They were highly sought after by the Seleucids and Persians as both rider and mount gained heavier armor as time progressed.",
-	"cost": { "food": 200, "wood": 0, "stone": 0, "metal": 200 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "any": [{ "civ": "sele" }, { "civ": "pers" }] }] },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "nisean_war_horses.png",
-	"researchTime": 60,
-	"tooltip": "All cavalry +20% health.",
-	"modifications": [
-		{ "value": "Health/Max", "multiply": 1.2 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
+++ binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
@@ -1,5 +1,5 @@
 {
-	"genericName": "Unlock Champion Units",
+	"genericName": "Unlock Champion Infantry",
 	"specificName": {
 		"mace": "Ágēma",
 		"spart": "Ágēma",
@@ -7,23 +7,25 @@
 		"rome": "Regio Cohors"
 	},
 	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
-	"cost": { "food": 0, "wood": 0, "stone": 0, "metal": 1000 },
+	"cost": { "food": 0, "wood": 0, "stone": 0, "metal": 700 },
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{ "any": [
-				{ "civ": "brit" },
-				{ "civ": "gaul" },
-				{ "civ": "iber" },
-				{ "civ": "mace" },
-				{ "civ": "maur" },
-				{ "civ": "rome" }
-			]}
+			{
+				"any": [
+					{ "civ": "brit" },
+					{ "civ": "gaul" },
+					{ "civ": "iber" },
+					{ "civ": "mace" },
+					{ "civ": "maur" },
+					{ "civ": "rome" }
+				]
+			}
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 90,
-	"tooltip": "Unlock the ability to train Champions at the Barracks.",
+	"tooltip": "Unlock Champion Infantry at the Barracks.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -20,7 +20,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_chariot
       units/{civ}_hero_boudicca
       units/{civ}_hero_caratacos
       units/{civ}_hero_cunobelin
Index: binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
@@ -23,7 +23,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -10,7 +10,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_hero_brennus
       units/{civ}_hero_viridomarus
       units/{civ}_hero_vercingetorix
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -23,7 +23,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_hero_caros
       units/{civ}_hero_indibil
       units/{civ}_hero_viriato
Index: binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
@@ -14,7 +14,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
       units/{civ}_hero_nastasen
       units/{civ}_hero_amanirenas
Index: binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -14,7 +14,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_a
-      units/{civ}_champion_cavalry
       units/{civ}_hero_philip
       units/{civ}_hero_alexander
       units/{civ}_hero_demetrius
Index: binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -8,7 +8,6 @@
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
       units/{civ}_champion_maiden
-      units/{civ}_champion_chariot
       units/{civ}_hero_chanakya
       units/{civ}_hero_maurya
       units/{civ}_hero_ashoka
Index: binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -15,7 +15,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -7,7 +7,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_hero_marcellus
       units/{civ}_hero_maximus
       units/{civ}_hero_scipio
Index: binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
@@ -15,14 +15,11 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_chariot
       units/{civ}_champion_infantry_swordsman
-      units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
-      successors/special_war_horses
       successors/special_parade_of_daphne
     </Technologies>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -21,9 +21,9 @@
   <Identity>
     <GenericName>Barracks</GenericName>
     <SelectionGroupName>template_structure_military_barracks</SelectionGroupName>
-    <Tooltip>Train citizen-soldiers. Research training improvements.</Tooltip>
+    <Tooltip>Train Infantry and research Infantry technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Barracks</VisibleClasses>
-    <Icon>structures/barracks.png</Icon>
+    <Icon>structures/pers_barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Obstruction>
@@ -38,20 +38,16 @@
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
-      units/{civ}_cavalry_swordsman_b
-      units/{civ}_cavalry_spearman_b
-      units/{civ}_cavalry_javelinist_b
-      units/{civ}_cavalry_archer_b
       units/{civ}_champion_infantry_barracks
       units/{civ}_champion_maiden_barracks
-      units/{civ}_champion_cavalry_barracks
-      units/{civ}_champion_chariot_barracks
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
       unlock_champion_units
       archery_tradition
+      persians/training_levy_infantry
+      persians/training_conscription_infantry
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -40,14 +40,14 @@
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
       units/{civ}_champion_cavalry
+      units/{civ}_champion_chariot
     </Entities>
     <Technologies datatype="tokens">
-      heal_barracks
-      speed_cavalry_01
-      speed_cavalry_02
+      cavalry_movement_speed
+      cavalry_training_time
+      cavalry_health
       persians/training_levy_cavalry
       persians/training_conscription_cavalry
-      successors/special_war_horses
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -34,8 +34,6 @@
     </Entities>
     <Technologies datatype="tokens">
       gather_animals_stockbreeding
-      speed_cavalry_01
-      speed_cavalry_02
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -37,6 +37,7 @@
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
+      structures/{civ}_stable
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_chariot_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_chariot_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit_champion_chariot">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
Index: binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
Index: binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>