Index: ps/trunk/binaries/data/mods/public/gui/reference/civinfo/Sections/Subsections/StructuresSubsection.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/reference/civinfo/Sections/Subsections/StructuresSubsection.js	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/gui/reference/civinfo/Sections/Subsections/StructuresSubsection.js	(revision 24535)
@@ -1,32 +1,32 @@
 class StructuresSubsection extends Subsection
 {
 	constructor(page)
 	{
 		super(page);
 		this.CivStructures = Engine.GetGUIObjectByName("civStructures");
 	}
 
 	update(civCode)
 	{
 		let structures = this.getEntityCaptions(
 			this.page.TemplateLister.getTemplateLists(civCode).structures.keys(),
 			this.IdentifyingClassList,
 			civCode
 		);
 
 		structures.unshift(
 			this.page.formatHeading(
 				this.HeadingCaption(structures.length),
 				this.page.SubsectionHeaderSize
 			)
 		);
 
 		this.CivStructures.caption = structures.join("\n");
 	}
 }
 
 StructuresSubsection.prototype.HeadingCaption =
-	count => translatePlural("Special Structure", "Special Structures", count);
+	count => translatePlural("Specific Structure", "Specific Structures", count);
 
 StructuresSubsection.prototype.IdentifyingClassList =
-	[["SpecialBuilding"], ["Wonder"]];
+	["CivSpecific Structure"];
Index: ps/trunk/binaries/data/mods/public/gui/reference/civinfo/Sections/Subsections/TechnologiesSubsection.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/reference/civinfo/Sections/Subsections/TechnologiesSubsection.js	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/gui/reference/civinfo/Sections/Subsections/TechnologiesSubsection.js	(revision 24535)
@@ -1,28 +1,28 @@
 class TechnologiesSubsection extends Subsection
 {
 	constructor(page)
 	{
 		super(page);
 		this.CivTechs = Engine.GetGUIObjectByName("civTechs");
 	}
 
 	update(civCode)
 	{
 		let techs = this.getTechnologyCaptions(
 			this.page.TemplateLister.getTemplateLists(civCode).techs.keys(),
 			civCode
 		);
 
 		techs.unshift(
 			this.page.formatHeading(
 				this.HeadingCaption(techs.length),
 				this.page.SubsectionHeaderSize
 			)
 		);
 
 		this.CivTechs.caption = techs.join("\n");
 	}
 }
 
 TechnologiesSubsection.prototype.HeadingCaption =
-	count => translatePlural("Special Technology", "Special Technologies", count);
+	count => translatePlural("Specific Technology", "Specific Technologies", count);
Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js	(revision 24535)
@@ -1,204 +1,204 @@
 function Identity() {}
 
 Identity.prototype.Schema =
 	"<a:help>Specifies various names and values associated with the entity, typically for GUI display to users.</a:help>" +
 	"<a:example>" +
 		"<Civ>athen</Civ>" +
 		"<GenericName>Athenian Hoplite</GenericName>" +
 		"<SpecificName>Hoplī́tēs Athēnaïkós</SpecificName>" +
 		"<Icon>units/athen_infantry_spearman.png</Icon>" +
 	"</a:example>" +
 	"<element name='Civ' a:help='Civilization that this unit is primarily associated with, typically a 4-letter code. Choices include: gaia (world objects), skirm (skirmish map placeholders), athen (Athenians), brit (Britons), cart (Carthaginians), gaul (Gauls), iber (Iberians), kush (Kushites), mace (Macedonians), maur (Mauryas), pers (Persians), ptol (Ptolemies), rome (Romans), sele (Seleucids), spart (Spartans).'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
 		"<element name='Lang' a:help='Unit language for voices.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Phenotype' a:help='Unit phenotype for voices and visual. If more than one is specified a random one will be chosen.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<element name='GenericName' a:help='Generic English-language name for this entity.'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
 		"<element name='SpecificName' a:help='Specific native-language name for this entity.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='SelectionGroupName' a:help='Name used to group ranked entities.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Tooltip'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='History'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Rank'>" +
 			"<choice>" +
 				"<value>Basic</value>" +
 				"<value>Advanced</value>" +
 				"<value>Elite</value>" +
 			"</choice>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, CitizenSoldier, CivCentre, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, GarrisonFortress, Human, Immortal, IndianElephant, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, CitizenSoldier, CivCentre, CivSpecific, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, GarrisonFortress, Human, Immortal, IndianElephant, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Formations' a:help='Optional list of space-separated formations this unit is allowed to use. Choices include: Scatter, Box, ColumnClosed, LineClosed, ColumnOpen, LineOpen, Flank, Skirmish, Wedge, Testudo, Phalanx, Syntagma, BattleLine.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Icon'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='RequiredTechnology' a:help='Optional name of a technology which must be researched before the entity can be produced.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Controllable' a:help='Whether players can control this entity. Defaults to true.'>" +
 			"<data type='boolean'/>" +
 		"</element>" +
 	"</optional>" +
 	"<element name='Undeletable' a:help='Prevent players from deleting this entity.'>" +
 		"<data type='boolean'/>" +
 	"</element>";
 
 Identity.prototype.Init = function()
 {
 	this.classesList = GetIdentityClasses(this.template);
 	this.visibleClassesList = GetVisibleIdentityClasses(this.template);
 	if (this.template.Phenotype)
 		this.phenotype = pickRandom(this.GetPossiblePhenotypes());
 	else
 		this.phenotype = "default";
 
 	this.controllable = this.template.Controllable ? this.template.Controllable == "true" : true;
 };
 
 Identity.prototype.HasSomeFormation = function()
 {
 	return this.GetFormationsList().length > 0;
 };
 
 Identity.prototype.GetCiv = function()
 {
 	return this.template.Civ;
 };
 
 Identity.prototype.GetLang = function()
 {
 	return this.template.Lang || "greek"; // ugly default
 };
 
 /**
  * Get a list of possible Phenotypes.
  * @return {string[]} A list of possible phenotypes.
  */
 Identity.prototype.GetPossiblePhenotypes = function()
 {
 	return this.template.Phenotype._string.split(/\s+/);
 };
 
 /**
  * Get the current Phenotype.
  * @return {string} The current phenotype.
  */
 Identity.prototype.GetPhenotype = function()
 {
 	return this.phenotype;
 };
 
 Identity.prototype.GetRank = function()
 {
 	return this.template.Rank || "";
 };
 
 Identity.prototype.GetClassesList = function()
 {
 	return this.classesList;
 };
 
 Identity.prototype.GetVisibleClassesList = function()
 {
 	return this.visibleClassesList;
 };
 
 Identity.prototype.HasClass = function(name)
 {
 	return this.GetClassesList().indexOf(name) != -1;
 };
 
 Identity.prototype.GetFormationsList = function()
 {
 	if (this.template.Formations && this.template.Formations._string)
 		return this.template.Formations._string.split(/\s+/);
 	return [];
 };
 
 Identity.prototype.CanUseFormation = function(template)
 {
 	return this.GetFormationsList().indexOf(template) != -1;
 };
 
 Identity.prototype.GetSelectionGroupName = function()
 {
 	return this.template.SelectionGroupName || "";
 };
 
 Identity.prototype.GetGenericName = function()
 {
 	return this.template.GenericName;
 };
 
 Identity.prototype.IsUndeletable = function()
 {
 	return this.template.Undeletable == "true";
 };
 
 Identity.prototype.IsControllable = function()
 {
 	return this.controllable;
 };
 
 Identity.prototype.SetControllable = function(controllability)
 {
 	this.controllable = controllability;
 };
 
 Engine.RegisterComponentType(IID_Identity, "Identity", Identity);
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml	(revision 24535)
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Gymnasium</GenericName>
     <SpecificName>Gymnasion</SpecificName>
     <Tooltip>Train Champions.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Gymnasium</VisibleClasses>
     <Icon>structures/gymnasium.png</Icon>
   </Identity>
   <Loot>
     <stone>40</stone>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
       units/{civ}/champion_ranged
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/athenians/gymnasium.xml</Actor>
     <FoundationActor>structures/fndn_8x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml	(revision 24535)
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Council</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>100</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="16.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Council Chamber</GenericName>
     <SpecificName>Prytaneion</SpecificName>
     <Tooltip>Train Heroes and research technologies.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Council</VisibleClasses>
     <Icon>structures/tholos.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="24.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/hero_themistocles
       units/{civ}/hero_pericles
       units/{civ}/hero_iphicrates
     </Entities>
     <Technologies datatype="tokens">
       hellenes/special_long_walls
       hellenes/special_iphicratean_reforms
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tholos.xml</select>
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/athenians/prytaneion.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/theater.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/theater.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/theater.xml	(revision 24535)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special_theater">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Theatron</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/theater.xml</Actor>
     <FoundationActor>structures/fndn_theater.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml	(revision 24535)
@@ -1,48 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
   </BuildRestrictions>
   <Footprint replace="">
     <Circle radius="17"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <GenericName>Island Settlement</GenericName>
     <SpecificName>Cranogion</SpecificName>
     <Tooltip>Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Train Citizens, construct Ships, and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Naval</VisibleClasses>
     <Icon>structures/crannog.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
     <Static width="29" depth="29"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/infantry_spearman_b
       units/{civ}/infantry_slinger_b
       units/{civ}/cavalry_javelineer_b
       units/{civ}/ship_fishing
       units/{civ}/ship_merchant
       units/{civ}/ship_bireme
       units/{civ}/ship_trireme
     </Entities>
     <Technologies datatype="tokens">
       -phase_town_{civ}
     </Technologies>
   </ProductionQueue>
   <RallyPointRenderer>
     <LinePassabilityClass>ship</LinePassabilityClass>
   </RallyPointRenderer>
   <VisualActor>
     <Actor>structures/britons/crannog.xml</Actor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_celtic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_celtic.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_celtic.xml	(revision 24535)
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="16.0" depth="13.0"/>
     <Height>11.0</Height>
   </Footprint>
   <Health>
     <Max>1200</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Celtic Embassy</SpecificName>
     <Tooltip>Train Celtic Mercenaries and research Mercenary technologies.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <Icon>structures/embassy_celtic.png</Icon>
   </Identity>
   <Loot>
     <wood>40</wood>
   </Loot>
   <Obstruction>
     <Static width="15.0" depth="12.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{native}/infantry_swordsman_gaul_b
       units/{native}/cavalry_swordsman_gaul_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_celtic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_iberian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_iberian.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_iberian.xml	(revision 24535)
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
     <Resources>
       <stone>200</stone>
     </Resources>
   </Cost>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Iberian Embassy</SpecificName>
     <Tooltip>Train Iberian Mercenaries and research Mercenary technologies.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <Icon>structures/embassy_iberian.png</Icon>
   </Identity>
   <Loot>
     <stone>40</stone>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{native}/infantry_javelineer_iber_b
       units/{native}/infantry_slinger_iber_b
       units/{native}/cavalry_swordsman_iber_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_iberian.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_italic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_italic.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/embassy_italic.xml	(revision 24535)
@@ -1,36 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
     <Resources>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="13" depth="15.5"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Italic Embassy</SpecificName>
     <Tooltip>Train Italic Mercenaries and research Mercenary technologies.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <Icon>structures/embassy_italic.png</Icon>
   </Identity>
   <Loot>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="11.0" depth="14.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{native}/infantry_swordsman_ital_b
       units/{native}/cavalry_spearman_ital_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_italic.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml	(revision 24535)
@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">
     structures/cart_super_dock_repair
   </Auras>
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
     <Category>Dock</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>2000</CapturePoints>
     <GarrisonRegenRate>10</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>300</wood>
       <stone>200</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="42.0" depth="58.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Ship</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>5000</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Naval Shipyard</GenericName>
     <SpecificName>Cothon</SpecificName>
     <Tooltip>Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Construct Warships and research technologies.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Naval -City Town Shipyard</VisibleClasses>
     <Icon>structures/uber_dock.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>60</wood>
     <stone>40</stone>
   </Loot>
   <Obstruction>
     <Static width="42.0" depth="58.0"/>
   </Obstruction>
   <Population>
     <Bonus>10</Bonus>
   </Population>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/ship_bireme
       units/{civ}/ship_trireme
       units/{civ}/ship_quinquereme
     </Entities>
     <Technologies datatype="tokens">
       carthaginians/training_phoenician_naval_architects
       carthaginians/special_exploration
     </Technologies>
   </ProductionQueue>
   <RallyPointRenderer>
     <LinePassabilityClass>ship</LinePassabilityClass>
   </RallyPointRenderer>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce>35</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_dock.xml</select>
       <constructed>interface/complete/building/complete_dock.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>200</Radius>
     <Weight>25000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>100</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/carthaginians/super_dock.xml</Actor>
     <FoundationActor>structures/fndn_dock_super.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml	(revision 24535)
@@ -1,57 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>100</wood>
       <stone>100</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="20.0" depth="20.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Tavern</GenericName>
     <SpecificName>Taberna</SpecificName>
     <Tooltip>Recruit Naked Fanatics.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
     <Icon>structures/embassy_celtic.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>20</wood>
     <stone>20</stone>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <Population>
     <Bonus>10</Bonus>
   </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_fanatic
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>32</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/celts/tavern.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/monument.xml	(revision 24535)
@@ -1,57 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">
     structures/iber_monument
   </Auras>
   <BuildRestrictions>
     <Category>Monument</Category>
     <Distance>
       <FromClass>Monument</FromClass>
       <MinDistance>145</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>120</BuildTime>
     <Resources>
       <stone>100</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="8.0" depth="8.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
   <Health>
     <Max>1200</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>iber</Civ>
     <GenericName>Revered Monument</GenericName>
     <SpecificName>Gur Oroigarri</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Monument</VisibleClasses>
     <Icon>structures/iberian_bull.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_iber_monument.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <VisualActor>
     <Actor>structures/iberians/sb_1.xml</Actor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/camp_blemmye.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/camp_blemmye.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/camp_blemmye.xml	(revision 24535)
@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <BuildRestrictions>
     <Territory>own neutral</Territory>
   </BuildRestrictions>
   <Cost>
     <Resources>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="29.0" depth="29.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Blemmye Camp</GenericName>
     <Tooltip>Train Blemmye Mercenaries.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
     <wood>20</wood>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{native}/cavalry_javelineer_merc_b
     </Entities>
   </ProductionQueue>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/mercenaries/camp_blemmye.xml</Actor>
     <FoundationActor>structures/fndn_8x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/camp_noba.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/camp_noba.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/camp_noba.xml	(revision 24535)
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <BuildRestrictions>
     <Territory>own neutral</Territory>
   </BuildRestrictions>
   <Cost>
     <Resources>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="35.0" depth="35.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Noba Village</GenericName>
     <Tooltip>Train Noba Mercenaries.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
     <wood>20</wood>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="35.0" depth="35.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{native}/infantry_maceman_merc_b
       units/{native}/infantry_javelineer_merc_b
     </Entities>
   </ProductionQueue>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/mercenaries/camp_nuba.xml</Actor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml	(revision 24535)
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Auras datatype="tokens">
     structures/kush_pyramids_military
   </Auras>
   <BuildRestrictions>
     <Category>PyramidLarge</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <stone>450</stone>
       <metal>150</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="22.0" depth="26.0"/>
     <Height>20.0</Height>
   </Footprint>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Large Pyramid</GenericName>
     <SpecificName>mr ʿȝ</SpecificName>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">City Pyramid</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/kush_pyramid_big.png</Icon>
   </Identity>
   <Loot>
     <stone>90</stone>
     <metal>30</metal>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="24.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple_10.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>15.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/kushites/pyramid_large.xml</Actor>
     <FoundationActor>structures/fndn_5x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_small.xml	(revision 24535)
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Auras datatype="tokens">
     structures/kush_pyramids_economic
   </Auras>
   <BuildRestrictions>
     <Category>PyramidSmall</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>300</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Small Pyramid</GenericName>
     <SpecificName>mr</SpecificName>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Town Pyramid</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>structures/kush_pyramid_small.png</Icon>
   </Identity>
   <Loot>
     <stone>60</stone>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple_10.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>30</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>30</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/kushites/pyramid_small.xml</Actor>
     <FoundationActor>structures/fndn_4x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml	(revision 24535)
@@ -1,57 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
   <Auras datatype="tokens">
     structures/kush_temple_amun
   </Auras>
   <BuildRestrictions>
     <Category>TempleOfAmun</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime op="mul">2</BuildTime>
     <Resources>
       <stone op="mul">2</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="32.0" depth="62.0"/>
   </Footprint>
   <GarrisonHolder>
     <Max op="mul">2</Max>
   </GarrisonHolder>
   <Health>
     <Max op="mul">2</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Grand Temple of Amun</GenericName>
     <SpecificName>Pr-ʿImn</SpecificName>
     <Tooltip>Train Healers and Amun Champions and research healing technologies.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">-Town City TempleOfAmun</VisibleClasses>
     <Icon>structures/temple_epic.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <stone op="mul">2</stone>
   </Loot>
   <Obstruction>
     <Static width="28" depth="56.0"/>
   </Obstruction>
   <Population>
     <Bonus>10</Bonus>
   </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       -units/{civ}/support_healer_b
       units/{civ}/support_healer_e
       units/{civ}/champion_infantry_amun
     </Entities>
   </ProductionQueue>
   <TerritoryInfluence>
     <Radius op="mul">2</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/kushites/temple_amun.xml</Actor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/library.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/library.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/library.xml	(revision 24535)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special_library">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Bibliothēkē</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/library.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/theater.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/theater.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/theater.xml	(revision 24535)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special_theater">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Theatron</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/theater.xml</Actor>
     <FoundationActor>structures/fndn_theater.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml	(revision 24535)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_elephant_stables">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Vāraṇaśālā</SpecificName>
     <RequiredTechnology>phase_town</RequiredTechnology>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>structures/mauryas/stable_elephant.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/pillar_ashoka.xml	(revision 24535)
@@ -1,57 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">
     structures/maur_pillar
   </Auras>
   <BuildRestrictions>
     <Category>Pillar</Category>
     <Distance>
       <FromClass>Pillar</FromClass>
       <MinDistance>70</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>80</BuildTime>
     <Resources>
       <stone>100</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="7.0" depth="7.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Edict Pillar of Ashoka</GenericName>
     <SpecificName>Śāsana Stambha Aśokā</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Pillar</VisibleClasses>
     <Icon>structures/ashoka_pillar.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="4" depth="4"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_iber_monument.xml</select>
       <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <VisualActor>
     <Actor>props/structures/mauryas/ashoka_pillar.xml</Actor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml	(revision 24535)
@@ -1,82 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Palace</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <stone>300</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Throne Hall</GenericName>
     <SpecificName>Apadāna</SpecificName>
     <Tooltip>Train Champions and Heroes.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Palace</VisibleClasses>
     <Icon>structures/palace.png</Icon>
   </Identity>
   <Loot>
     <stone>60</stone>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
   <Population>
     <Bonus>10</Bonus>
   </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
       units/{civ}/hero_cyrus_ii
       units/{civ}/hero_darius_i
       units/{civ}/hero_xerxes_i
     </Entities>
     <Technologies datatype="tokens">
       persians/immortals
     </Technologies>
   </ProductionQueue>
   <ResourceTrickle>
     <Rates>
       <food>1.0</food>
       <wood>1.0</wood>
       <stone>0.75</stone>
       <metal>0.75</metal>
     </Rates>
     <Interval>1000</Interval>
   </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/persians/apadana.xml</Actor>
     <FoundationActor>structures/fndn_8x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/library.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/library.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/library.xml	(revision 24535)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special_library">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Bibliothēkē</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/library.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/lighthouse.xml	(revision 24535)
@@ -1,59 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
     <Category>Lighthouse</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="14.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Lighthouse</GenericName>
     <SpecificName>Pharos</SpecificName>
     <Tooltip>Build upon a shoreline in own, neutral, or allied territory. Reveal the shorelines over the entire map. Very large vision range.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">-City Town Lighthouse</VisibleClasses>
     <Icon>structures/lighthouse.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <stone>40</stone>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="25.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
       <constructed>interface/complete/building/complete_temple.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <Vision>
     <Range>180</Range>
     <RevealShore>true</RevealShore>
   </Vision>
   <VisualActor>
     <Actor>structures/ptolemies/lighthouse.xml</Actor>
     <FoundationActor>structures/fndn_4x4_dock.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml	(revision 24535)
@@ -1,137 +1,137 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>25.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>60.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>1.5</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>15</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>neutral enemy</Territory>
     <Category>ArmyCamp</Category>
     <Distance>
       <FromClass>ArmyCamp</FromClass>
       <MinDistance>45</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>1500</CapturePoints>
     <RegenRate>10.0</RegenRate>
     <GarrisonRegenRate>3.0</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>250</BuildTime>
     <Resources>
       <wood>500</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="40.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_rome_sb</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Army Camp</GenericName>
     <SpecificName>Castra</SpecificName>
     <Tooltip>Build in neutral or enemy territory. Train Melee Infantry. Garrison Soldiers for additional arrows.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">City ArmyCamp</VisibleClasses>
     <Icon>structures/roman_camp.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>100</wood>
   </Loot>
   <Obstruction>
     <Static width="36.0" depth="36.0"/>
   </Obstruction>
   <Population>
     <Bonus>5</Bonus>
   </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/infantry_axeman_a
       units/{civ}/infantry_swordsman_a
       units/{civ}/infantry_spearman_a
       units/{civ}/infantry_pikeman_a
     </Entities>
   </ProductionQueue>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>15</Hack>
         <Pierce>25</Pierce>
         <Crush>2</Crush>
       </Damage>
     </Entity>
     <Foundation>
       <Damage>
         <Hack>1</Hack>
         <Pierce>5</Pierce>
         <Crush>1</Crush>
       </Damage>
     </Foundation>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryDecay>
     <DecayRate>37.5</DecayRate>
   </TerritoryDecay>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/romans/camp.xml</Actor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>29.5</Length>
     <Indent>8</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/military_colony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/military_colony.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/military_colony.xml	(revision 24535)
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre_military_colony">
   <Footprint>
     <Square width="34" depth="33"/>
     <Height>12</Height>
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Klērouchia</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <Obstruction>
     <Static width="32" depth="31"/>
   </Obstruction>
   <ProductionQueue>
     <Entities replace="" datatype="tokens">
       units/{civ}/support_female_citizen
       units/{civ}/infantry_spearman_merc_b
       units/{civ}/infantry_swordsman_merc_b
       units/{civ}/cavalry_spearman_merc_b
       units/{civ}/cavalry_javelineer_merc_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/ptolemies/military_colony.xml</Actor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/temple_vesta.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/temple_vesta.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/temple_vesta.xml	(revision 24535)
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
   <Auras datatype="tokens">
     structures/loyalty_regen
   </Auras>
   <BuildRestrictions>
     <Category>TempleOfVesta</Category>
   </BuildRestrictions>
   <Footprint replace="">
     <Circle radius="11.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Temple of Vesta</GenericName>
     <SpecificName>Aedēs Vestālis</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">TempleOfVesta</VisibleClasses>
     <Icon>structures/temple_vesta.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="19.0" depth="19.0"/>
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
       romans/vision_sibylline
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/temple_vesta.xml</Actor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/library.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/library.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/library.xml	(revision 24535)
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special_library">
   <Footprint>
     <Square width="26.0" depth="26.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Bibliothēkē</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/seleucids/library.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml	(revision 24535)
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="20.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>spart</Civ>
     <GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssition</SpecificName>
     <Tooltip>Train Champions and Heroes.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Syssiton</VisibleClasses>
     <Icon>structures/syssition.png</Icon>
   </Identity>
   <Loot>
     <stone>40</stone>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry_spear
       units/{civ}/hero_leonidas
       units/{civ}/hero_brasidas
       units/{civ}/hero_agis
     </Entities>
     <Technologies datatype="tokens">
       hellenes/spartans_agoge
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/spartans/syssiton.xml</Actor>
     <FoundationActor>structures/fndn_5x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/wallset_siege.xml	(revision 24535)
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_wallset">
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Siege Wall</GenericName>
     <SpecificName>Mūrus Circummūnītiōnis</SpecificName>
     <Tooltip>Wall off an area. Build in own, neutral, or enemy territory.</Tooltip>
+    <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">SiegeWall</VisibleClasses>
     <Icon>structures/siege_wall.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/rome/siege_wall_tower</Tower>
       <Gate>structures/rome/siege_wall_gate</Gate>
       <Fort>structures/rome/army_camp</Fort>
       <WallLong>structures/rome/siege_wall_long</WallLong>
       <WallMedium>structures/rome/siege_wall_medium</WallMedium>
       <WallShort>structures/rome/siege_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>1.00</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/military_colony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/military_colony.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/military_colony.xml	(revision 24535)
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre_military_colony">
   <Footprint>
     <Square width="31" depth="31"/>
     <Height>8</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Klērouchia</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <Obstruction>
     <Static width="29" depth="29"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/infantry_swordsman_merc_b
       units/{civ}/infantry_archer_merc_b
       units/{civ}/cavalry_spearman_merc_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/seleucids/military_colony.xml</Actor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/theater.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/theater.xml	(revision 24534)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/theater.xml	(revision 24535)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special_theater">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Theatron</SpecificName>
+    <Classes datatype="tokens">CivSpecific</Classes>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/theater.xml</Actor>
     <FoundationActor>structures/fndn_theater.xml</FoundationActor>
   </VisualActor>
 </Entity>