Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_a.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_a.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="props_a">
-      <mesh>props/pers_civic_props_a.dae</mesh>
-      <textures>
-        <texture file="structural/pers_cc_staircase.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_b.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_b.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="props_b">
-      <mesh>props/pers_civic_props_b.dae</mesh>
-      <textures>
-        <texture file="structural/pers_struct.png" name="baseTex"/>
-        <texture file="structural/pers_struct_norm.png" name="normTex"/>
-        <texture file="structural/pers_struct_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_a.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_a.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers civic plants a">
-      <mesh>props/pers_civic_shrub_a.dae</mesh>
-      <textures>
-      	<texture file="gaia/shrub_tropic_a.png" name="baseTex"/>
-        <texture file="gaia/shrub_tropic_a_norm.png" name="normTex"/>
-        <texture file="gaia/shrub_tropic_a_spec.png" name="specTex"/>        
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_b.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_b.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers civic plants b">
-      <mesh>props/pers_civic_shrub_b.dae</mesh>
-      <textures>
-      	<texture file="gaia/shrub_tropic_b.png" name="baseTex"/>
-        <texture file="gaia/shrub_tropic_b_norm.png" name="normTex"/>
-        <texture file="gaia/shrub_tropic_b_spec.png" name="specTex"/>        
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_c.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_c.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_c.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers civic plants c">
-      <mesh>props/pers_civic_shrub_c.dae</mesh>
-      <textures>
-      	<texture file="gaia/shrub_tropic_palm.png" name="baseTex"/>
-        <texture file="gaia/shrub_tropic_palm_norm.png" name="normTex"/>
-        <texture file="gaia/shrub_tropic_palm_spec.png" name="specTex"/>        
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_d.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_d.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/civil_centre_shrubs_d.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="pers civic plants d">
-      <mesh>props/pers_civic_shrub_d.dae</mesh>
-      <textures>
-      	<texture file="gaia/shrub_spikes.png" name="baseTex"/>
-        <texture file="gaia/shrub_spikes_norm.png" name="normTex"/>
-        <texture file="gaia/shrub_spikes_spec.png" name="specTex"/>        
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_a.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_a.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="props_a">
+      <mesh>props/pers_civic_props_a.dae</mesh>
+      <textures>
+        <texture file="structural/pers_cc_staircase.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_b.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_b.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="props_b">
+      <mesh>props/pers_civic_props_b.dae</mesh>
+      <textures>
+        <texture file="structural/pers_struct.png" name="baseTex"/>
+        <texture file="structural/pers_struct_norm.png" name="normTex"/>
+        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_a.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_a.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="pers civic plants a">
+      <mesh>props/pers_civic_shrub_a.dae</mesh>
+      <textures>
+      	<texture file="gaia/shrub_tropic_a.png" name="baseTex"/>
+        <texture file="gaia/shrub_tropic_a_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_tropic_a_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_b.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_b.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="pers civic plants b">
+      <mesh>props/pers_civic_shrub_b.dae</mesh>
+      <textures>
+      	<texture file="gaia/shrub_tropic_b.png" name="baseTex"/>
+        <texture file="gaia/shrub_tropic_b_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_tropic_b_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_c.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_c.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_c.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="pers civic plants c">
+      <mesh>props/pers_civic_shrub_c.dae</mesh>
+      <textures>
+      	<texture file="gaia/shrub_tropic_palm.png" name="baseTex"/>
+        <texture file="gaia/shrub_tropic_palm_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_tropic_palm_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_d.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_d.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/props/structures/persians/tachara_shrubs_d.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="pers civic plants d">
+      <mesh>props/pers_civic_shrub_d.dae</mesh>
+      <textures>
+      	<texture file="gaia/shrub_spikes.png" name="baseTex"/>
+        <texture file="gaia/shrub_spikes_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_spikes_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/structures/persians/civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/structures/persians/civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/structures/persians/civil_centre.xml
@@ -2,24 +2,16 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Base a" file="structures/defensive_building.xml">
-      <mesh>structural/pers_civic.dae</mesh>
+    <variant frequency="1" name="civic_center" file="structures/defensive_building.xml">
+      <mesh>structural/pers_palace.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/civil_centre_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_d.xml" attachpoint="root"/>
-        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shielda"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldb"/>
-        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldc"/>
+        <prop actor="props/structures/decals/paving_tile_sahara_9x9_round.xml" attachpoint="root"/>
       </props>
       <textures>
         <texture file="structural/pers_struct.png" name="baseTex"/>
         <texture file="structural/pers_struct_norm.png" name="normTex"/>
         <texture file="structural/pers_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/pers_civic_b.png" name="aoTex"/>
+        <texture file="structural/ao/pers_palace.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -33,16 +25,7 @@
   </group>
   <group>
     <variant name="alive" frequency="1"/>
-    <variant file="structures/destruction_large.xml">
-      <props>
-        <prop actor="props/structures/persians/civil_centre_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/civil_centre_shrubs_d.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="structures/destruction_large.xml"/>
   </group>
   <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/structures/persians/tachara.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/structures/persians/tachara.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/structures/persians/tachara.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base a" file="structures/defensive_building.xml">
+      <mesh>structural/pers_civic.dae</mesh>
+      <props>
+        <prop actor="props/structures/persians/tachara_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_d.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shielda"/>
+        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldb"/>
+        <prop actor="props/units/shields/pers_round_kardakes.xml" attachpoint="shieldc"/>
+      </props>
+      <textures>
+        <texture file="structural/pers_struct.png" name="baseTex"/>
+        <texture file="structural/pers_struct_norm.png" name="normTex"/>
+        <texture file="structural/pers_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/pers_civic_b.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant file="structures/destruction_large.xml">
+      <props>
+        <prop actor="props/structures/persians/tachara_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/tachara_shrubs_d.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
@@ -788,7 +788,7 @@
 			<Actor seed="10628"/>
 		</Entity>
 		<Entity uid="122">
-			<Template>structures/pers/apadana</Template>
+			<Template>structures/pers/tachara</Template>
 			<Player>1</Player>
 			<Position x="419.84968" z="556.26905"/>
 			<Orientation y="2.35621"/>
@@ -816,7 +816,7 @@
 			<Actor seed="53608"/>
 		</Entity>
 		<Entity uid="126">
-			<Template>structures/pers/tacara</Template>
+			<Template>structures/pers/tachara</Template>
 			<Player>1</Player>
 			<Position x="363.1981" z="563.04017"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -52006,14 +52006,14 @@
 			<Actor seed="60060"/>
 		</Entity>
 		<Entity uid="11611">
-			<Template>structures/pers/tacara</Template>
+			<Template>structures/pers/tachara</Template>
 			<Player>4</Player>
 			<Position x="1680.41724" z="1691.77625"/>
 			<Orientation y="8.72716"/>
 			<Actor seed="60360"/>
 		</Entity>
 		<Entity uid="11612">
-			<Template>structures/pers/apadana</Template>
+			<Template>structures/pers/tachara</Template>
 			<Player>4</Player>
 			<Position x="1728.0547" z="1634.66651"/>
 			<Orientation y="5.58768"/>
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
@@ -98,7 +98,7 @@
 			"structures/{civ}/pillar_ashoka"
 		],
 		"pers": [
-			"structures/{civ}/apadana"
+			"structures/{civ}/tachara"
 		],
 		"ptol": [
 			"structures/{civ}/library",
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/architecture_pers.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/architecture_pers.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/architecture_pers.json
@@ -1,5 +1,5 @@
 {
-	"genericName": "Persian Architecture",
+	"genericName": "Achaemenid Architecture",
 	"description": "The Persians built the wonderful 1677 mile-long Royal Highway from Sardis to Susa; Darius the Great and Xerxes also built the magnificent Persepolis; Cyrus the Great greatly improved Ecbatana and virtually 'rebuilt' the old Elamite capital of Susa.",
 	"cost": {
 		"wood": 200,
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/builder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/builder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/builder.xml
@@ -34,7 +34,7 @@
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/theater
-      structures/{civ}/apadana
+      structures/{civ}/tachara
       structures/{civ}/wonder
     </Entities>
   </Builder>
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
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Auras datatype="tokens">
-    structures/satrapy_tribute
-  </Auras>
-  <BuildRestrictions>
-    <Category>Palace</Category>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <stone>200</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 CivSpecific</Classes>
-    <VisibleClasses datatype="tokens">Palace</VisibleClasses>
-    <Icon>structures/palace.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>40</stone>
-    <metal>40</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="30.0" depth="30.0"/>
-  </Obstruction>
-  <ProductionQueue/>
-  <Researcher>
-    <Technologies datatype="tokens">
-      immortals
-    </Technologies>
-  </Researcher>
-  <ResourceTrickle>
-    <Rates>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Rates>
-    <Interval>2000</Interval>
-  </ResourceTrickle>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_greek_theater.xml</select>
-      <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
-      <upgraded>interface/complete/building/complete_greek_theater.xml</upgraded>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Root>true</Root>
-    <Radius>48</Radius>
-    <Weight>40000</Weight>
-  </TerritoryInfluence>
-  <Trainer>
-    <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>
-  </Trainer>
-  <Upgrade>
-    <TributeFood>
-      <Entity>structures/pers/apadana_food</Entity>
-      <Tooltip>Receive free Food tribute to your treasury from your subject peoples.</Tooltip>
-      <Time>10</Time>
-    </TributeFood>
-    <TributeWood>
-      <Entity>structures/pers/apadana_wood</Entity>
-      <Tooltip>Receive free Wood tribute to your treasury from your subject peoples.</Tooltip>
-      <Time>10</Time>
-    </TributeWood>
-    <TributeStone>
-      <Entity>structures/pers/apadana_stone</Entity>
-      <Tooltip>Receive free Stone tribute to your treasury from your subject peoples.</Tooltip>
-      <Time>10</Time>
-    </TributeStone>
-    <TributeMetal>
-      <Entity>structures/pers/apadana_metal</Entity>
-      <Tooltip>Receive free Metal tribute to your treasury from your subject peoples.</Tooltip>
-      <Time>10</Time>
-    </TributeMetal>
-  </Upgrade>
-  <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/pers/apadana_food.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_food.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_food.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/apadana">
-  <Identity>
-    <Icon>structures/palace_food.png</Icon>
-  </Identity>
-  <ResourceTrickle>
-    <Rates>
-      <food>10</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Rates>
-  </ResourceTrickle>
-  <Upgrade>
-    <TributeFood disable=""/>
-  </Upgrade>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_metal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_metal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_metal.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/apadana">
-  <Identity>
-    <Icon>structures/palace_metal.png</Icon>
-  </Identity>
-  <ResourceTrickle>
-    <Rates>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>10</metal>
-    </Rates>
-  </ResourceTrickle>
-  <Upgrade>
-    <TributeMetal disable=""/>
-  </Upgrade>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_stone.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/apadana">
-  <Identity>
-    <Icon>structures/palace_stone.png</Icon>
-  </Identity>
-  <ResourceTrickle>
-    <Rates>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>10</stone>
-      <metal>0</metal>
-    </Rates>
-  </ResourceTrickle>
-  <Upgrade>
-    <TributeStone disable=""/>
-  </Upgrade>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_wood.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_wood.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana_wood.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="structures/pers/apadana">
-  <Identity>
-    <Icon>structures/palace_wood.png</Icon>
-  </Identity>
-  <ResourceTrickle>
-    <Rates>
-      <food>0</food>
-      <wood>10</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Rates>
-  </ResourceTrickle>
-  <Upgrade>
-    <TributeWood disable=""/>
-  </Upgrade>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
+  <Footprint>
+    <Square width="40.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_pers_cc</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Provincial Governor</GenericName>
     <SpecificName>Xšaçapāvan</SpecificName>
   </Identity>
+  <Obstruction>
+    <Static width="38.5" depth="22.5"/>
+  </Obstruction>
   <Researcher>
     <Technologies datatype="tokens">
       architecture_pers
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
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <wood>200</wood>
-      <stone>400</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="40.0" depth="24.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>Palace</GenericName>
-    <SpecificName>Taçara</SpecificName>
-    <Classes datatype="tokens">ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Palace</VisibleClasses>
-    <Icon>structures/palace.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>40</wood>
-    <stone>80</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="38.5" depth="22.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Researcher disable=""/>
-  <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>
-  <Trainer disable=""/>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>structures/persians/palace.xml</Actor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_special">
+  <Auras datatype="tokens">
+    structures/satrapy_tribute
+  </Auras>
+  <BuildRestrictions>
+    <Category>Palace</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime>300</BuildTime>
+    <Resources>
+      <stone>200</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_pers_cc</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Winter Palace</GenericName>
+    <SpecificName>Taçara</SpecificName>
+    <Tooltip>Train Heroes and make use of the “Satrapy Tribute” feature.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
+    <VisibleClasses datatype="tokens">Palace</VisibleClasses>
+    <Icon>structures/palace.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>40</stone>
+    <metal>40</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="30.0" depth="30.0"/>
+  </Obstruction>
+  <ProductionQueue/>
+  <ResourceTrickle>
+    <Rates>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Rates>
+    <Interval>2000</Interval>
+  </ResourceTrickle>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_greek_theater.xml</select>
+      <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
+      <upgraded>interface/complete/building/complete_greek_theater.xml</upgraded>
+    </SoundGroups>
+  </Sound>
+  <TerritoryInfluence>
+    <Root>true</Root>
+    <Radius>48</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
+  <Trainer>
+    <BatchTimeModifier>0.8</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}/hero_cyrus_ii
+      units/{civ}/hero_darius_i
+      units/{civ}/hero_xerxes_i
+    </Entities>
+  </Trainer>
+  <Upgrade>
+    <TributeFood>
+      <Entity>structures/pers/tachara_food</Entity>
+      <Tooltip>Receive free Food tribute to your treasury from your subject peoples.</Tooltip>
+      <Time>10</Time>
+    </TributeFood>
+    <TributeWood>
+      <Entity>structures/pers/tachara_wood</Entity>
+      <Tooltip>Receive free Wood tribute to your treasury from your subject peoples.</Tooltip>
+      <Time>10</Time>
+    </TributeWood>
+    <TributeStone>
+      <Entity>structures/pers/tachara_stone</Entity>
+      <Tooltip>Receive free Stone tribute to your treasury from your subject peoples.</Tooltip>
+      <Time>10</Time>
+    </TributeStone>
+    <TributeMetal>
+      <Entity>structures/pers/tachara_metal</Entity>
+      <Tooltip>Receive free Metal tribute to your treasury from your subject peoples.</Tooltip>
+      <Time>10</Time>
+    </TributeMetal>
+  </Upgrade>
+  <Vision>
+    <Range>40</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>structures/persians/tachara.xml</Actor>
+    <FoundationActor>structures/fndn_8x9.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_food.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_food.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_food.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="structures/pers/tachara">
+  <Identity>
+    <Icon>structures/palace_food.png</Icon>
+  </Identity>
+  <ResourceTrickle>
+    <Rates>
+      <food>10</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Rates>
+  </ResourceTrickle>
+  <Upgrade>
+    <TributeFood disable=""/>
+  </Upgrade>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_metal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_metal.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_metal.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="structures/pers/tachara">
+  <Identity>
+    <Icon>structures/palace_metal.png</Icon>
+  </Identity>
+  <ResourceTrickle>
+    <Rates>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal>10</metal>
+    </Rates>
+  </ResourceTrickle>
+  <Upgrade>
+    <TributeMetal disable=""/>
+  </Upgrade>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_stone.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_stone.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="structures/pers/tachara">
+  <Identity>
+    <Icon>structures/palace_stone.png</Icon>
+  </Identity>
+  <ResourceTrickle>
+    <Rates>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>10</stone>
+      <metal>0</metal>
+    </Rates>
+  </ResourceTrickle>
+  <Upgrade>
+    <TributeStone disable=""/>
+  </Upgrade>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_wood.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_wood.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tachara_wood.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="structures/pers/tachara">
+  <Identity>
+    <Icon>structures/palace_wood.png</Icon>
+  </Identity>
+  <ResourceTrickle>
+    <Rates>
+      <food>0</food>
+      <wood>10</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Rates>
+  </ResourceTrickle>
+  <Upgrade>
+    <TributeWood disable=""/>
+  </Upgrade>
+</Entity>