Index: binaries/data/mods/public/simulation/data/civs/athen.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/athen.json
+++ binaries/data/mods/public/simulation/data/civs/athen.json
@@ -84,7 +84,6 @@
 		"Demosthenes"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_ranged_b": "units/athen/infantry_slinger_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/data/civs/brit.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/brit.json
+++ binaries/data/mods/public/simulation/data/civs/brit.json
@@ -81,7 +81,6 @@
 		"Vosenius"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_ranged_b": "units/brit/infantry_slinger_b",
 		"skirmish/units/special_starting_unit": "units/brit/war_dog",
 		"skirmish/structures/default_house_5": "structures/{civ}/house"
 	},
Index: binaries/data/mods/public/simulation/data/civs/cart.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/cart.json
+++ binaries/data/mods/public/simulation/data/civs/cart.json
@@ -87,7 +87,6 @@
 		"Hasdrubal the Boetharch"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_ranged_b": "units/cart/infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/data/civs/iber.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/iber.json
+++ binaries/data/mods/public/simulation/data/civs/iber.json
@@ -77,7 +77,6 @@
 		"Tautalus"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_melee_b": "units/iber/infantry_swordsman_b",
 		"skirmish/structures/default_house_5": "structures/{civ}/house",
 		"skirmish/structures/iber/wall_short": "structures/iber/wall_short",
 		"skirmish/structures/iber/wall_medium": "structures/iber/wall_medium",
Index: binaries/data/mods/public/simulation/data/civs/kush.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/kush.json
+++ binaries/data/mods/public/simulation/data/civs/kush.json
@@ -86,7 +86,6 @@
 		"Amanishakheto"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_ranged_b": "units/kush/infantry_archer_b",
 		"skirmish/units/special_starting_unit": "units/kush/support_healer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
Index: binaries/data/mods/public/simulation/data/civs/mace.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/mace.json
+++ binaries/data/mods/public/simulation/data/civs/mace.json
@@ -77,8 +77,6 @@
 		"Meleager"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_cavalry": "units/mace/cavalry_spearman_b",
-		"skirmish/units/default_infantry_melee_b": "units/mace/infantry_pikeman_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/data/civs/maur.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/maur.json
+++ binaries/data/mods/public/simulation/data/civs/maur.json
@@ -76,7 +76,6 @@
 		"Brihadratha Maurya"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_ranged_b": "units/maur/infantry_archer_b",
 		"skirmish/units/special_starting_unit": "units/maur/support_elephant",
 		"skirmish/structures/default_house_5": "structures/{civ}/house"
 	},
Index: binaries/data/mods/public/simulation/data/civs/pers.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/pers.json
+++ binaries/data/mods/public/simulation/data/civs/pers.json
@@ -86,7 +86,6 @@
 		"Xsayarsa II"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_ranged_b": "units/pers/infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/data/civs/ptol.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/ptol.json
+++ binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -89,9 +89,6 @@
 		"Arsinoe II"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_infantry_melee_b": "units/ptol/infantry_pikeman_b",
-		"skirmish/units/default_infantry_ranged_b": "units/ptol/infantry_slinger_b",
-		"skirmish/units/default_cavalry": "units/ptol/cavalry_archer_b",
 		"skirmish/structures/default_house_5": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/data/civs/rome.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/rome.json
+++ binaries/data/mods/public/simulation/data/civs/rome.json
@@ -89,8 +89,6 @@
 		"Marcus Licinius Crassus"
 	],
 	"SkirmishReplacements": {
-		"skirmish/units/default_cavalry": "units/rome/cavalry_spearman_b",
-		"skirmish/units/default_infantry_melee_b": "units/rome/infantry_swordsman_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
@@ -5,7 +5,7 @@
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
-    <general>units/{civ}/cavalry_javelineer_b</general>
+    <general>units/{civ}/default_cavalry</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>units/athenians/cavalry_javelinist_b_m.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
@@ -10,7 +10,7 @@
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
-    <general>units/{civ}/infantry_spearman_b</general>
+    <general>units/{civ}/default_infantry_melee_b</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>units/athenians/infantry_spearman_b.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
@@ -10,7 +10,7 @@
   </Identity>
   <Promotion disable=""/>
   <SkirmishReplacer>
-    <general>units/{civ}/infantry_javelineer_b</general>
+    <general>units/{civ}/default_infantry_ranged_b</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>units/athenians/infantry_slinger_b.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/athen/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen/civil_centre.xml
@@ -7,13 +7,6 @@
     <Civ>athen</Civ>
     <SpecificName>Agora</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_slinger_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/civil_centre.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit/civil_centre.xml
@@ -14,13 +14,6 @@
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_slinger_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/britons/civic_centre.xml</Actor>
     <FoundationActor>structures/fndn_7x8.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml
@@ -27,18 +27,12 @@
   </Position>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_slinger_b
-      units/{civ}/cavalry_javelineer_b
       units/{civ}/ship_fishing
       units/{civ}/ship_merchant
       units/{civ}/ship_bireme
       units/{civ}/ship_trireme
     </Entities>
-    <Technologies datatype="tokens">
-      -phase_town_{civ}
-      -hellenistic_metropolis
-    </Technologies>
+    <Technologies replace="" datatype="tokens"/>
   </ProductionQueue>
   <RallyPointRenderer>
     <LinePassabilityClass>ship</LinePassabilityClass>
Index: binaries/data/mods/public/simulation/templates/structures/cart/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/civil_centre.xml
@@ -7,16 +7,6 @@
     <Civ>cart</Civ>
     <SpecificName>Merkāz</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_archer_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-    <Technologies datatype="tokens">
-      colonization
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/civil_centre.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul/civil_centre.xml
@@ -14,13 +14,6 @@
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_javelineer_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/gauls/civic_centre.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/iber/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber/civil_centre.xml
@@ -7,13 +7,6 @@
     <Civ>iber</Civ>
     <SpecificName>Oppidum</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_swordsman_b
-      units/{civ}/infantry_javelineer_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/civic_center.xml</Actor>
   </VisualActor>
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
@@ -11,16 +11,6 @@
   <Obstruction>
     <Static width="31.0" depth="31"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_archer_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-    <Technologies datatype="tokens">
-      architecture_kush
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/civic_centre_kush.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/mace/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace/civil_centre.xml
@@ -7,13 +7,6 @@
     <Civ>mace</Civ>
     <SpecificName>Agora</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_pikeman_b
-      units/{civ}/infantry_javelineer_b
-      units/{civ}/cavalry_spearman_b
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/macedonians/civic_centre.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/civil_centre.xml
@@ -16,9 +16,6 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_archer_b
-      units/{civ}/cavalry_javelineer_b
       units/{civ}/support_elephant
     </Entities>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
@@ -8,16 +8,6 @@
     <GenericName>Provincial Governor</GenericName>
     <SpecificName>Xšaçapāvan</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_archer_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-    <Technologies datatype="tokens">
-      architecture_pers
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/civil_centre.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/civil_centre.xml
@@ -13,9 +13,6 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/infantry_pikeman_b
-      units/{civ}/infantry_slinger_b
-      units/{civ}/cavalry_archer_b
       units/{civ}/hero_ptolemy_i
       units/{civ}/hero_ptolemy_iv
       units/{civ}/hero_cleopatra_vii
Index: binaries/data/mods/public/simulation/templates/structures/rome/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome/civil_centre.xml
@@ -14,13 +14,6 @@
   <Obstruction>
     <Static width="37.0" depth="37.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_swordsman_b
-      units/{civ}/infantry_javelineer_b
-      units/{civ}/cavalry_spearman_b
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/civic_centre.xml</Actor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/sele/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele/civil_centre.xml
@@ -6,9 +6,6 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_javelineer_b
-      units/{civ}/cavalry_javelineer_b
       units/{civ}/hero_seleucus_i
       units/{civ}/hero_antiochus_iii
       units/{civ}/hero_antiochus_iv
Index: binaries/data/mods/public/simulation/templates/structures/spart/civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart/civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart/civil_centre.xml
@@ -7,13 +7,6 @@
     <Civ>spart</Civ>
     <SpecificName>Agora</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_javelineer_b
-      units/{civ}/cavalry_javelineer_b
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/spartans/civic_center.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -98,6 +98,9 @@
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/support_female_citizen
+      units/{civ}/default_infantry_melee_b
+      units/{civ}/default_infantry_ranged_b
+      units/{civ}/default_cavalry
     </Entities>
     <Technologies datatype="tokens">
       phase_town_{civ}
@@ -107,6 +110,9 @@
       unlock_spies
       spy_counter
       archery_tradition
+      architecture_kush
+      architecture_pers
+      colonization
       hellenistic_metropolis
     </Technologies>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -36,10 +36,16 @@
     <metal>40</metal>
   </Loot>
   <ProductionQueue>
-    <Technologies datatype="tokens">
-      -phase_town_{civ}
-      -phase_city_{civ}
-      -hellenistic_metropolis
+    <Entities datatype="tokens">
+      -units/{civ}/default_infantry_melee_b
+      -units/{civ}/default_infantry_ranged_b
+      -units/{civ}/default_cavalry
+    </Entities>
+    <Technologies replace="" datatype="tokens">
+      unlock_shared_los
+      unlock_shared_dropsites
+      unlock_spies
+      spy_counter
       upgrade_rank_advanced_mercenary
     </Technologies>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/units/athen/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/infantry_slinger_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit/infantry_slinger_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/cart/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/cart/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/cart/infantry_archer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul/infantry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/iber/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/iber/infantry_swordsman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/iber/infantry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/kush/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/kush/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/kush/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/kush/infantry_archer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace/cavalry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace/infantry_pikeman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace/infantry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur/infantry_archer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/pers/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/pers/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/pers/infantry_archer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol/cavalry_archer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol/infantry_pikeman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol/infantry_slinger_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome/cavalry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome/infantry_swordsman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome/infantry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele/infantry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart/default_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart/default_cavalry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/spart/cavalry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart/default_infantry_melee_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart/default_infantry_melee_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/spart/infantry_spearman_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart/default_infantry_ranged_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart/default_infantry_ranged_b.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/spart/infantry_javelineer_b">
+  <Identity>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+</Entity>