Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>athen</Civ>
-    <SelectionGroupName>structures/athen_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>athen</Civ>
-    <SelectionGroupName>structures/athen_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>athen</Civ>
-    <SelectionGroupName>structures/athen_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>brit</Civ>
-    <SelectionGroupName>structures/brit_wallset_stone</SelectionGroupName>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
@@ -19,7 +19,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>brit</Civ>
-    <SelectionGroupName>structures/brit_wallset_stone</SelectionGroupName>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
-    <SelectionGroupName>structures/brit_wallset_stone</SelectionGroupName>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>structures/cart_wallset_stone</SelectionGroupName>
     <SpecificName>Homah</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
@@ -19,7 +19,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>structures/cart_wallset_stone</SelectionGroupName>
     <SpecificName>Homah</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
-    <SelectionGroupName>structures/cart_wallset_stone</SelectionGroupName>
     <SpecificName>Homah</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>gaul</Civ>
-    <SelectionGroupName>structures/gaul_wallset_stone</SelectionGroupName>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
@@ -19,7 +19,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>gaul</Civ>
-    <SelectionGroupName>structures/gaul_wallset_stone</SelectionGroupName>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>gaul</Civ>
-    <SelectionGroupName>structures/gaul_wallset_stone</SelectionGroupName>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>iber</Civ>
-    <SelectionGroupName>structures/iber_wallset_stone</SelectionGroupName>
     <SpecificName>Zabal Horma</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
@@ -19,7 +19,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>iber</Civ>
-    <SelectionGroupName>structures/iber_wallset_stone</SelectionGroupName>
     <SpecificName>Zabal Horma</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>iber</Civ>
-    <SelectionGroupName>structures/iber_wallset_stone</SelectionGroupName>
     <SpecificName>Zabal Horma</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
@@ -35,7 +35,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>kush</Civ>
-    <SelectionGroupName>structures/kush_wallset_stone</SelectionGroupName>
     <SpecificName>sbty</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>kush</Civ>
-    <SelectionGroupName>structures/kush_wallset_stone</SelectionGroupName>
     <SpecificName>sbty</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
-    <SelectionGroupName>structures/kush_wallset_stone</SelectionGroupName>
     <SpecificName>sbty</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
@@ -10,6 +10,7 @@
   </Loot>
   <Identity>
     <GenericName>Rampart Tower</GenericName>
+    <SelectionGroupName>structures/maur_tower_double</SelectionGroupName>
     <Tooltip>Higher health tower with ramparts for up to 16 archers. Visibly garrisoned archers recieve a range and armor bonus. Only archers can garrison. Needs the murder holes tech to protect its foot.</Tooltip>
     <Civ>maur</Civ>
     <SpecificName>Udarka</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
@@ -31,7 +31,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>maur</Civ>
-    <SelectionGroupName>structures/maur_wallset_stone</SelectionGroupName>
     <SpecificName>Shilabanda</SpecificName>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>maur</Civ>
-    <SelectionGroupName>structures/maur_wallset_stone</SelectionGroupName>
     <SpecificName>Shilabanda</SpecificName>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
@@ -12,7 +12,6 @@
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <SelectionGroupName>structures/maur_wallset_stone</SelectionGroupName>
     <SpecificName>Shilabanda</SpecificName>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml
@@ -19,6 +19,7 @@
   <Identity>
     <Classes datatype="tokens">Gates</Classes>
     <SpecificName>Palisade Gate</SpecificName>
+    <SelectionGroupName>structures/palisades_gate</SelectionGroupName>
     <Icon>structures/wooden_gate.png</Icon>
     <Tooltip>Allow units access through a palisade wall. Can be locked to prevent access.</Tooltip>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
@@ -14,7 +14,6 @@
     <Max op="mul">0.75</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml
@@ -14,7 +14,6 @@
     <Max op="mul">0.5</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_short.xml
@@ -14,7 +14,6 @@
     <Max op="mul">0.25</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml
@@ -14,7 +14,6 @@
     <Max op="mul">0.75</Max>
   </Health>
   <Identity>
-    <SelectionGroupName>structures/wallset_palisade</SelectionGroupName>
     <SpecificName>Palisade</SpecificName>
     <Classes datatype="tokens">Tower</Classes>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>pers</Civ>
-    <SelectionGroupName>structures/pers_wallset_stone</SelectionGroupName>
     <SpecificName>Para</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
@@ -19,7 +19,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>pers</Civ>
-    <SelectionGroupName>structures/pers_wallset_stone</SelectionGroupName>
     <SpecificName>Para</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <SelectionGroupName>structures/pers_wallset_stone</SelectionGroupName>
     <SpecificName>Para</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>structures/ptol_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
@@ -19,7 +19,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>structures/ptol_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>structures/ptol_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
@@ -25,7 +25,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>rome</Civ>
-    <SelectionGroupName>structures/rome_wallset_stone</SelectionGroupName>
     <SpecificName>Moenia</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
@@ -19,7 +19,6 @@
   </GarrisonHolder>
   <Identity>
     <Civ>rome</Civ>
-    <SelectionGroupName>structures/rome_wallset_stone</SelectionGroupName>
     <SpecificName>Moenia</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>rome</Civ>
-    <SelectionGroupName>structures/rome_wallset_stone</SelectionGroupName>
     <SpecificName>Moenia</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <SelectionGroupName>structures/sele_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <SelectionGroupName>structures/sele_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <SelectionGroupName>structures/sele_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>spart</Civ>
-    <SelectionGroupName>structures/spart_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>spart</Civ>
-    <SelectionGroupName>structures/spart_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <Civ>spart</Civ>
-    <SelectionGroupName>structures/spart_wallset_stone</SelectionGroupName>
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -88,6 +88,7 @@
     <Tooltip>Build to acquire large tracts of territory. Train citizens.</Tooltip>
     <Classes datatype="tokens">Defensive CivCentre</Classes>
     <VisibleClasses datatype="tokens">CivilCentre</VisibleClasses>
+    <SelectionGroupName>template_structure_civic_civil_centre</SelectionGroupName>
     <Icon>structures/civic_centre.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -26,6 +26,7 @@
   <Identity>
     <GenericName>Military Colony</GenericName>
     <Classes datatype="tokens">Colony</Classes>
+    <SelectionGroupName>template_structure_civic_civil_centre_military_colony</SelectionGroupName>
     <Icon>structures/military_settlement.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
@@ -34,6 +34,7 @@
     <GenericName>House</GenericName>
     <Tooltip>Increase the population limit.</Tooltip>
     <VisibleClasses datatype="tokens">Village House</VisibleClasses>
+    <SelectionGroupName>template_structure_civic_house</SelectionGroupName>
     <Icon>structures/house.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -29,6 +29,7 @@
   </Health>
   <Identity>
     <GenericName>Stoa</GenericName>
+    <SelectionGroupName>template_structure_civic_stoa</SelectionGroupName>
     <Tooltip>Recruit special units.</Tooltip>
     <Icon>gaia/special_stoa.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -31,6 +31,7 @@
   </Health>
   <Identity>
     <GenericName>Temple</GenericName>
+    <SelectionGroupName>template_structure_civic_temple</SelectionGroupName>
     <Tooltip>Train Healers and research healing technologies. Garrison units to heal them at a quick rate.</Tooltip>
     <VisibleClasses datatype="tokens">Town Temple</VisibleClasses>
     <Icon>structures/temple.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
@@ -19,6 +19,7 @@
   <Identity>
     <Classes datatype="tokens">Palisade</Classes>
     <GenericName>Wooden Wall</GenericName>
+    <SelectionGroupName>template_structure_defensive_palisade</SelectionGroupName>
     <Tooltip>Wall off your town for a stout defense.</Tooltip>
     <Icon>gaia/special_palisade.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -55,6 +55,7 @@
   </Health>
   <Identity>
     <GenericName>Artillery Tower</GenericName>
+    <SelectionGroupName>template_structure_defensive_tower_artillery</SelectionGroupName>
     <Tooltip>Catapults stones. Needs the murder holes tech to protect its foot.</Tooltip>
     <Classes datatype="tokens">GarrisonTower</Classes>
     <VisibleClasses datatype="tokens">City DefenseTower StoneTower</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -54,6 +54,7 @@
   </Health>
   <Identity>
     <GenericName>Bolt Tower</GenericName>
+    <SelectionGroupName>template_structure_defensive_tower_bolt</SelectionGroupName>
     <Tooltip>Shoots bolts. Faster reaction time against raiding units than the artillery tower, weak to all siege weapons and mass melee. Needs the murder holes tech to protect its foot.</Tooltip>
     <Classes datatype="tokens">GarrisonTower</Classes>
     <VisibleClasses datatype="tokens">City DefenseTower StoneTower</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
@@ -49,6 +49,7 @@
   </Health>
   <Identity>
     <GenericName>Outpost</GenericName>
+    <SelectionGroupName>template_structure_defensive_tower_outpost</SelectionGroupName>
     <Tooltip>Build in neutral and own territories to scout areas of the map. Slowly converts to Gaia while in neutral territory.</Tooltip>
     <VisibleClasses datatype="tokens">Village Outpost</VisibleClasses>
     <Icon>structures/outpost.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -33,6 +33,7 @@
   </Health>
   <Identity>
     <GenericName>Sentry Tower</GenericName>
+    <SelectionGroupName>template_structure_defensive_tower_sentry</SelectionGroupName>
     <Icon>structures/sentry_tower.png</Icon>
     <Classes datatype="tokens">GarrisonTower</Classes>
     <VisibleClasses datatype="tokens">Village DefenseTower SentryTower</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
@@ -29,6 +29,7 @@
   </Health>
   <Identity>
     <GenericName>Defense Tower</GenericName>
+    <SelectionGroupName>template_structure_defensive_tower_stone</SelectionGroupName>
     <Tooltip>Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot.</Tooltip>
     <Classes datatype="tokens">GarrisonTower</Classes>
     <VisibleClasses datatype="tokens">Town DefenseTower StoneTower</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
@@ -14,6 +14,7 @@
   <Identity>
     <Classes datatype="tokens">StoneWall</Classes>
     <GenericName>Stone Wall</GenericName>
+    <SelectionGroupName>template_structure_defensive_wall</SelectionGroupName>
     <Tooltip>Wall off your town for a stout defense.</Tooltip>
     <Icon>structures/wall.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
@@ -18,6 +18,7 @@
   <Identity>
     <Classes datatype="tokens">Gates</Classes>
     <GenericName>City Gate</GenericName>
+    <SelectionGroupName>template_structure_defensive_wall_gate</SelectionGroupName>
     <Icon>structures/gate.png</Icon>
     <Tooltip>Allow units access through a city wall. Can be locked to prevent access.</Tooltip>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -52,6 +52,7 @@
   </Health>
   <Identity>
     <GenericName>Wall Turret</GenericName>
+    <SelectionGroupName>template_structure_defensive_wall_tower</SelectionGroupName>
     <Tooltip>Shoots arrows. Garrison to defend a city wall against attackers.</Tooltip>
     <Classes datatype="tokens">Tower</Classes>
     <Icon>structures/tower.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
@@ -28,6 +28,7 @@
   <Identity>
     <Classes datatype="tokens">DropsiteFood</Classes>
     <GenericName>Farmstead</GenericName>
+    <SelectionGroupName>template_structure_economic_farmstead</SelectionGroupName>
     <Icon>structures/farmstead.png</Icon>
     <Tooltip>Dropsite for the food resource. Research food gathering improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Farmstead</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
@@ -26,6 +26,7 @@
   <Identity>
     <Classes datatype="tokens">BarterMarket</Classes>
     <GenericName>Market</GenericName>
+    <SelectionGroupName>template_structure_economic_market</SelectionGroupName>
     <Icon>structures/market.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Create trade units to trade between other markets. Barter resources. Research trading and bartering improvements.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
@@ -29,6 +29,7 @@
   <Identity>
     <Classes datatype="tokens">DropsiteWood DropsiteMetal DropsiteStone</Classes>
     <GenericName>Storehouse</GenericName>
+    <SelectionGroupName>template_structure_economic_storehouse</SelectionGroupName>
     <Icon>structures/storehouse.png</Icon>
     <Tooltip>Dropsite for wood, stone, and metal resources. Research gathering improvements for these resources.</Tooltip>
     <VisibleClasses datatype="tokens">Village Storehouse</VisibleClasses>
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
@@ -20,6 +20,7 @@
   </Health>
   <Identity>
     <GenericName>Barracks</GenericName>
+    <SelectionGroupName>template_structure_military_barracks</SelectionGroupName>
     <Tooltip>Train citizen-soldiers. Research training improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Barracks</VisibleClasses>
     <Icon>structures/barracks.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
@@ -21,6 +21,7 @@
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <GenericName>Blacksmith</GenericName>
+    <SelectionGroupName>template_structure_military_blacksmith</SelectionGroupName>
     <Icon>structures/blacksmith.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Research weapons and armor improvements.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
@@ -23,6 +23,7 @@
   </Health>
   <Identity>
     <GenericName>Dock</GenericName>
+    <SelectionGroupName>template_structure_military_dock</SelectionGroupName>
     <Tooltip>Build upon a shoreline to construct naval vessels and to open sea trade. Research naval improvements.</Tooltip>
     <Classes datatype="tokens">Naval NavalMarket</Classes>
     <VisibleClasses datatype="tokens">Economic Village Market Dock</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -22,6 +22,7 @@
   </Health>
   <Identity>
     <GenericName>Elephant Stables</GenericName>
+    <SelectionGroupName>template_structure_military_elephant_stables</SelectionGroupName>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/stable_elephant.png</Icon>
     <Tooltip>Train elephant units.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -30,6 +30,7 @@
   <Identity>
     <VisibleClasses datatype="tokens">Town Embassy</VisibleClasses>
     <GenericName>Embassy</GenericName>
+    <SelectionGroupName>template_structure_military_embassy</SelectionGroupName>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -69,9 +69,10 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <GenericName>Fortress</GenericName>
     <Classes datatype="tokens">Defensive Fortress GarrisonFortress</Classes>
     <VisibleClasses datatype="tokens">City</VisibleClasses>
+    <GenericName>Fortress</GenericName>
+    <SelectionGroupName>template_structure_military_fortress</SelectionGroupName>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Tooltip>Train Champions and Heroes and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
@@ -35,9 +35,10 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <GenericName>Kennel</GenericName>
     <Classes datatype="tokens">Kennel</Classes>
     <VisibleClasses datatype="tokens">Town</VisibleClasses>
+    <GenericName>Kennel</GenericName>
+    <SelectionGroupName>template_structure_military_kennel</SelectionGroupName>
     <Tooltip>Train war dogs.</Tooltip>
     <Icon>structures/kennel.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
@@ -20,6 +20,7 @@
   </Health>
   <Identity>
     <GenericName>Practice Range</GenericName>
+    <SelectionGroupName>template_structure_military_range</SelectionGroupName>
     <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Range</VisibleClasses>
     <Icon>structures/range.png</Icon>
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
@@ -20,6 +20,7 @@
   </Health>
   <Identity>
     <GenericName>Stable</GenericName>
+    <SelectionGroupName>template_structure_military_stable</SelectionGroupName>
     <Icon>structures/pers_stable.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
     <Tooltip>Train citizen-soldier cavalry. Research training improvements.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
@@ -23,6 +23,7 @@
   </Health>
   <Identity>
     <GenericName>Siege Workshop</GenericName>
+    <SelectionGroupName>template_structure_military_workshop</SelectionGroupName>
     <Icon>structures/siege_workshop.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Tooltip>Construct Siege Engines and research Siege Engine technologies.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -16,6 +16,7 @@
   </Health>
   <Identity>
     <GenericName>Corral</GenericName>
+    <SelectionGroupName>template_structure_resource_corral</SelectionGroupName>
     <Tooltip>Raise herd animals for food. Task domestic animals here to gain a trickle of food or other bonus (Not yet implemented).</Tooltip>
     <VisibleClasses datatype="tokens">Village Corral</VisibleClasses>
     <Icon>structures/corral.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
@@ -24,6 +24,7 @@
   </Health>
   <Identity>
     <GenericName>Field</GenericName>
+    <SelectionGroupName>template_structure_resource_field</SelectionGroupName>
     <VisibleClasses datatype="tokens">Field</VisibleClasses>
     <Tooltip>Harvest grain for food. Each subsequent gatherer works less efficiently.</Tooltip>
     <Icon>structures/field.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml
@@ -18,8 +18,9 @@
     <Max>2000</Max>
   </Health>
   <Identity>
-    <GenericName>Amphitheater</GenericName>
     <Classes datatype="tokens">Amphitheater</Classes>
+    <GenericName>Amphitheater</GenericName>
+    <SelectionGroupName>template_structure_special_amphitheater</SelectionGroupName>
     <Icon>structures/theater.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
@@ -22,6 +22,7 @@
   </Health>
   <Identity>
     <GenericName>Library</GenericName>
+    <SelectionGroupName>template_structure_special_library</SelectionGroupName>
     <Tooltip>Research special technologies.</Tooltip>
     <Icon>structures/library_scroll.png</Icon>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
@@ -18,6 +18,7 @@
   <GarrisonHolder disable=""/>
   <Identity>
     <GenericName>Rotary Mill</GenericName>
+    <SelectionGroupName>template_structure_special_rotarymill</SelectionGroupName>
     <Icon>structures/rotarymill.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml
@@ -23,6 +23,7 @@
   <Identity>
     <Classes datatype="tokens">Theater</Classes>
     <GenericName>Theater</GenericName>
+    <SelectionGroupName>template_structure_special_theater</SelectionGroupName>
     <Icon>structures/theater.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -49,6 +49,7 @@
   <Identity>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Wonder</GenericName>
+    <SelectionGroupName>template_structure_wonder</SelectionGroupName>
     <Tooltip>Bring glory to your civilization and add large tracts of land to your empire.</Tooltip>
     <VisibleClasses datatype="tokens">City Wonder</VisibleClasses>
     <Icon>structures/wonder.png</Icon>