diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
index a3f7410388..a1a643f814 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
@@ -2,7 +2,6 @@
 <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>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml
index a2b7d91453..5ef4d9a1bc 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml
@@ -2,7 +2,6 @@
 <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>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banana.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banana.xml
index 7dedac531f..05bc516656 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banana.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banana.xml
@@ -2,7 +2,6 @@
 <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>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
index 39204fc748..bccd343060 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
@@ -5,7 +5,6 @@
   </Footprint>
   <Identity>
     <SpecificName>Fig</SpecificName>
-    <Tooltip>Gather figs for Food.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="5.0" depth="5.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
index 6e651e6053..7b9205a856 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
@@ -10,7 +10,6 @@
   </Identity>
   <ResourceSupply>
     <Amount>500</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/column_doric_fallen.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
index c1a0235f5b..fb15e9c7b9 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
@@ -16,7 +16,6 @@
   </Position>
   <ResourceSupply>
     <Amount>10000</Amount>
-    <Type>stone.ruins</Type>
     <MaxGatherers>120</MaxGatherers>
   </ResourceSupply>
   <Sound>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
index 724def425a..eb127736e7 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
@@ -13,7 +13,6 @@
   </Obstruction>
   <ResourceSupply>
     <Amount>5000</Amount>
-    <Type>stone.ruins</Type>
     <MaxGatherers>90</MaxGatherers>
   </ResourceSupply>
   <Sound>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
index d46cfbfc22..908782958c 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
@@ -13,7 +13,6 @@
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/standing_stones.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
index 4bfcf50fe5..211e38947f 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
@@ -13,7 +13,6 @@
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
index 7f9a86356f..a797ef4bb7 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
@@ -13,7 +13,6 @@
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
index 057124688c..dbedaa0821 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
@@ -13,7 +13,6 @@
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
-    <Type>stone.ruins</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
index 2d6889f843..d09d90e3be 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
@@ -6,7 +6,6 @@
   </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>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
index f019d91c6e..5e5e07a5d1 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
@@ -6,7 +6,6 @@
   </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"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
index 675eca2d53..6b2191c1a2 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
@@ -6,7 +6,6 @@
   </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"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
index 842139e219..3a1ba456e5 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
@@ -6,7 +6,6 @@
   </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"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
index 52363771f8..c471ff1c51 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
@@ -6,7 +6,6 @@
   </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"/>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml b/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
index 4267103b1b..5a7aa7b725 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
@@ -7,7 +7,7 @@
   <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>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml b/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml
index 001a5af3af..5c9c29e19a 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Classes datatype="tokens">ForestPlant</Classes>
     <Icon>gaia/flora_tree_generic.png</Icon>
+    <Tooltip>Chop trees for wood.</Tooltip>
   </Identity>
   <Minimap>
     <Type>wood</Type>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml b/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
index f0390c70e1..061f7bd050 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
@@ -1,5 +1,8 @@
 <?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"/>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml b/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml
index 067ae61805..473eb4538a 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml
@@ -6,7 +6,6 @@
   </Footprint>
   <Identity>
     <GenericName>Tree</GenericName>
-    <Tooltip>Chop down to accumulate Wood.</Tooltip>
   </Identity>
   <StatusBars>
     <BarWidth>3.0</BarWidth>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree_fruit.xml b/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree_fruit.xml
index 079ab8a7dd..352e4d0d2e 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree_fruit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_flora_tree_fruit.xml
@@ -4,8 +4,8 @@
     <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>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml b/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
index a155971a7d..e64d2485eb 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
@@ -2,7 +2,7 @@
 <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>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
index 19bde58469..14a2f823d9 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
@@ -2,7 +2,7 @@
 <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>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
index 55cef2ab40..5fe76b1224 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
@@ -6,7 +6,7 @@
   </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>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml b/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
index b473122224..f4967c11a2 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
@@ -6,7 +6,7 @@
   </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>
@@ -19,7 +19,6 @@
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>300</Amount>
-    <Type>treasure.metal</Type>
     <MaxGatherers>1</MaxGatherers>
   </ResourceSupply>
   <Selectable>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
index 42c7cd8b6a..1cba253506 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
@@ -3,6 +3,9 @@
   <Health>
     <DeathType>remain</DeathType>
   </Health>
+  <Identity>
+    <Tooltip>Kill to gather meat for food.</Tooltip>
+  </Identity>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>100</Amount>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
index 3406795675..d641b3dc21 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
@@ -4,6 +4,9 @@
     <Max>50</Max>
     <DeathType>remain</DeathType>
   </Health>
+  <Identity>
+    <Tooltip>Kill to gather meat for food.</Tooltip>
+  </Identity>
   <Loot>
     <xp>10</xp>
   </Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
index 988590ec48..aae913a730 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
@@ -6,7 +6,7 @@
     <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>