Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_house_10.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_house_10.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_house_10.xml	(revision 20227)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_house">
+<Entity parent="template_structure_civic_house_big">
   <Identity>
     <Civ>skirm</Civ>
     <Tooltip>Changes in a 10-pop house for civilisations with those houses, is deleted for other civs</Tooltip>
   </Identity>
   <ProductionQueue disable=""/>
   <SkirmishReplacer/>
   <VisualActor>
     <Actor>structures/hellenes/house.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_house_5.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_house_5.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_house_5.xml	(revision 20227)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Footprint>
-    <Square width="16.0" depth="16.0"/>
-    <Height>5.0</Height>
+    <Square width="15.0" depth="14.0"/>
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
     <Tooltip>Changes in a 5-pop house for civilisations with those houses, is deleted for other civs</Tooltip>
   </Identity>
+  <Obstruction>
+    <Static width="13.0" depth="12.0"/>
+  </Obstruction>
   <ProductionQueue disable=""/>
   <SkirmishReplacer/>
   <VisualActor>
     <Actor>structures/ptolemies/house.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_house.xml	(revision 20227)
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Footprint replace="">
+  <Footprint>
+    <Square disable=""/>
     <Circle radius="6.0"/>
-    <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Annedd</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
-  <TerritoryInfluence>
-    <Radius>16</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/britons/house.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_house.xml	(revision 20227)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house_big">
   <Footprint>
-    <Square width="14.5" depth="14.5"/>
-    <Height>5.0</Height>
+    <Square width="15.0" depth="15.0"/>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Bet</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="13.0" depth="13.0"/>
   </Obstruction>
   <VisualActor>
     <FoundationActor>structures/carthaginians/fndn_house.xml</FoundationActor>
     <Actor>structures/carthaginians/house.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_house.xml	(revision 20227)
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Footprint replace="">
-    <Square width="12.5" depth="12.5"/>
-    <Height>5.0</Height>
-  </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Annedd</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="12.0" depth="12.0"/>
-  </Obstruction>
-  <TerritoryInfluence>
-    <Radius>16</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/gauls/house.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_house.xml	(revision 20227)
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Footprint>
-    <Square width="12.0" depth="12.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Etxe</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="10.0" depth="10.0"/>
-  </Obstruction>
-  <TerritoryInfluence>
-    <Radius>16</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/iberians/house.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_house.xml	(revision 20227)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Footprint>
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
+    <Square width="11.0" depth="11.0"/>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Griham</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="10.0" depth="10.0"/>
+    <Static width="9.0" depth="9.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/mauryans/house.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_house.xml	(revision 20227)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house_big">
   <Footprint>
-    <Square width="17.0" depth="17.0"/>
-    <Height>5.0</Height>
+    <Square width="15.0" depth="16.0"/>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Huvādā</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="13.5" depth="13.5"/>
+    <Static width="13.0" depth="14.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/persians/house.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml	(revision 20227)
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Cost>
     <BuildTime>80</BuildTime>
     <Resources>
       <wood>0</wood>
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="16.0" depth="16.0"/>
-    <Height>5.0</Height>
+    <Square width="15.0" depth="14.0"/>
   </Footprint>
   <Health>
     <Max>500</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>ḥwt</SpecificName>
     <Tooltip>Increase the population limit. Since they are made of mud brick, Egyptian houses are free of cost, but are very weak.</Tooltip>
   </Identity>
+  <Loot>
+    <wood>0</wood>
+  </Loot>
   <Obstruction>
-    <Static width="14.0" depth="14.0"/>
+    <Static width="13.0" depth="12.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/ptolemies/house.xml</Actor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_house.xml	(revision 20227)
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house_big">
+  <Footprint>
+    <Square width="15.0" depth="16.0"/>
+  </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Oîkos</SpecificName>
   </Identity>
+  <Obstruction>
+    <Static width="13.0" depth="14.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/seleucids/house.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml	(revision 20227)
@@ -1,81 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <BuildRestrictions>
     <Category>House</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>300</CapturePoints>
     <GarrisonRegenRate>4.0</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>75</wood>
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="18.0" depth="18.0"/>
+    <Square width="13.0" depth="13.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>3</Max>
     <BuffHeal>0</BuffHeal>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support+!Elephant</List>
     <LoadingRange>1</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
-    <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>House</GenericName>
     <Tooltip>Increase the population limit.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Village House</VisibleClasses>
     <Icon>structures/house.png</Icon>
   </Identity>
   <Obstruction>
-    <Static width="14.0" depth="14.0"/>
+    <Static width="11.0" depth="11.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>1.0</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen_house
     </Entities>
     <Technologies datatype="tokens">
       health_females_01
       pop_house_01
       pop_house_02
       unlock_females_house
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_house.xml</select>
       <constructed>interface/complete/building/complete_house.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
     <DecayRate>10</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence>
     <Root>false</Root>
-    <Radius>20</Radius>
-    <Weight>40000</Weight>
+    <Radius>16</Radius>
+    <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
-    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house_big.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house_big.xml	(revision 20226)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_house_big.xml	(revision 20227)
@@ -1,19 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>50</BuildTime>
     <Resources>
       <wood>150</wood>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="16.0" depth="16.0"/>
+  </Footprint>
   <GarrisonHolder>
     <Max>6</Max>
   </GarrisonHolder>
   <Health>
     <Max>1200</Max>
+    <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Loot>
     <wood>20</wood>
   </Loot>
+  <Obstruction>
+    <Static width="14.0" depth="14.0"/>
+  </Obstruction>
+  <TerritoryInfluence>
+    <Radius>20</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
+  <VisualActor>
+    <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
+  </VisualActor>
 </Entity>