Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml	(revision 22821)
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Health>
     <DeathType>remain</DeathType>
   </Health>
+  <Identity>
+    <Tooltip>Kill to gather meat for food.</Tooltip>
+  </Identity>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>100</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <Vision>
     <Range>20</Range>
   </Vision>
 </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 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml	(revision 22821)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush_berry">
   <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 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml	(revision 22821)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush_berry">
   <Identity>
     <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_tree_banana.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banana.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banana.xml	(revision 22821)
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree_fruit">
   <Identity>
     <SpecificName>Banana</SpecificName>
-    <Tooltip>Gather bananas for Food.</Tooltip>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/banana.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 22821)
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Health>
     <Max>200</Max>
     <DeathType>remain</DeathType>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <Tooltip>Kill, then gather food from this bountiful oceanic resource.</Tooltip>
+    <Tooltip>Kill to butcher for food.</Tooltip>
   </Identity>
   <Loot>
     <xp>10</xp>
   </Loot>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>2000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/512x512.png</MainTexture>
         <MainTextureMask>circle/512x512_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>60.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.8</WalkSpeed>
     <RunMultiplier>1</RunMultiplier>
   </UnitMotion>
 </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 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml	(revision 22821)
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree_fruit">
   <Footprint>
     <Circle radius="4.0"/>
   </Footprint>
   <Identity>
     <SpecificName>Fig</SpecificName>
-    <Tooltip>Gather figs for Food.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="5.0" depth="5.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>500</Amount>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <VisualActor>
     <Actor>flora/trees/fig.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml	(revision 22821)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint>
     <Circle radius="3.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Identity>
     <SpecificName>Ancient Ruins</SpecificName>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>500</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/column_doric_fallen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml	(revision 22821)
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint replace="">
     <Square width="62.0" depth="62.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Great Pyramid</SpecificName>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="59.0" depth="59.0"/>
   </Obstruction>
   <Position>
     <Altitude>-2.0</Altitude>
   </Position>
   <ResourceSupply>
     <Amount>10000</Amount>
-    <Type>stone.ruins</Type>
     <MaxGatherers>120</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <Vision>
     <Range>72</Range>
   </Vision>
   <VisualActor>
     <Actor>special/pyramid.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml	(revision 22821)
@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint replace="">
     <Square width="38.0" depth="38.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Minor Pyramid</SpecificName>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="34.0" depth="34.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>5000</Amount>
-    <Type>stone.ruins</Type>
     <MaxGatherers>90</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>special/pyramid_minor.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml	(revision 22821)
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint replace="">
     <Circle radius="1.5"/>
     <Height>2.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Celtic Standing Stone</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="2.0" depth="2.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/standing_stones.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml	(revision 22821)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint replace="">
     <Square width="4.0" depth="4.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Ptolemaic Egyptian Statues</SpecificName>
     <Icon>structures/statue.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="3.5" depth="3.5"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>props/special/eyecandy/statues_ptol.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml	(revision 22821)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint replace="">
     <Square width="4.0" depth="4.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Kushite Statue</SpecificName>
     <Icon>structures/statue.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="3.5" depth="3.5"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>props/special/eyecandy/statues_kush.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml	(revision 22821)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint replace="">
     <Square width="4.0" depth="4.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Roman Statues</SpecificName>
     <Icon>structures/statue.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="3.5" depth="3.5"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>props/special/eyecandy/statues_roman.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml	(revision 22821)
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_ruins">
   <Footprint replace="">
     <Square width="19.0" depth="31.5"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Unfinished Greek Temple</SpecificName>
-    <Tooltip>This temple is unfinished and has fallen to ruin.</Tooltip>
     <Icon>structures/temple.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>2000</Amount>
     <MaxGatherers>30</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>props/special/eyecandy/greek_temple_unfinished.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml	(revision 22821)
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
   <Footprint>
     <Square width="20.0" depth="10.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Shipwreck</SpecificName>
-    <Tooltip>A decaying military shipwreck. A good opportunity for any businessman.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="10.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <Amount>500</Amount>
     <Type>treasure.wood</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/shipwreck_ram_side.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml	(revision 22821)
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
   <Footprint>
     <Square width="21.0" depth="11.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Shipwreck</SpecificName>
-    <Tooltip>A shipwreck with much loss of life. A good opportunity for any businessman.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="21.0" depth="11.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <Amount>550</Amount>
     <Type>treasure.wood</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/shipwreck_ram_bow.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml	(revision 22821)
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
   <Footprint>
     <Square width="7.0" depth="14.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Shipwreck</SpecificName>
-    <Tooltip>The wreck of a small cargo ship. A good opportunity for any businessman.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="8.0" depth="14.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <Amount>400</Amount>
     <Type>treasure.wood</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/shipwreck_sail_boat.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml	(revision 22821)
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
   <Footprint>
     <Square width="9.0" depth="17.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Shipwreck</SpecificName>
-    <Tooltip>A cargo ship rammed in half. A good opportunity for any businessman.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="9.0" depth="17.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <Amount>450</Amount>
     <Type>treasure.wood</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/shipwreck_sail_boat_cut.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml	(revision 22821)
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
   <Footprint>
     <Circle radius="10.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Identity>
     <GenericName>Fish</GenericName>
     <Classes datatype="tokens">SeaCreature</Classes>
-    <Tooltip>Gather food from this bountiful oceanic resource.</Tooltip>
+    <Tooltip>Catch fish for food.</Tooltip>
   </Identity>
   <Minimap>
     <Type>food</Type>
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <Obstruction>
     <Unit/>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
     <BlockFoundation>false</BlockFoundation>
     <DeleteUponConstruction>true</DeleteUponConstruction>
   </Obstruction>
   <Position>
     <Altitude>-2.0</Altitude>
     <Floating>true</Floating>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>4</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Outline>
         <LineThickness>0.2</LineThickness>
       </Outline>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
 </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 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml	(revision 22821)
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
   <Identity>
     <Classes datatype="tokens">ForestPlant</Classes>
     <Icon>gaia/flora_tree_generic.png</Icon>
+    <Tooltip>Chop trees for wood.</Tooltip>
   </Identity>
   <Minimap>
     <Type>wood</Type>
     <Color r="69" g="107" b="68"/>
   </Minimap>
   <Obstruction>
     <Static width="1.6" depth="1.6"/>
     <!-- Trees are deleted as a workaround for gates until random maps are smart enough to not place trees inside walls -->
     <DeleteUponConstruction>true</DeleteUponConstruction>
   </Obstruction>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>200</Amount>
     <Type>wood.tree</Type>
     <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Outline disable=""/>
       <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_berry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml	(revision 22821)
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush">
+  <Identity>
+    <Tooltip>Pick fruit for food.</Tooltip>
+  </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>
     <Amount>200</Amount>
     <Type>food.fruit</Type>
   </ResourceSupply>
   <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 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml	(revision 22821)
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora">
   <Footprint>
     <Circle radius="2.5"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Tree</GenericName>
-    <Tooltip>Chop down to accumulate Wood.</Tooltip>
   </Identity>
   <StatusBars>
     <BarWidth>3.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>10.0</HeightOffset>
   </StatusBars>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree_fruit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree_fruit.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree_fruit.xml	(revision 22821)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Tooltip disable=""/>
     <Icon>gaia/flora_bush_berry.png</Icon>
+    <Tooltip>Pick fruit for food.</Tooltip>
   </Identity>
   <Minimap>
     <Type>food</Type>
     <Color r="155" g="204" b="102"/>
   </Minimap>
   <Obstruction>
     <Static width="3.0" depth="3.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>400</Amount>
     <Type>food.fruit</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/resource/sel_fruit.xml</select>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml	(revision 22821)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo">
   <Identity>
     <GenericName>Metal Mine</GenericName>
-    <Tooltip>A mineral deposit, providing access to rare forms of precious Metal.</Tooltip>
+    <Tooltip>Mine ore for metal.</Tooltip>
     <Icon>gaia/geology_metal.png</Icon>
   </Identity>
   <Minimap>
     <Type>metal</Type>
     <Color r="227" g="159" b="12"/>
   </Minimap>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>metal.ore</Type>
     <MaxGatherers>12</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/resource/sel_metal.xml</select>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml	(revision 22821)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo">
   <Identity>
     <GenericName>Stone Quarry</GenericName>
-    <Tooltip>Mine these to provide Stone building material.</Tooltip>
+    <Tooltip>Quarry rock for stone.</Tooltip>
     <Icon>gaia/geology_stone_1.png</Icon>
   </Identity>
   <Minimap>
     <Type>stone</Type>
     <Color r="170" g="170" b="170"/>
   </Minimap>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>stone.rock</Type>
     <MaxGatherers>12</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/resource/sel_stone.xml</select>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml	(revision 22821)
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
   <Footprint>
     <Circle radius="4.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Identity>
     <GenericName>Ruins</GenericName>
-    <Tooltip>These ruins that can be mined for resources.</Tooltip>
+    <Tooltip>Demolish ruins for stone.</Tooltip>
     <Icon>gaia/geology_stone_1.png</Icon>
   </Identity>
   <Minimap>
     <Type>stone</Type>
     <Color r="128" g="128" b="128"/>
   </Minimap>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>500</Amount>
     <Type>stone.ruins</Type>
     <MaxGatherers>1</MaxGatherers>
   </ResourceSupply>
   <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>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml	(revision 22821)
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
   <Footprint replace="">
     <Square width="2.0" depth="2.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Treasure</GenericName>
-    <Tooltip>A treasure that can be quickly gathered.</Tooltip>
+    <Tooltip>Collect treasures for resources.</Tooltip>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Minimap>
     <Type>metal</Type>
     <Color r="250" g="250" b="250"/>
   </Minimap>
   <Obstruction>
     <Static width="1.5" depth="1.5"/>
   </Obstruction>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>300</Amount>
-    <Type>treasure.metal</Type>
     <MaxGatherers>1</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Outline>
         <LineThickness>0.3</LineThickness>
       </Outline>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_universal.xml</select>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>3.75</HeightOffset>
   </StatusBars>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml	(revision 22820)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml	(revision 22821)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Health>
     <Max>50</Max>
     <DeathType>remain</DeathType>
   </Health>
+  <Identity>
+    <Tooltip>Kill to gather meat for food.</Tooltip>
+  </Identity>
   <Loot>
     <xp>10</xp>
   </Loot>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>100</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
 </Entity>