diff --git a/binaries/data/mods/public/art/textures/cursors/action-gather-ruins.png b/binaries/data/mods/public/art/textures/cursors/action-gather-ruins.png
index e7c1f46060..576252cd88 100644
--- a/binaries/data/mods/public/art/textures/cursors/action-gather-ruins.png
+++ b/binaries/data/mods/public/art/textures/cursors/action-gather-ruins.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ea165f310cd437015af1274e84e0e8a42cf761662c97eb6ca6898cb1fe7fb1b
-size 2519
+oid sha256:8c002932ca691ccba481055b1317652af3d6aaa0b643a83eec87449b5713a2f9
+size 2446
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_shipwreck.xml b/binaries/data/mods/public/simulation/templates/gaia/special_shipwreck.xml
deleted file mode 100644
index 6dd5b0856c..0000000000
--- a/binaries/data/mods/public/simulation/templates/gaia/special_shipwreck.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_ruins">
-  <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Ruins</GenericName>
-    <SpecificName>Shipwreck</SpecificName>
-    <Icon>units/hele_ship_merchant.png</Icon>
-  </Identity>
-  <ResourceSupply>
-    <Amount>1000</Amount>
-    <Type>wood.ruins</Type>
-  </ResourceSupply>
-  <VisualActor>
-    <Actor>props/special/eyecandy/shipwreck_hull.xml</Actor>
-  </VisualActor>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>2.5</Height>
-  </Footprint>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food.xml
index 91b22e9dd6..0046392b12 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food.xml
@@ -13,7 +13,7 @@
   <VisualActor>
     <Actor>props/special/eyecandy/barrel_a.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="1.0"/>
     <Height>2.5</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
index 8c9e2c6811..b42cd07553 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
@@ -13,7 +13,7 @@
   <VisualActor>
     <Actor>special/golden_fleece.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="1.0"/>
     <Height>2.5</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_metal.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_metal.xml
index 082493ec8f..b31c26d8ad 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_metal.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_metal.xml
@@ -13,7 +13,7 @@
   <VisualActor>
     <Actor>props/special/eyecandy/barrel_a.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="1.0"/>
     <Height>2.5</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_stone.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_stone.xml
index 3eff596c58..01e5ba7ada 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_stone.xml
@@ -13,7 +13,7 @@
   <VisualActor>
     <Actor>props/special/eyecandy/barrel_a.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="1.0"/>
     <Height>2.5</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_wood.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_wood.xml
index 2602290812..3ea749808d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_wood.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_wood.xml
@@ -13,7 +13,7 @@
   <VisualActor>
     <Actor>props/special/eyecandy/barrel_a.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="1.0"/>
     <Height>2.5</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml
index fcaa2dd0d5..26f32618d7 100644
--- a/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml
@@ -18,6 +18,13 @@
   <Health>
     <Max>5000</Max>
   </Health>
+  <Loot>
+    <xp>50</xp>
+    <food>0</food>
+    <wood>0</wood>
+    <stone>500</stone>
+    <metal>500</metal>
+  </Loot>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
     <Actor>structures/hellenes/temple_epic.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck.xml b/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck.xml
index af76a37da2..def1c75e6c 100644
--- a/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck.xml
+++ b/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_treasure">
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
-    <SpecificName>Shipwreck Cargo</SpecificName>
+    <SpecificName>Shipwreck</SpecificName>
+    <Tooltip>A shipwreck with much loss of life. A good opportunity for any businessman.</Tooltip>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Position>
@@ -11,12 +12,12 @@
   </Position>
   <ResourceSupply>
     <Amount>1000</Amount>
-    <Type>metal.treasure</Type>
+    <Type>wood.treasure</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/shipwreck_hull.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="12.0"/>
     <Height>2.5</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml b/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml
index 0d1f15fef0..c070a2f2c1 100644
--- a/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml
+++ b/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_treasure">
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
@@ -11,12 +11,12 @@
   </Position>
   <ResourceSupply>
     <Amount>500</Amount>
-    <Type>metal.treasure</Type>
+    <Type>food.treasure</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>props/special/eyecandy/barrels_floating.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="4.0"/>
     <Height>2.5</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml b/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml
index 8e0a94db8d..20e7669308 100644
--- a/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
+<Entity parent="template_gaia_ruins">
   <Identity>
     <Civ>hele</Civ>
     <GenericName>Ruins</GenericName>
@@ -8,25 +8,13 @@
 	<Tooltip>This temple is unfinished and has fallen to ruin.</Tooltip>
     <Icon>structures/temple.png</Icon>
   </Identity>
-  <Health>
-    <Max>1500</Max>
-  </Health>
-  <Armour>
-    <Hack>40.0</Hack>
-    <Pierce>50.0</Pierce>
-    <Crush>50.0</Crush>
-  </Armour>
   <Loot>
     <xp>10</xp>
-    <food>0</food>
-    <wood>0</wood>
-    <stone>1000</stone>
-    <metal>500</metal>
   </Loot>
   <VisualActor>
     <Actor>props/special/eyecandy/greek_temple_unfinished.xml</Actor>
   </VisualActor>
-  <Footprint>
+  <Footprint replace="">
     <Square width="19.0" depth="31.5"/>
     <Height>12.0</Height>
   </Footprint>
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 bb54ec3484..c8184d2a86 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
@@ -11,11 +11,11 @@
     <Colour r="128" g="128" b="128"/>
   </Minimap>
   <Footprint>
-    <Circle radius="1.0"/>
-    <Height>1.0</Height>
+    <Circle radius="4.0"/>
+    <Height>2.5</Height>
   </Footprint>
   <Obstruction>
-    <Unit radius="1.0"/>
+    <Static width="7.0" depth="7.0"/>
   </Obstruction>
   <Selectable/>
   <ResourceSupply>
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 2a3b330896..fe32481394 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
@@ -10,12 +10,12 @@
     <Type>metal</Type>
     <Colour r="192" g="192" b="0"/>
   </Minimap>
-  <Footprint>
-    <Circle radius="1.0"/>
-    <Height>1.0</Height>
+  <Footprint replace="">
+    <Square width="19.0" depth="31.5"/>
+    <Height>12.0</Height>
   </Footprint>
   <Obstruction>
-    <Unit radius="1.0"/>
+    <Static width="17.5" depth="30.0"/>
   </Obstruction>
   <Selectable/>
   <ResourceSupply>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 2114e20c31..c20315146d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -43,7 +43,10 @@
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
-      <metal.treasure>10000</metal.treasure>
+	  <food.treasure>100</food.treasure>
+	  <wood.treasure>100</wood.treasure>
+	  <stone.treasure>100</stone.treasure>
+      <metal.treasure>100</metal.treasure>
     </Rates>
   </ResourceGatherer>
   <UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 5b2173aaa7..297458632e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -30,10 +30,6 @@
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.meat>40</food.meat>
-	  <food.treasure>10000</food.treasure>
-	  <wood.treasure>10000</wood.treasure>
-	  <stone.treasure>10000</stone.treasure>
-	  <metal.treasure>10000</metal.treasure>
     </Rates>
   </ResourceGatherer>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 4d4dfc3bbe..f0c8750f72 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -33,15 +33,11 @@
       <food.fruit>0.5</food.fruit>
       <food.grain>0.5</food.grain>
       <food.meat>5</food.meat>
-	  <food.treasure>10000</food.treasure>
 	  <wood.tree>1</wood.tree>
-	  <wood.ruins>5</wood.ruins>
-	  <wood.treasure>10000</wood.treasure>
+	  <wood.ruins>10</wood.ruins>
       <stone.rock>1</stone.rock>
-	  <stone.ruins>3</stone.ruins>
-	  <stone.treasure>10000</stone.treasure>
+	  <stone.ruins>10</stone.ruins>
       <metal.ore>1</metal.ore>
-	  <metal.treasure>10000</metal.treasure>
     </Rates>
   </ResourceGatherer>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
index 5691cb186e..d6195ad4fc 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
@@ -24,12 +24,6 @@
     <Pierce>10.0</Pierce>
     <Crush>1.0</Crush>
   </Armour>
-  <ResourceGatherer>
-    <MaxDistance>6.0</MaxDistance>
-    <Rates>
-      <metal.treasure>100</metal.treasure>
-    </Rates>
-  </ResourceGatherer>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
index 91af308faa..e382723263 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
@@ -27,9 +27,6 @@
   </Vision>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
-    <Rates>
-      <metal.treasure>20</metal.treasure>
-    </Rates>
   </ResourceGatherer>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
index 018ffbd063..e8a1899219 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
@@ -24,9 +24,6 @@
   </Armour>
   <ResourceGatherer>
     <MaxDistance>10.0</MaxDistance>
-    <Rates>
-      <metal.treasure>20</metal.treasure>
-    </Rates>
   </ResourceGatherer>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 2873e04dac..0de4398919 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -18,15 +18,11 @@
       <food.fruit>2</food.fruit>
       <food.grain>2</food.grain>
       <food.meat>2</food.meat>
-	  <stone.treasure>10000</stone.treasure>
       <wood.tree>0.75</wood.tree>
-	  <wood.ruins>2</wood.ruins>
-	  <wood.treasure>10000</wood.treasure>
+      <wood.ruins>5</wood.ruins>
       <stone.rock>0.75</stone.rock>
-	  <stone.ruins>2.25</stone.ruins>
-	  <stone.treasure>10000</stone.treasure>
+      <stone.ruins>5</stone.ruins>
       <metal.ore>0.75</metal.ore>
-	  <metal.treasure>10000</metal.treasure>
     </Rates>
   </ResourceGatherer>
   <Health>