Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_alpine.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_alpine.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_alpine.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_ore">
   <VisualActor>
     <Actor>geology/metalmine_alpine.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_alpine_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_alpine_slabs.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_alpine_slabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral_slabs">
+<Entity parent="template_gaia_ore_large">
   <VisualActor>
     <Actor>geology/metalmine_alpine_slabs.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_badlands_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_badlands_slabs.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_badlands_slabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral_slabs">
+<Entity parent="template_gaia_ore_large">
   <VisualActor>
     <Actor>geology/metalmine_desert_badlands_slabs.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_slabs.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_slabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral_slabs">
+<Entity parent="template_gaia_ore_large">
   <VisualActor>
     <Actor>geology/metalmine_desert_slabs.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_small.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_small.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_desert_small.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_ore">
   <VisualActor>
     <Actor>geology/metalmine_desert_small.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_greek.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_greek.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_greek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_ore">
   <VisualActor>
     <Actor>geology/metalmine_granite_greek.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_mediterranean.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_mediterranean.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_mediterranean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_ore">
   <VisualActor>
     <Actor>geology/metalmine_mediterranean.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_mediterranean_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_mediterranean_slabs.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_mediterranean_slabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral_slabs">
+<Entity parent="template_gaia_ore_large">
   <VisualActor>
     <Actor>geology/metalmine_mediterranean_slabs.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_savanna_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_savanna_slabs.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_savanna_slabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral_slabs">
+<Entity parent="template_gaia_ore_large">
   <VisualActor>
     <Actor>geology/metalmine_savanna_slabs.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_temperate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_temperate.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_temperate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_ore">
   <VisualActor>
     <Actor>geology/metalmine_granite_temperate.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_temperate_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_temperate_slabs.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_temperate_slabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral_slabs">
+<Entity parent="template_gaia_ore_large">
   <VisualActor>
     <Actor>geology/metalmine_temperate_slabs.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_tropic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_tropic.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_tropic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_ore">
   <VisualActor>
     <Actor>geology/metalmine_tropic.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_metal_tropic_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_metal_tropic_slabs.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_metal_tropic_slabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral_slabs">
+<Entity parent="template_gaia_ore_large">
   <VisualActor>
     <Actor>geology/metalmine_tropic_slabs.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_alpine_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_alpine_a.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_alpine_a.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <VisualActor>
     <Actor>geology/stonemine_alpine_a.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_desert_quarried.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_desert_quarried.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_desert_quarried.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <Footprint>
     <Circle radius="4.25"/>
     <Height>4.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_desert_small.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_desert_small.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_desert_small.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <Footprint>
     <Circle radius="4.25"/>
     <Height>4.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_greek.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_greek.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_greek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <VisualActor>
     <Actor>geology/stonemine_granite_greek.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_mediterranean.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_mediterranean.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_mediterranean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <VisualActor>
     <Actor>geology/stonemine_mediterranean.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_savanna_quarried.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_savanna_quarried.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_savanna_quarried.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <Footprint>
     <Circle radius="4.25"/>
     <Height>4.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_savanna_small.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_savanna_small.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_savanna_small.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <Footprint>
     <Circle radius="4.25"/>
     <Height>4.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_temperate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_temperate.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_temperate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <VisualActor>
     <Actor>geology/stonemine_granite.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stone_tropic_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stone_tropic_a.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stone_tropic_a.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <VisualActor>
     <Actor>geology/stonemine_tropic.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_alpine_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_alpine_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_alpine_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_alpine_quarry.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_badlands_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_badlands_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_badlands_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_desert_badlands_new.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_desert_quarry.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_medit_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_medit_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_medit_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_medit_quarry.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_savanna_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_savanna_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_savanna_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_savanna_formations.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_formation.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_formation.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_formation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <Footprint replace="">
     <Square width="24.0" depth="16.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_granite_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_granite_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_granite_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_granite_large.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_temperate_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_temperate_quarry.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_tropic_quarry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_tropic_quarry.xml
+++ binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_tropic_quarry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock_slabs">
+<Entity parent="template_gaia_rock_large">
   <VisualActor>
     <Actor>geology/stonemine_tropic_quarry.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_treasure">
   <Footprint replace="">
     <Circle radius="1.0"/>
     <Height>2.5</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
-  <Footprint>
+<Entity parent="template_gaia_treasure">
+  <Footprint replace="">
     <Circle radius="2.0"/>
     <Height>2.0</Height>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/template_gaia_geo.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_geo.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia">
-  <Footprint>
-    <Circle radius="5.0"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Generic Geology</GenericName>
-  </Identity>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
-  <Position>
-    <Anchor>pitch-roll</Anchor>
-  </Position>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo">
-  <Identity>
-    <GenericName>Metal Mine</GenericName>
-    <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: binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral_slabs.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral_slabs.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
-  <Footprint>
-    <Circle radius="10.0"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="13.0" depth="13.0"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Amount>5000</Amount>
-    <MaxGatherers>24</MaxGatherers>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/resource/sel_metal.xml</select>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo">
-  <Identity>
-    <GenericName>Stone Quarry</GenericName>
-    <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: binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
-  <Footprint>
-    <Circle radius="10.0"/>
-    <Height>3.5</Height>
-  </Footprint>
-  <Obstruction>
-    <Static width="13.0" depth="13.0"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Amount>5000</Amount>
-    <MaxGatherers>24</MaxGatherers>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/resource/sel_stone.xml</select>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_gaia_ore.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_ore.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_ore.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo">
+<Entity parent="template_gaia">
+  <Footprint>
+    <Circle radius="5.0"/>
+    <Height>3.5</Height>
+  </Footprint>
   <Identity>
     <GenericName>Metal Mine</GenericName>
     <Tooltip>Mine ore for metal.</Tooltip>
@@ -9,6 +13,12 @@
     <Type>metal</Type>
     <Color r="227" g="159" b="12"/>
   </Minimap>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
+  <Position>
+    <Anchor>pitch-roll</Anchor>
+  </Position>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
Index: binaries/data/mods/public/simulation/templates/template_gaia_ore_large.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_ore_large.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_ore_large.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_mineral">
+<Entity parent="template_gaia_ore">
   <Footprint>
     <Circle radius="10.0"/>
     <Height>3.5</Height>
@@ -11,14 +11,8 @@
     <Amount>5000</Amount>
     <MaxGatherers>24</MaxGatherers>
   </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/resource/sel_metal.xml</select>
-    </SoundGroups>
-  </Sound>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>8.0</HeightOffset>
+    <BarWidth>5.0</BarWidth>
+    <BarHeight>0.5</BarHeight>
   </StatusBars>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_gaia_rock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_rock.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_rock.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo">
+<Entity parent="template_gaia">
+  <Footprint>
+    <Circle radius="5.0"/>
+    <Height>3.5</Height>
+  </Footprint>
   <Identity>
     <GenericName>Stone Quarry</GenericName>
     <Tooltip>Quarry rock for stone.</Tooltip>
@@ -9,6 +13,12 @@
     <Type>stone</Type>
     <Color r="170" g="170" b="170"/>
   </Minimap>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
+  <Position>
+    <Anchor>pitch-roll</Anchor>
+  </Position>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
Index: binaries/data/mods/public/simulation/templates/template_gaia_rock_large.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_rock_large.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_rock_large.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_geo_rock">
+<Entity parent="template_gaia_rock">
   <Footprint>
     <Circle radius="10.0"/>
     <Height>3.5</Height>
@@ -11,14 +11,8 @@
     <Amount>5000</Amount>
     <MaxGatherers>24</MaxGatherers>
   </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/resource/sel_stone.xml</select>
-    </SoundGroups>
-  </Sound>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>8.0</HeightOffset>
+    <BarWidth>5.0</BarWidth>
+    <BarHeight>0.5</BarHeight>
   </StatusBars>
 </Entity>