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
@@ -11,7 +11,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_slinger_b
-      units/{civ}_cavalry_javelinist_b
     </Entities>
   </ProductionQueue>
   <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
@@ -18,7 +18,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_slinger_b
-      units/{civ}_cavalry_javelinist_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
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,7 +27,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_slinger_b
-      units/{civ}_cavalry_javelinist_b
       units/{civ}_ship_fishing
       units/{civ}_ship_merchant
       units/{civ}_ship_bireme
Index: binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
@@ -33,13 +33,13 @@
   </Health>
   <Identity>
     <Civ>brit</Civ>
-    <GenericName>Special Building</GenericName>
-    <SpecificName>Kennel</SpecificName>
     <Classes datatype="tokens">Kennel</Classes>
-    <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
-    <Tooltip>Train Celtic war dogs.</Tooltip>
+    <GenericName>Special Building</GenericName>
     <Icon>structures/kennel.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
+    <Tooltip>Train Celtic war dogs.</Tooltip>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+    <SpecificName>Kennel</SpecificName>
+    <VisibleClasses datatype="tokens">-City Village</VisibleClasses>
   </Identity>
   <Loot>
     <stone>10</stone>
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
@@ -11,7 +11,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_archer_b
-      units/{civ}_cavalry_javelinist_b
     </Entities>
     <Technologies datatype="tokens">
       carthaginians/special_colonisation
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
@@ -15,7 +15,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_javelinist_b
     </Entities>
   </ProductionQueue>
   <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
@@ -11,7 +11,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_swordsman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_javelinist_b
     </Entities>
   </ProductionQueue>
   <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
@@ -11,7 +11,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_pikeman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_spearman_b
     </Entities>
   </ProductionQueue>
   <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
@@ -18,8 +18,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_archer_b
-      units/{civ}_cavalry_javelinist_b
-      units/{civ}_support_elephant
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
@@ -22,11 +22,11 @@
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Elephant Stables</GenericName>
-    <SpecificName>Vāraṇaśālā</SpecificName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>structures/elephant_stables.png</Icon>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+    <SpecificName>Vāraṇaśālā</SpecificName>
     <Tooltip>Train elephant units.</Tooltip>
-    <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
+    <VisibleClasses datatype="tokens">-City Village</VisibleClasses>
   </Identity>
   <Loot>
     <wood>0</wood>
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
@@ -12,7 +12,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_archer_b
-      units/{civ}_cavalry_javelinist_b
     </Entities>
     <Technologies datatype="tokens">
       persians/persian_architecture
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
@@ -15,7 +15,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_pikeman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_archer_b
       units/{civ}_hero_ptolemy_I
       units/{civ}_hero_ptolemy_IV
       units/{civ}_hero_cleopatra
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
@@ -18,7 +18,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_swordsman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_spearman_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
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
@@ -8,7 +8,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_javelinist_b
       units/{civ}_hero_seleucus_victor
       units/{civ}_hero_antiochus_great
       units/{civ}_hero_antiochus_righteous
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
@@ -11,7 +11,6 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_javelinist_b
     </Entities>
   </ProductionQueue>
   <VisualActor>