Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -24,6 +24,9 @@
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
+      structures/{civ}_civil_centre
+      structures/{civ}_crannog
+      structures/{civ}_military_colony
       structures/{civ}_house
       structures/{civ}_storehouse
       structures/{civ}_farmstead
@@ -39,7 +42,6 @@
       structures/{civ}_market
       structures/{civ}_defense_tower
       structures/{civ}_wallset_stone
-      structures/{civ}_civil_centre
       structures/{civ}_workshop
       structures/{civ}_fortress
       structures/{civ}_wonder
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -26,6 +26,9 @@
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
+      structures/{civ}_civil_centre
+      structures/{civ}_crannog
+      structures/{civ}_military_colony
       structures/{civ}_house
       structures/{civ}_storehouse
       structures/{civ}_farmstead
@@ -34,7 +37,6 @@
       structures/{civ}_dock
       structures/{civ}_temple
       structures/{civ}_market
-      structures/{civ}_civil_centre
       structures/{civ}_wonder
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/brit_crannog
       structures/brit_kennel
       structures/brit_rotarymill
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/brit_crannog
       structures/brit_kennel
       structures/brit_rotarymill
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/brit_crannog
       structures/brit_kennel
       structures/brit_rotarymill
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/brit_crannog
       structures/brit_rotarymill
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/ptol_tower_artillery
-      structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/ptol_tower_artillery
-      structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/ptol_tower_artillery
-      structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/ptol_tower_artillery
-      structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/ptol_tower_artillery
-      structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/ptol_tower_artillery
-      structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/sele_tower_artillery
-      structures/sele_military_colony
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/sele_tower_artillery
-      structures/sele_military_colony
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/sele_tower_artillery
-      structures/sele_military_colony
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/sele_tower_artillery
-      structures/sele_military_colony
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
@@ -3,7 +3,6 @@
   <Builder>
     <Entities datatype="tokens">
       structures/sele_tower_artillery
-      structures/sele_military_colony
       structures/sele_library
     </Entities>
   </Builder>