Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/obelisk.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/obelisk.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/obelisk.xml
@@ -18,7 +18,6 @@
   <Identity>
     <GenericName>Obelisk</GenericName>
     <SpecificName>Egyptian Obelisk</SpecificName>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <Icon>gaia/special_obelisk.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
@@ -20,6 +20,7 @@
   </Health>
   <Identity>
     <Civ>athen</Civ>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Gymnasium</GenericName>
     <SpecificName>Gymnásion</SpecificName>
     <Tooltip>Train champion units.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
@@ -21,6 +21,7 @@
   </Health>
   <Identity>
     <Civ>athen</Civ>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Council Chamber</GenericName>
     <SpecificName>Prytaneîon</SpecificName>
     <Tooltip>Train heroes. Research special technologies.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
@@ -41,6 +41,7 @@
   </Health>
   <Identity>
     <Civ>cart</Civ>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Naval Shipyard</GenericName>
     <SpecificName>Cothon</SpecificName>
     <VisibleClasses datatype="tokens">-City Shipyard Town</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
@@ -33,7 +33,7 @@
     <Civ>iber</Civ>
     <GenericName>Revered Monument</GenericName>
     <SpecificName>Gur Oroigarri</SpecificName>
-    <Classes datatype="tokens">Monument -ConquestCritical</Classes>
+    <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>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml
@@ -26,7 +26,7 @@
     <GenericName>Kushite Pyramid</GenericName>
     <SpecificName>mr ‘3</SpecificName>
     <VisibleClasses datatype="tokens">Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid -ConquestCritical</Classes>
+    <Classes datatype="tokens">Pyramid</Classes>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/kush_pyramid_big.png</Icon>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml
@@ -29,7 +29,7 @@
     <GenericName>Large Pyramid</GenericName>
     <SpecificName>mr ‘3</SpecificName>
     <VisibleClasses datatype="tokens">Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid -ConquestCritical PyramidLarge</Classes>
+    <Classes datatype="tokens">Pyramid PyramidLarge</Classes>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/kush_pyramid_big.png</Icon>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml
@@ -27,7 +27,7 @@
     <GenericName>Small Pyramid</GenericName>
     <SpecificName>mr</SpecificName>
     <VisibleClasses datatype="tokens">-City Town Pyramid</VisibleClasses>
-    <Classes datatype="tokens">Pyramid -ConquestCritical PyramidSmall</Classes>
+    <Classes datatype="tokens">Pyramid PyramidSmall</Classes>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>structures/kush_pyramid_small.png</Icon>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
@@ -9,6 +9,7 @@
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <SpecificName>Harmya</SpecificName>
     <Icon>gaia/special_stoa.png</Icon>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
@@ -33,7 +33,7 @@
     <Civ>maur</Civ>
     <GenericName>Edict Pillar of Ashoka</GenericName>
     <SpecificName>Śāsana Stambha Aśokā</SpecificName>
-    <Classes datatype="tokens">Pillar -ConquestCritical</Classes>
+    <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>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -28,7 +28,7 @@
     <Civ>pers</Civ>
     <GenericName>Persian Palace</GenericName>
     <SpecificName>Apadana</SpecificName>
-    <Classes datatype="tokens">Palace Apadana</Classes>
+    <Classes datatype="tokens">Apadana ConquestCritical Palace</Classes>
     <Icon>structures/palace.png</Icon>
     <Tooltip>"Satrapy Tribute": Gain a trickle of food, wood, stone, and metal resources. Train Persian heroes and their "Immortals" bodyguards.</Tooltip>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -25,6 +25,7 @@
   </Health>
   <Identity>
     <Civ>pers</Civ>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Persian Hall</GenericName>
     <SpecificName>Duvarthi Visadahyu</SpecificName>
     <Icon>structures/pers_hall.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
@@ -30,6 +30,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>
     <Icon>structures/pers_gate.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
@@ -25,7 +25,7 @@
     <Civ>pers</Civ>
     <GenericName>Persian Palace</GenericName>
     <SpecificName>Taçara</SpecificName>
-    <Classes datatype="tokens">Palace</Classes>
+    <Classes datatype="tokens">ConquestCritical Palace</Classes>
     <Icon>structures/palace.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
@@ -16,7 +16,7 @@
     <Civ>ptol</Civ>
     <GenericName>Lighthouse</GenericName>
     <SpecificName>Pháros</SpecificName>
-    <Classes datatype="tokens">-ConquestCritical Lighthouse</Classes>
+    <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>
     <Icon>structures/lighthouse.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_arch.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_arch.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_arch.xml
@@ -21,6 +21,7 @@
     <Civ>rome</Civ>
     <SpecificName>Triumphal Arch</SpecificName>
     <Tooltip>Special Imperial Roman building.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <Icon>structures/arch.png</Icon>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -74,7 +74,7 @@
     <Civ>rome</Civ>
     <GenericName>Entrenched Army Camp</GenericName>
     <SpecificName>Castrum Vallum</SpecificName>
-    <Classes datatype="tokens">ArmyCamp</Classes>
+    <Classes datatype="tokens">ArmyCamp ConquestCritical</Classes>
     <Icon>structures/roman_camp.png</Icon>
     <Tooltip>Build in neutral or enemy territory. Construct siege weapons and train citizen-soldiers. Heal garrisoned units slowly.</Tooltip>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
@@ -18,6 +18,7 @@
   </Health>
   <Identity>
     <Civ>spart</Civ>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Spartan Senate</GenericName>
     <SpecificName>Gerontía</SpecificName>
     <Tooltip>Train heroes.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
@@ -21,6 +21,7 @@
   </Health>
   <Identity>
     <Civ>spart</Civ>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssítion</SpecificName>
     <Classes datatype="tokens">Syssiton</Classes>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -59,7 +59,7 @@
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Structure</GenericName>
-    <Classes datatype="tokens">Structure ConquestCritical</Classes>
+    <Classes datatype="tokens">Structure</Classes>
     <Undeletable>false</Undeletable>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic.xml
@@ -11,6 +11,7 @@
     </Foundation>
   </Armour>
   <Identity>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Civic Structure</GenericName>
     <VisibleClasses datatype="tokens">Civic</VisibleClasses>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -43,7 +43,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Tower -ConquestCritical</Classes>
+    <Classes datatype="tokens">Tower</Classes>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
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
@@ -22,7 +22,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical Defensive StoneWall</Classes>
+    <Classes datatype="tokens">Defensive StoneWall</Classes>
     <GenericName>Stone Wall</GenericName>
     <Tooltip>Wall off your town for a stout defense.</Tooltip>
     <Icon>structures/wall.png</Icon>
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
@@ -58,7 +58,7 @@
   <Identity>
     <GenericName>Wall Turret</GenericName>
     <Tooltip>Shoots arrows. Garrison to defend a city wall against attackers.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical StoneWall Tower</Classes>
+    <Classes datatype="tokens">StoneWall Tower</Classes>
     <Icon>structures/tower.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic.xml
@@ -11,7 +11,6 @@
     </Foundation>
   </Armour>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <GenericName>Economic Structure</GenericName>
     <VisibleClasses datatype="tokens">Economic</VisibleClasses>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml
@@ -20,6 +20,7 @@
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Identity>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Military Structure</GenericName>
     <VisibleClasses datatype="tokens">Military</VisibleClasses>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource.xml
@@ -15,7 +15,6 @@
   </BuildRestrictions>
   <Identity>
     <GenericName>Resource Structure</GenericName>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Resource</VisibleClasses>
   </Identity>
   <Vision>
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
@@ -15,7 +15,6 @@
   </Health>
   <Identity>
     <GenericName>Library</GenericName>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <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
@@ -19,7 +19,6 @@
   </Footprint>
   <GarrisonHolder disable=""/>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <GenericName>Rotary Mill</GenericName>
     <Icon>structures/rotarymill.png</Icon>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
@@ -24,7 +24,7 @@
   <Identity>
     <GenericName>Greek Theater</GenericName>
     <SpecificName>Théātron</SpecificName>
-    <Classes datatype="tokens">Theater -ConquestCritical</Classes>
+    <Classes datatype="tokens">Theater</Classes>
     <Icon>structures/theatron.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
@@ -47,6 +47,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Wonder</GenericName>
     <Tooltip>Bring glory to your civilization and add large tracts of land to your empire.</Tooltip>
     <VisibleClasses datatype="tokens">City Wonder</VisibleClasses>