Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -57,7 +57,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, CivStructure, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/templates/structures/athen_gymnasium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_gymnasium.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_gymnasium.xml
@@ -19,10 +19,10 @@
   </Health>
   <Identity>
     <Civ>athen</Civ>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Gymnasium</GenericName>
     <SpecificName>Gymnasion</SpecificName>
     <Tooltip>Train Champions.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical CivStructure</Classes>
     <Icon>structures/gymnasium.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
@@ -19,10 +19,10 @@
   </Health>
   <Identity>
     <Civ>athen</Civ>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Council Chamber</GenericName>
     <SpecificName>Prytaneion</SpecificName>
     <Tooltip>Train Heroes and research technologies.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical CivStructure</Classes>
     <Icon>structures/tholos.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Stoa</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>special/greek_stoa_great.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/athen_theater.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_theater.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_theater.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Theatron</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/theater.xml</Actor>
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
@@ -9,12 +9,12 @@
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Island Settlement</GenericName>
     <Civ>brit</Civ>
-    <Classes datatype="tokens">Naval</Classes>
-    <Icon>structures/crannog.png</Icon>
-    <Tooltip>Increase population limit and defend waterways.</Tooltip>
+    <GenericName>Island Settlement</GenericName>
     <SpecificName>Cranogion</SpecificName>
+    <Tooltip>Increase population limit and defend waterways.</Tooltip>
+    <Classes datatype="tokens">Naval CivStructure</Classes>
+    <Icon>structures/crannog.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
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
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunattegia</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/britons/kennel.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Melonas</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/britons/special.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
@@ -16,6 +16,7 @@
     <Civ>cart</Civ>
     <SpecificName>Celtic Embassy</SpecificName>
     <Tooltip>Hire Celtic mercenaries. Research improvements for these mercenaries.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
     <Icon>structures/celtic_embassy.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
@@ -8,7 +8,8 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Iberian Embassy</SpecificName>
-      <Tooltip>Hire Iberian mercenaries. Research improvements for these mercenaries.</Tooltip>
+    <Tooltip>Hire Iberian mercenaries. Research improvements for these mercenaries.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
     <Icon>structures/iberian_embassy.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
@@ -16,6 +16,7 @@
     <Civ>cart</Civ>
     <SpecificName>Italian Embassy</SpecificName>
     <Tooltip>Hire Italian mercenaries. Research improvements for these mercenaries.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
     <Icon>structures/italian_embassy.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
@@ -40,11 +40,11 @@
   </Health>
   <Identity>
     <Civ>cart</Civ>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Naval Shipyard</GenericName>
     <SpecificName>Cothon</SpecificName>
-    <VisibleClasses datatype="tokens">-City Shipyard Town</VisibleClasses>
     <Tooltip>Construct and repair mighty warships.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical CivStructure</Classes>
+    <VisibleClasses datatype="tokens">-City Shipyard Town</VisibleClasses>
     <Icon>structures/uber_dock.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brauon</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/special.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
@@ -21,9 +21,10 @@
     <GenericName>Tavern</GenericName>
     <SpecificName>Taberna</SpecificName>
     <Tooltip>Recruit Naked Fanatics.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
+    <VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
     <Icon>structures/celtic_embassy.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
   </Identity>
   <Loot>
     <wood>20</wood>
Index: binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
@@ -31,9 +31,9 @@
     <Civ>iber</Civ>
     <GenericName>Revered Monument</GenericName>
     <SpecificName>Gur Oroigarri</SpecificName>
-    <Classes datatype="tokens">Monument</Classes>
-    <Icon>structures/iberian_bull.png</Icon>
     <Tooltip>All units within vision of this monument will fight harder. Buildings in the territory of the monument do not decay.</Tooltip>
+    <Classes datatype="tokens">CivStructure Monument</Classes>
+    <Icon>structures/iberian_bull.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
Index: binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
@@ -19,6 +19,7 @@
     <GenericName>Blemmye Camp</GenericName>
     <SpecificName>Blemmye Camp</SpecificName>
     <Tooltip>Train Blemmye Desert Raiders.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
@@ -19,6 +19,7 @@
     <GenericName>Nuba Village</GenericName>
     <SpecificName>Nuba Village</SpecificName>
     <Tooltip>Train the Nuba Clubman and Nuba Hunter.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml
@@ -24,9 +24,8 @@
     <GenericName>Kushite Pyramid</GenericName>
     <SpecificName>mr ʿȝ</SpecificName>
     <VisibleClasses datatype="tokens">Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid</Classes>
-    <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/kush_pyramid_big.png</Icon>
+    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <stone>60</stone>
Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml
@@ -26,10 +26,10 @@
     <Civ>kush</Civ>
     <GenericName>Large Pyramid</GenericName>
     <SpecificName>mr ʿȝ</SpecificName>
+    <Classes datatype="tokens">PyramidLarge CivStructure</Classes>
     <VisibleClasses datatype="tokens">Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid PyramidLarge</Classes>
-    <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/kush_pyramid_big.png</Icon>
+    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <stone>80</stone>
Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml
@@ -24,10 +24,10 @@
     <Civ>kush</Civ>
     <GenericName>Small Pyramid</GenericName>
     <SpecificName>mr</SpecificName>
+    <Classes datatype="tokens">PyramidSmall CivStructure</Classes>
     <VisibleClasses datatype="tokens">-City Town Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid PyramidSmall</Classes>
-    <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>structures/kush_pyramid_small.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <food>60</food>
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
@@ -28,9 +28,9 @@
     <GenericName>Grand Temple of Amun</GenericName>
     <SpecificName>Pr-ʿImn</SpecificName>
     <Tooltip>Train priests to heal your troops. Train Napatan Temple Guards and research unique technologies. Garrison units to heal them at a quick rate.</Tooltip>
-    <Icon>structures/temple_epic.png</Icon>
-    <Classes datatype="tokens">TempleOfAmun</Classes>
+    <Classes datatype="tokens">TempleOfAmun CivStructure</Classes>
     <VisibleClasses datatype="tokens">City -Town</VisibleClasses>
+    <Icon>structures/temple_epic.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/mace_library.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_library.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_library.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Bibliothēkē</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/library.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_theater.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_theater.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_theater.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Theatron</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/theater.xml</Actor>
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
@@ -3,8 +3,9 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Vāraṇaśālā</SpecificName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
+    <Classes datatype="tokens">CivStructure</Classes>
     <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>structures/mauryas/stable_elephant.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
@@ -31,9 +31,9 @@
     <Civ>maur</Civ>
     <GenericName>Edict Pillar of Ashoka</GenericName>
     <SpecificName>Śāsana Stambha Aśokā</SpecificName>
-    <Classes datatype="tokens">Pillar</Classes>
-    <Icon>structures/ashoka_pillar.png</Icon>
     <Tooltip>The famous pillar of Ashoka. Increases the walk speed of traders. Buildings in the territory of the monument do not decay.</Tooltip>
+    <Classes datatype="tokens">Pillar CivStructure</Classes>
+    <Icon>structures/ashoka_pillar.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
Index: binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -26,7 +26,7 @@
     <Civ>pers</Civ>
     <GenericName>Throne Hall</GenericName>
     <SpecificName>Apadāna</SpecificName>
-    <Classes datatype="tokens">Apadana ConquestCritical Palace</Classes>
+    <Classes datatype="tokens">Apadana ConquestCritical Palace CivStructure</Classes>
     <Icon>structures/palace.png</Icon>
     <Tooltip>"Satrapy Tribute": Gain a trickle of food, wood, stone, and metal resources. Train Champions and Heroes.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -23,9 +23,9 @@
   </Health>
   <Identity>
     <Civ>pers</Civ>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Gate of All Nations</GenericName>
     <SpecificName>Duvarθi Visadahyu</SpecificName>
+    <Classes datatype="tokens">ConquestCritical CivStructure</Classes>
     <Icon>structures/pers_hall.png</Icon>
     <Tooltip>Train Champions.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
@@ -29,7 +29,7 @@
     <GenericName>Persian Special Building</GenericName>
     <SpecificName>Ishtar Gate of Babylon</SpecificName>
     <Tooltip>Increases the loyalty regeneration of nearby structures, making them harder to capture.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
+    <Classes datatype="tokens">ConquestCritical CivStructure</Classes>
     <Icon>structures/pers_gate.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
@@ -13,6 +13,7 @@
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Paraspa</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <Loot>
     <wood>0</wood>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_library.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_library.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_library.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Bibliothēkē</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/library.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
@@ -23,9 +23,9 @@
     <Civ>ptol</Civ>
     <GenericName>Lighthouse</GenericName>
     <SpecificName>Pharos</SpecificName>
-    <Classes datatype="tokens">Lighthouse</Classes>
-    <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
     <Tooltip>Build along the shore to reveal the shorelines over the entire map. Very large vision range: 180 meters.</Tooltip>
+    <Classes datatype="tokens">Lighthouse CivStructure</Classes>
+    <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
     <Icon>structures/lighthouse.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
@@ -8,6 +8,7 @@
     <Civ>ptol</Civ>
     <SpecificName>Klērouchia</SpecificName>
     <Tooltip>This is the Ptolemaic expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <Obstruction>
     <Static width="32" depth="31"/>
Index: binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -79,9 +79,9 @@
     <Civ>rome</Civ>
     <GenericName>Army Camp</GenericName>
     <SpecificName>Castra</SpecificName>
-    <Classes datatype="tokens">ArmyCamp ConquestCritical</Classes>
-    <Icon>structures/roman_camp.png</Icon>
     <Tooltip>Build in neutral or enemy territory. Train Citizen-Soldiers and construct Siege Engines. Garrison Soldiers for additional arrows.</Tooltip>
+    <Classes datatype="tokens">ArmyCamp ConquestCritical CivStructure</Classes>
+    <Icon>structures/roman_camp.png</Icon>
   </Identity>
   <Loot>
     <xp>100</xp>
Index: binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
@@ -15,8 +15,9 @@
   </Health>
   <Identity>
     <GenericName>Temple of Vesta</GenericName>
-    <Icon>structures/temple_vesta.png</Icon>
     <SpecificName>Aedēs Vestālis</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
+    <Icon>structures/temple_vesta.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="19.0" depth="19.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml
@@ -4,8 +4,9 @@
     <Civ>rome</Civ>
     <GenericName>Siege Wall</GenericName>
     <SpecificName>Mūrus Circummūnītiōnis</SpecificName>
-    <Icon>structures/siege_wall.png</Icon>
     <Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
+    <Icon>structures/siege_wall.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <WallSet>
Index: binaries/data/mods/public/simulation/templates/structures/sele_library.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_library.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_library.xml
@@ -7,6 +7,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Bibliothēkē</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
@@ -8,6 +8,7 @@
     <Civ>sele</Civ>
     <SpecificName>Klērouchia</SpecificName>
     <Tooltip>This is the Seleucid expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <Obstruction>
     <Static width="29" depth="29"/>
Index: binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
@@ -10,6 +10,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Stoa</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <Obstruction>
     <Static width="26.0" depth="23.5"/>
Index: binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
@@ -20,10 +20,10 @@
   </Health>
   <Identity>
     <Civ>spart</Civ>
-    <Classes datatype="tokens">ConquestCritical Syssiton</Classes>
     <GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssition</SpecificName>
     <Tooltip>Train Champions and Heroes.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical Syssiton CivStructure</Classes>
     <Icon>structures/syssition.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/spart_theater.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_theater.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_theater.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Theatron</SpecificName>
+    <Classes datatype="tokens">CivStructure</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/theater.xml</Actor>