Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -155,6 +155,7 @@
 			{"nick": "olsner", "name": "Simon Brenner"},
 			{"nick": "OptimusShepard", "name": "Pirmin Stanglmeier"},
 			{"nick": "otero"},
+			{"nick": "Nescio"},
 			{"name": "Nick Owens"},
 			{"nick": "Palaxin", "name": "David A. Freitag"},
 			{"name": "Paul Withers"},
Index: binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
@@ -6,8 +6,6 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Amoridas</SpecificName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Town</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>structures/britons/blacksmith.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
@@ -6,8 +6,6 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Amoridas</SpecificName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Town</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/blacksmith.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
@@ -11,7 +11,6 @@
     <Tooltip>Allow units access through a city wall. Can be locked to prevent access.</Tooltip>
     <Classes datatype="tokens">Gates</Classes>
     <Icon>structures/gate.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
     <Static disable=""/>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -35,12 +35,13 @@
   </Health>
   <Identity>
     <Classes datatype="tokens">CitizenSoldier Human Organic</Classes>
-    <VisibleClasses datatype="tokens">Cavalry Citizen Soldier</VisibleClasses>
-    <GenericName>Cavalry</GenericName>
-    <Rank>Basic</Rank>
     <Formations datatype="tokens">
       formations/wedge
     </Formations>
+    <GenericName>Cavalry</GenericName>
+    <Rank>Basic</Rank>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <VisibleClasses datatype="tokens">Cavalry Citizen Soldier</VisibleClasses>
   </Identity>
   <Loot>
     <xp>130</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -20,8 +20,9 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
     <GenericName>Cavalry Skirmisher</GenericName>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+    <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
   </Identity>
   <UnitMotion>
     <WalkSpeed>17.5</WalkSpeed>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -23,12 +23,11 @@
     <Max>1500</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
-    <GenericName>Hero Cavalry Skirmisher</GenericName>
-    <RequiredTechnology>phase_city</RequiredTechnology>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
+    <GenericName>Hero Cavalry Skirmisher</GenericName>
+    <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
   </Identity>
   <UnitMotion>
     <WalkSpeed>17.0</WalkSpeed>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -16,10 +16,11 @@
     <Max>85</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
-    <Tooltip>Heal units.</Tooltip>
     <Rank>Basic</Rank>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <Tooltip>Heal units.</Tooltip>
+    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
   </Identity>
   <Promotion>
     <RequiredXp>200</RequiredXp>
Index: binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
@@ -7,7 +7,6 @@
     <GenericName>Greek Cavalry</GenericName>
     <SpecificName>Hippeús</SpecificName>
     <Icon>units/hele_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/athen_cavalry_swordsman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml
@@ -6,7 +6,6 @@
     <SpecificName>Epos</SpecificName>
     <GenericName>Celtic Cavalry</GenericName>
     <Icon>units/celt_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/brit_cavalry_swordsman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
@@ -8,12 +8,12 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_cavalry_spearman_ital_b</SelectionGroupName>
+    <Classes datatype="tokens">Italian</Classes>
     <GenericName>Italic Cavalry</GenericName>
+    <Icon>units/cart_cavalry_spearman.png</Icon>
+    <SelectionGroupName>units/cart_cavalry_spearman_ital_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
-    <Classes datatype="tokens">Italian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_cavalry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_spearman_ital_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
@@ -8,12 +8,12 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_cavalry_swordsman_gaul_b</SelectionGroupName>
+    <Classes datatype="tokens">Celt</Classes>
     <GenericName>Gallic Mercenary Cavalry</GenericName>
+    <Icon>units/cart_cavalry_swordsman_2.png</Icon>
+    <SelectionGroupName>units/cart_cavalry_swordsman_gaul_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
-    <Classes datatype="tokens">Celt</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_cavalry_swordsman_2.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_swordsman_gaul_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
@@ -8,12 +8,12 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_cavalry_swordsman_iber_b</SelectionGroupName>
+    <Classes datatype="tokens">Iberian</Classes>
     <GenericName>Iberian Heavy Cavalry</GenericName>
+    <Icon>units/cart_cavalry_swordsman.png</Icon>
+    <SelectionGroupName>units/cart_cavalry_swordsman_iber_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
-    <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_cavalry_swordsman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_swordsman_iber_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
+    <Classes datatype="tokens">Iberian</Classes>
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
+    <Icon>units/cart_infantry_javelinist.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
     <SpecificName>Sǝḫīr Kidōn</SpecificName>
-    <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_javelinist_iber_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
+    <Classes datatype="tokens">Iberian</Classes>
     <GenericName>Balearic Slinger</GenericName>
+    <Icon>units/cart_infantry_slinger.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
     <SpecificName>Qallāʿ Ibušimi</SpecificName>
-    <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_slinger_iber_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
+    <Classes datatype="tokens">Celt</Classes>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
+    <Icon>units/cart_infantry_swordsman.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
     <SpecificName>Seḫīr Ḥerev</SpecificName>
-    <Classes datatype="tokens">Celt</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_swordsman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_swordsman_gaul_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
@@ -17,12 +17,13 @@
   </Cost>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
+    <Classes datatype="tokens">Italian</Classes>
     <GenericName>Samnite Swordsman</GenericName>
+    <Icon>units/cart_infantry_swordsman_2.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
     <SpecificName>Seḫīr Romaḥ</SpecificName>
-    <Classes datatype="tokens">Italian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_swordsman_2.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_swordsman_ital_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml
@@ -5,7 +5,6 @@
     <SelectionGroupName>units/gaul_cavalry_swordsman_b</SelectionGroupName>
     <SpecificName>Epos</SpecificName>
     <Icon>units/celt_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/gaul_cavalry_swordsman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml
@@ -5,7 +5,6 @@
     <SelectionGroupName>units/iber_cavalry_spearman_b</SelectionGroupName>
     <SpecificName>Lantzari</SpecificName>
     <Icon>units/iber_cavalry_spearman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/iber_cavalry_spearman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml
@@ -2,11 +2,12 @@
 <Entity parent="template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>mace</Civ>
+    <GenericName>Thessalian Lancer</GenericName>
+    <Icon>units/mace_cavalry_spearman.png</Icon>
     <Lang>greek</Lang>
+    <RequiredTechnology>phase_village</RequiredTechnology>
     <SelectionGroupName>units/mace_cavalry_spearman_b</SelectionGroupName>
-    <GenericName>Thessalian Lancer</GenericName>
     <SpecificName>Xystophóros Thessalikós</SpecificName>
-    <Icon>units/mace_cavalry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/mace_cavalry_spearman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
@@ -7,7 +7,6 @@
     <SpecificName>Hypaspistḗs</SpecificName>
     <Icon>units/macedonian_hypaspist.png</Icon>
     <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace_champion_infantry_e</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml
@@ -6,7 +6,6 @@
     <GenericName>Indian Raiding Cavalry</GenericName>
     <SpecificName>Aśvārohagaṇaḥ</SpecificName>
     <Icon>units/maur_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/maur_cavalry_swordsman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
@@ -5,7 +5,6 @@
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Gajendra</SpecificName>
     <Icon>units/maur_champion_elephant.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/mauryans/elephant_siege.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -29,11 +29,12 @@
   </Health>
   <Identity>
     <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">Elephant -Cavalry</VisibleClasses>
-    <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <GenericName>Elephant Archer</GenericName>
-    <SpecificName>Vachii Gaja</SpecificName>
     <Icon>units/maur_cavalry_archer.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
+    <SpecificName>Vachii Gaja</SpecificName>
+    <VisibleClasses datatype="tokens">Elephant -Cavalry</VisibleClasses>
   </Identity>
   <Loot>
     <xp>260</xp>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
@@ -12,7 +12,6 @@
     <SpecificName>Babiruviya Ratha</SpecificName>
     <Icon>units/pers_cavalry_archer.png</Icon>
     <Tooltip>Causes trample damage to enemy units.</Tooltip>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_archer_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml
@@ -6,7 +6,6 @@
     <GenericName>Cappadocian Cavalry</GenericName>
     <SpecificName>Katpaduka Asabara</SpecificName>
     <Icon>units/pers_cavalry_spearman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_spearman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
@@ -6,7 +6,6 @@
     <GenericName>Hyrcanian Cavalry</GenericName>
     <SpecificName>Varkaniya Asabara</SpecificName>
     <Icon>units/pers_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_swordsman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
@@ -13,7 +13,6 @@
     <SpecificName>Hippeús Makedonikós</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/ptol_cavalry_spearman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_cavalry_spearman_merc_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml
@@ -2,11 +2,12 @@
 <Entity parent="template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>rome</Civ>
+    <GenericName>Roman Cavalry</GenericName>
+    <Icon>units/rome_cavalry_spearman.png</Icon>
     <Lang>latin</Lang>
+    <RequiredTechnology>phase_village</RequiredTechnology>
     <SelectionGroupName>units/rome_cavalry_spearman_b</SelectionGroupName>
-    <GenericName>Roman Cavalry</GenericName>
     <SpecificName>Eques Romanus</SpecificName>
-    <Icon>units/rome_cavalry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/rome_cavalry_spearman_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
@@ -7,7 +7,6 @@
     <GenericName>Dahae Horse Archer</GenericName>
     <SpecificName>Hippotoxotès Dahae</SpecificName>
     <Icon>units/sele_cavalry_archer.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/sele_cavalry_archer_a</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
@@ -13,7 +13,6 @@
     <GenericName>Companion Cavalry</GenericName>
     <SpecificName>Hippos Hetairike</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>units/mace_cavalry_spearman.png</Icon>
   </Identity>
   <Promotion>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
@@ -6,7 +6,6 @@
     <GenericName>Armored War Elephant</GenericName>
     <SpecificName>Thorakisménos Eléphantos</SpecificName>
     <Icon>units/maur_champion_elephant.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/champion_elephant.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml
@@ -7,7 +7,6 @@
     <GenericName>Greek Allied Cavalry</GenericName>
     <SpecificName>Hippeús Symmakhikós</SpecificName>
     <Icon>units/spart_cavalry_spearman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/spart_cavalry_spearman_a</Entity>