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 21307)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml	(revision 21308)
@@ -1,48 +1,48 @@
 <?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="15.5"/>
+    <Circle radius="17"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Island Settlement</GenericName>
     <Civ>brit</Civ>
     <Classes datatype="tokens">Naval</Classes>
     <Icon>structures/crannog.png</Icon>
     <Tooltip>Increase population limit and defend waterways.</Tooltip>
     <SpecificName>Crannóc</SpecificName>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
-    <Static width="29.0" depth="29.0"/>
+    <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_javelinist_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_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_elephant_stables.xml	(revision 21307)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_elephant_stables.xml	(revision 21308)
@@ -1,58 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>200</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="29.0" depth="27.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <List datatype="tokens">Elephant</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>3000</Max>
-  </Health>
+<Entity parent="template_structure_military_elephant_stables">
   <Identity>
     <Civ>cart</Civ>
-    <GenericName>Elephant Stables</GenericName>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-    <Icon>structures/elephant_stables.png</Icon>
-    <Tooltip>Train elephant units.</Tooltip>
+    <SpecificName>Carthaginian Elephant Stables</SpecificName>
   </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="30.0" depth="29.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_support_elephant
-      units/{civ}_elephant_archer_b
-      units/{civ}_champion_elephant
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_elephant_stables.xml</select>
-      <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/carthaginians/stable_elephant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_elephant_stables.xml	(revision 21307)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_elephant_stables.xml	(revision 21308)
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_elephant_stables">
-  <Footprint>
-    <Square width="33.0" depth="33.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Kushite Elephant Stables</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="30.0" depth="30.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/kushites/elephant_stable.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wonder.xml	(revision 21307)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wonder.xml	(revision 21308)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
   <Footprint replace="">
-    <Circle radius="30.0"/>
+    <Circle radius="31"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Great Stupa</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="59.0" depth="59.0"/>
+    <Static width="57" depth="57"/>
   </Obstruction>
   <VisualActor>
     <FoundationActor>structures/fndn_theatron.xml</FoundationActor>
     <Actor>structures/mauryans/big_stupa.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml	(revision 21307)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml	(revision 21308)
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
   <Footprint>
-    <Square width="42.0" depth="35"/>
+    <Square width="41" depth="33"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>pr-'a</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="40.0" depth="37"/>
+    <Static width="39" depth="31"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_pikeman_b
       units/{civ}_infantry_javelinist_b
       units/{civ}_cavalry_archer_b
       units/{civ}_hero_ptolemy_I
       units/{civ}_hero_ptolemy_IV
       units/{civ}_hero_cleopatra
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/ptolemies/civic_centre.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml	(revision 21307)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml	(revision 21308)
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <BuildRestrictions>
     <Category>Barracks</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="29.0" depth="27.0"/>
+    <Square width="31" depth="29"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Elephant</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Elephant Stables</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/elephant_stables.png</Icon>
     <Tooltip>Train elephant units.</Tooltip>
     <VisibleClasses datatype="tokens">City ElephantStables</VisibleClasses>
   </Identity>
   <Loot>
     <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
-    <Static width="30.0" depth="29.0"/>
+    <Static width="29" depth="27"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_elephant
       units/{civ}_elephant_archer_b
       units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
       <select>interface/select/building/sel_elephant_stables.xml</select>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml	(revision 21307)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml	(revision 21308)
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">
     structures/theatron
   </Auras>
   <BuildRestrictions>
     <Category>Theater</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>500</stone>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
-    <Circle radius="24.0"/>
+    <Circle radius="25"/>
     <Height>10.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <GenericName>Greek Theater</GenericName>
     <SpecificName>Théātron</SpecificName>
     <Classes datatype="tokens">Theater -ConquestCritical</Classes>
     <Icon>structures/theatron.png</Icon>
   </Identity>
   <Loot>
     <wood>0</wood>
     <stone>125</stone>
     <metal>125</metal>
   </Loot>
   <Obstruction>
-    <Static width="46.0" depth="46.0"/>
+    <Static width="40" depth="46"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_greek_theater.xml</select>
       <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>100</Radius>
   </TerritoryInfluence>
 </Entity>