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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
@@ -5,7 +5,7 @@
     <PlacementType>shore</PlacementType>
   </BuildRestrictions>
   <Footprint replace="">
-    <Circle radius="15.5"/>
+    <Circle radius="17"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
@@ -18,7 +18,7 @@
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
-    <Static width="29.0" depth="29.0"/>
+    <Static width="29" depth="29"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_elephant_stables.xml
@@ -1,57 +1,9 @@
 <?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>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_elephant_stables.xml
@@ -1,16 +1,9 @@
 <?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>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wonder.xml
@@ -1,7 +1,7 @@
 <?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>
@@ -9,7 +9,7 @@
     <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>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
@@ -1,7 +1,7 @@
 <?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>
@@ -9,7 +9,7 @@
     <SpecificName>pr-'a</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="40.0" depth="37"/>
+    <Static width="39" depth="31"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -13,7 +13,7 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="29.0" depth="27.0"/>
+    <Square width="31" depth="29"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
@@ -41,7 +41,7 @@
     <metal>50</metal>
   </Loot>
   <Obstruction>
-    <Static width="30.0" depth="29.0"/>
+    <Static width="29" depth="27"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
@@ -15,7 +15,7 @@
     </Resources>
   </Cost>
   <Footprint replace="">
-    <Circle radius="24.0"/>
+    <Circle radius="25"/>
     <Height>10.0</Height>
   </Footprint>
   <Health>
@@ -33,7 +33,7 @@
     <metal>125</metal>
   </Loot>
   <Obstruction>
-    <Static width="46.0" depth="46.0"/>
+    <Static width="40" depth="46"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Sound>