Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/obelisk.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/obelisk.xml	(revision 26710)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/obelisk.xml	(revision 26711)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Footprint>
     <Square width="4.5" depth="4.5"/>
     <Height>10.0</Height>
   </Footprint>
   <Health>
     <Max>1200</Max>
   </Health>
   <Identity>
     <GenericName>Obelisk</GenericName>
     <SpecificName>Egyptian Obelisk</SpecificName>
     <Icon>gaia/special_obelisk.png</Icon>
   </Identity>
   <Loot>
     <stone>200</stone>
     <metal>200</metal>
   </Loot>
   <Obstruction>
     <Static width="4.0" depth="4.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Researcher disable=""/>
   <TerritoryDecay disable=""/>
   <Trainer disable=""/>
   <VisualActor>
-    <Actor>props/special/eyecandy/obelisk.xml</Actor>
+    <Actor>props/special/eyecandy/obelisk_03.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_colonnade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_colonnade.xml	(revision 26710)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_colonnade.xml	(revision 26711)
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Footprint>
     <Square width="1.6" depth="1.6"/>
     <Height>4.0</Height>
   </Footprint>
   <Health>
-    <Max>220</Max>
+    <Max>200</Max>
   </Health>
   <Identity>
+    <Civ>sele</Civ>
     <GenericName>Colonnade</GenericName>
     <SpecificName>Corinthian Colonnade</SpecificName>
-    <Icon>gaia/special_fence.png</Icon>
+    <Icon>structures/stoa.png</Icon>
   </Identity>
   <Loot>
     <stone>20</stone>
   </Loot>
   <Obstruction>
     <Static width="1.5" depth="1.5"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Researcher disable=""/>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <Trainer disable=""/>
   <VisualActor>
     <Actor>props/special/eyecandy/sele_colonnade.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_arab.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_arab.xml	(revision 26710)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_arab.xml	(revision 26711)
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Territory>own neutral enemy</Territory>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>25</CapturePoints>
     <RegenRate>0</RegenRate>
     <GarrisonRegenRate>5</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="11.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>100</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>rome</Civ>
+    <Civ>ptol</Civ>
     <SpecificName>Arab Army Tent</SpecificName>
     <GenericName>Tent</GenericName>
     <Icon>structures/mercenary_camp.png</Icon>
     <VisibleClasses datatype="tokens">Tent</VisibleClasses>
 	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
   <Population>
     <Bonus>5</Bonus>
   </Population>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
       <constructed>interface/complete/building/complete_universal.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/tent_arab.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_bedouin.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_bedouin.xml	(revision 26710)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_bedouin.xml	(revision 26711)
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Territory>own neutral enemy</Territory>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>25</CapturePoints>
     <RegenRate>0</RegenRate>
     <GarrisonRegenRate>5</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="12.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>100</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>rome</Civ>
+    <Civ>pers</Civ>
     <SpecificName>Bedouin Tent</SpecificName>
     <GenericName>Tent</GenericName>
     <Icon>structures/mercenary_camp.png</Icon>
     <VisibleClasses datatype="tokens">Tent</VisibleClasses>
 	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
   <Population>
     <Bonus>5</Bonus>
   </Population>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
       <constructed>interface/complete/building/complete_universal.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>props/structures/ptolemies/settlement_arabtent.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_desert.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_desert.xml	(revision 26710)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_desert.xml	(revision 26711)
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Territory>own neutral enemy</Territory>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>25</CapturePoints>
     <RegenRate>0</RegenRate>
     <GarrisonRegenRate>5</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="11.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>100</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>rome</Civ>
+    <Civ>ptol</Civ>
     <SpecificName>Desert Army Tent</SpecificName>
     <GenericName>Tent</GenericName>
     <Icon>structures/mercenary_camp.png</Icon>
     <VisibleClasses datatype="tokens">Tent</VisibleClasses>
 	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
   <Population>
     <Bonus>5</Bonus>
   </Population>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
       <constructed>interface/complete/building/complete_universal.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/tent_big.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_mace.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_mace.xml	(revision 26710)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/tent_mace.xml	(revision 26711)
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Territory>own neutral enemy</Territory>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>25</CapturePoints>
     <RegenRate>0</RegenRate>
     <GarrisonRegenRate>5</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="9.0" depth="9.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>100</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>rome</Civ>
+    <Civ>mace</Civ>
     <SpecificName>Macedonian Army Tent</SpecificName>
     <GenericName>Tent</GenericName>
     <Icon>structures/mercenary_camp.png</Icon>
     <VisibleClasses datatype="tokens">Tent</VisibleClasses>
 	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="8.0" depth="8.0"/>
   </Obstruction>
   <Population>
     <Bonus>5</Bonus>
   </Population>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
       <constructed>interface/complete/building/complete_universal.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/tent_greek.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml	(revision 26710)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml	(revision 26711)
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <stone>100</stone>
       <metal>150</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="29" depth="21.0"/>
     <Height>10.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Stoa</GenericName>
     <SelectionGroupName>template_structure_civic_stoa</SelectionGroupName>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Town Stoa</VisibleClasses>
-    <Icon>gaia/special_stoa.png</Icon>
+    <Icon>structures/stoa.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <stone>20</stone>
     <metal>30</metal>
   </Loot>
   <Obstruction>
     <Static width="28.0" depth="20.0"/>
   </Obstruction>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_8x4.xml</FoundationActor>
   </VisualActor>
 </Entity>