Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Conscription",
+	"description": "Significantly increase training speed of infantry by training them in large batches or companies.",
+	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist_spear_fire.png",
+	"researchTime": 40,
+	"tooltip": "Barracks −10% batch training time.",
+	"modifications": [
+		{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
+	],
+	"affects": ["Barracks"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_cost_time.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_cost_time.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_cost_time.json
@@ -0,0 +1,20 @@
+{
+	"genericName": "Levy Cavalry",
+	"description": "Calling up cavalry levies in time of war helps bolster the ranks of a king's army.",
+	"cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
+	"requirements": {
+		"all": [
+			{ "tech": "phase_town" },
+			{ "civ": "pers" }
+		]
+	},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "horseshoe_silver.png",
+	"researchTime": 40,
+	"tooltip": "Cavalry −10% training time.",
+	"modifications": [
+		{ "value": "Cost/BuildTime", "multiply": 0.9 }
+	],
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Horse Breeding",
+	"description": "Selectively breed better war horses.",
+	"cost": { "food": 400, "wood": 0, "stone": 0, "metal": 150 },
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "horse_trainer.png",
+	"researchTime": 50,
+	"tooltip": "Cavalry +10% health.",
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 1.1 }
+	],
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/infantry_cost_time.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/infantry_cost_time.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/infantry_cost_time.json
@@ -0,0 +1,20 @@
+{
+	"genericName": "Levy Infantry",
+	"description": "Calling up infantry levies in time of war helps bolster the ranks of a king's army.",
+	"cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
+	"requirements": {
+		"all": [
+			{ "tech": "phase_town" },
+			{ "civ": "pers" }
+		]
+	},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "fist_spear.png",
+	"researchTime": 40,
+	"tooltip": "Infantry −10% training time.",
+	"modifications": [
+		{ "value": "Cost/BuildTime", "multiply": 0.9 }
+	],
+	"affects": ["Infantry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
@@ -0,0 +1,28 @@
+{
+	"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": "Cavalry +20% health.",
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 1.2 }
+	],
+	"affects": ["Cavalry"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
@@ -1,16 +0,0 @@
-{
-	"genericName": "Cavalry Conscription",
-	"supersedes": "persians/training_levy_cavalry",
-	"description": "Significantly increase training speed of cavalry at the stables by training them in large batches or battalions.",
-	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "civ": "pers" }] },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "horse_rider.png",
-	"researchTime": 40,
-	"tooltip": "Faster batch training speed for the Stables.",
-	"modifications": [
-		{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
-	],
-	"affects": ["Stable"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json
@@ -1,16 +0,0 @@
-{
-	"genericName": "Infantry Conscription",
-	"supersedes": "persians/training_levy_infantry",
-	"description": "Significantly increase training speed of soldiers at the Barracks by training them in large batches or battalions.",
-	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "civ": "pers" }] },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "fist_spear.png",
-	"researchTime": 40,
-	"tooltip": "Faster batch training speed for the Barracks.",
-	"modifications": [
-		{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
-	],
-	"affects": ["Barracks"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
@@ -1,16 +0,0 @@
-{
-	"genericName": "Levy Cavalry",
-	"description": "Calling up cavalry levies in time of war helps bolster the ranks of a king's army.",
-	"cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_town" }, { "civ": "pers" }] },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "horse_trainer.png",
-	"researchTime": 40,
-	"tooltip": "All cavalry -20% train time, but also -5% health. Unlocks Cavalry Conscription.",
-	"modifications": [
-		{ "value": "Cost/BuildTime", "multiply": 0.8 },
-		{ "value": "Health/Max", "multiply": 0.95 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
@@ -1,16 +0,0 @@
-{
-	"genericName": "Levy Infantry",
-	"description": "Calling up infantry levies in time of war helps bolster the ranks of a king's army.",
-	"cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_town" }, { "civ": "pers" }] },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "clenched_fist.png",
-	"researchTime": 40,
-	"tooltip": "All infantry -20% train time, but also -5% health. Unlocks Infantry Conscription.",
-	"modifications": [
-		{ "value": "Cost/BuildTime", "multiply": 0.8 },
-		{ "value": "Health/Max", "multiply": 0.95 }
-	],
-	"affects": ["Infantry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Conscription",
+	"description": "Significantly increase training speed of cavalry by training them in large batches or squadrons.",
+	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "horseshoe_gold.png",
+	"researchTime": 40,
+	"tooltip": "Stables −10% batch training time.",
+	"modifications": [
+		{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
+	],
+	"affects": ["Stable"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
+++ ps/trunk/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: ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_conscription.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_conscription.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_conscription.json
@@ -1,15 +0,0 @@
-{
-	"genericName": "Conscription",
-	"description": "Significantly increase training speed of soldiers at the Barracks by training them in large batches or battalions.",
-	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "pers" }] },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "fist_spear.png",
-	"researchTime": 40,
-	"tooltip": "Faster batch training speed for the Barracks.",
-	"modifications": [
-		{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
-	],
-	"affects": ["Barracks"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -52,9 +52,8 @@
       units/{civ}/champion_maiden_barracks
     </Entities>
     <Technologies datatype="tokens">
-      persians/training_levy_infantry
-      persians/training_conscription_infantry
-      training_conscription
+      barracks_batch_training
+      infantry_cost_time
       unlock_champion_units
     </Technologies>
   </ProductionQueue>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -47,10 +47,11 @@
       units/{civ}/war_dog
     </Entities>
     <Technologies datatype="tokens">
+      stable_batch_training
+      cavalry_cost_time
       cavalry_movement_speed
-      persians/training_levy_cavalry
-      persians/training_conscription_cavalry
-      successors/special_war_horses
+      cavalry_health
+      nisean_horses
     </Technologies>
   </ProductionQueue>
   <Sound>