Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_badlands.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_badlands.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_badlands.xml	(revision 20345)
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_flora_tree">
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
-  </Footprint>
+<Entity parent="template_gaia_flora_bush">
   <Identity>
     <SpecificName>Hardy Bush</SpecificName>
   </Identity>
   <ResourceSupply>
     <Amount>75</Amount>
-    <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/flora/bush_tempe_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml	(revision 20345)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush_berry">
-  <Obstruction>
-    <Static width="4.0" depth="4.0"/>
-  </Obstruction>
+  <Identity>
+    <SpecificName>Berries</SpecificName>
+    <Tooltip>Gather the fruit from these bushes to accumulate Food.</Tooltip>
+    <Icon>gaia/flora_bush_berry.png</Icon>
+  </Identity>
   <VisualActor>
     <Actor>props/flora/berry_bush.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml	(revision 20345)
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush_berry">
   <Identity>
-    <GenericName>Forage</GenericName>
     <SpecificName>Grapes</SpecificName>
     <Tooltip>Gather grapes from these vines for Food.</Tooltip>
     <Icon>gaia/flora_bush_grapes.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>props/flora/forage_grapes.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_temperate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_temperate.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_temperate.xml	(revision 20345)
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_flora_tree">
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
-  </Footprint>
+<Entity parent="template_gaia_flora_bush">
   <Identity>
     <SpecificName>Deciduous Bush</SpecificName>
   </Identity>
   <ResourceSupply>
     <Amount>50</Amount>
-    <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/flora/bush_tempe_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml	(revision 20345)
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_flora_bush_berry">
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>10.0</Height>
-  </Footprint>
+<Entity parent="template_gaia_flora_tree_fruit">
   <Identity>
     <SpecificName>Apple Tree</SpecificName>
-    <Icon>gaia/flora_bush_berry.png</Icon>
   </Identity>
-  <Obstruction>
-    <Static width="1.8" depth="1.8"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Amount>400</Amount>
-    <Type>food.fruit</Type>
-  </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/apple_bloom.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml	(revision 20345)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Cretan Date Palm</SpecificName>
   </Identity>
   <ResourceSupply>
     <Amount>100</Amount>
-    <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/palm_cretan_date_short.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml	(revision 20345)
@@ -1,35 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_flora_tree">
+<Entity parent="template_gaia_flora_tree_fruit">
   <Footprint>
     <Circle radius="4.0"/>
-    <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Fig</SpecificName>
     <Tooltip>Gather figs for Food.</Tooltip>
-    <Icon>gaia/flora_bush_berry.png</Icon>
   </Identity>
   <Obstruction>
-    <Static width="4.0" depth="4.0"/>
+    <Static width="5.0" depth="5.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>500</Amount>
-    <Type>food.fruit</Type>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/resource/sel_fruit.xml</select>
-    </SoundGroups>
-  </Sound>
   <VisualActor>
     <Actor>flora/trees/fig.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml	(revision 20345)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Large Oak Tree</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="2.0" depth="2.0"/>
-  </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/oak_large.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_olive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_olive.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_olive.xml	(revision 20345)
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_flora_bush_berry">
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>10.0</Height>
-  </Footprint>
+<Entity parent="template_gaia_flora_tree_fruit">
   <Identity>
     <SpecificName>Olive Tree</SpecificName>
-    <Icon>gaia/flora_bush_berry.png</Icon>
   </Identity>
-  <Obstruction>
-    <Static width="1.8" depth="1.8"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Amount>400</Amount>
-    <Type>food.fruit</Type>
-  </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/olive.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml	(revision 20345)
@@ -1,13 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>15.0</Height>
-  </Footprint>
   <Identity>
-    <GenericName>Generic Flora</GenericName>
+    <Classes datatype="tokens">ForestPlant</Classes>
+    <Icon>gaia/flora_tree_generic.png</Icon>
   </Identity>
+  <Minimap>
+    <Type>wood</Type>
+    <Color r="69" g="107" b="68"/>
+  </Minimap>
   <Obstruction>
-    <Static width="3.0" depth="3.0"/>
+    <Static width="1.6" depth="1.6"/>
   </Obstruction>
+  <ResourceSupply>
+    <KillBeforeGather>false</KillBeforeGather>
+    <Amount>200</Amount>
+    <Type>wood.tree</Type>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
+  <Selectable>
+    <EditorOnly disable=""/>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/128x128.png</MainTexture>
+        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/resource/sel_tree.xml</select>
+    </SoundGroups>
+  </Sound>
+  <VisualActor>
+    <SelectionShape>
+      <Footprint/>
+    </SelectionShape>
+  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush.xml	(revision 20345)
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora">
   <Footprint>
-    <Circle radius="1.0"/>
-    <Height>1.0</Height>
+    <Circle radius="3.0"/>
+    <Height>3.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Bush</GenericName>
-    <Classes datatype="tokens">ForestPlant</Classes>
   </Identity>
-  <Obstruction>
-    <Static width="2.0" depth="2.0"/>
-    <BlockMovement>false</BlockMovement>
-    <BlockPathfinding>false</BlockPathfinding>
-  </Obstruction>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml	(revision 20345)
@@ -1,37 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush">
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>1.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Bush</GenericName>
-    <SpecificName>Berries</SpecificName>
-    <Tooltip>Gather the fruit from these bushes to accumulate Food.</Tooltip>
-    <Icon>gaia/flora_bush_berry.png</Icon>
-  </Identity>
   <Minimap>
     <Type>food</Type>
     <Color r="155" g="204" b="102"/>
   </Minimap>
+  <Obstruction>
+    <Static width="4.0" depth="4.0"/>
+    <BlockMovement>false</BlockMovement>
+    <BlockPathfinding>false</BlockPathfinding>
+  </Obstruction>
   <ResourceSupply>
-    <KillBeforeGather>false</KillBeforeGather>
     <Amount>200</Amount>
     <Type>food.fruit</Type>
-    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <EditorOnly disable=""/>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>interface/select/resource/sel_fruit.xml</select>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml	(revision 20344)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml	(revision 20345)
@@ -1,46 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora">
+  <Footprint>
+    <Circle radius="2.5"/>
+    <Height>15.0</Height>
+  </Footprint>
   <Identity>
-    <Classes datatype="tokens">ForestPlant</Classes>
     <GenericName>Tree</GenericName>
-    <Icon>gaia/flora_tree_generic.png</Icon>
     <Tooltip>Chop down to accumulate Wood.</Tooltip>
   </Identity>
-  <Minimap>
-    <Type>wood</Type>
-    <Color r="69" g="107" b="68"/>
-  </Minimap>
-  <Obstruction>
-    <Static width="1.6" depth="1.6"/>
-  </Obstruction>
-  <ResourceSupply>
-    <KillBeforeGather>false</KillBeforeGather>
-    <Amount>200</Amount>
-    <Type>wood.tree</Type>
-    <MaxGatherers>8</MaxGatherers>
-  </ResourceSupply>
-  <Selectable>
-    <EditorOnly disable=""/>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/resource/sel_tree.xml</select>
-    </SoundGroups>
-  </Sound>
   <StatusBars>
     <BarWidth>3.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>10.0</HeightOffset>
   </StatusBars>
-  <VisualActor>
-    <SelectionShape>
-      <Footprint/>
-    </SelectionShape>
-  </VisualActor>
 </Entity>