Index: binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_fish">
+<Entity parent="template_gaia_fish">
   <Identity>
-    <GenericName>Fish</GenericName>
     <SpecificName>Fish</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_fish">
+<Entity parent="template_gaia_fish">
   <Identity>
-    <GenericName>Tilapia</GenericName>
-    <SpecificName>Fish</SpecificName>
+    <SpecificName>Tilapia</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_fish">
+<Entity parent="template_gaia_fish">
   <Identity>
-    <GenericName>Tuna</GenericName>
-    <SpecificName>Fish</SpecificName>
+    <SpecificName>Tuna</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
+++ binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Armour disable=""/>
-  <Footprint replace="">
+<Entity parent="template_gaia">
+  <Footprint>
     <Circle radius="10.0"/>
     <Height>2.5</Height>
   </Footprint>
-  <Health disable=""/>
   <Identity>
+    <GenericName>Fish</GenericName>
     <Classes datatype="tokens">SeaCreature</Classes>
     <Tooltip>Gather food from this bountiful oceanic resource.</Tooltip>
   </Identity>
+  <Minimap>
+    <Type>food</Type>
+    <Color r="227" g="130" b="141"/>
+  </Minimap>
   <Obstruction>
+    <BlockFoundation>false</BlockFoundation>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
     <DeleteUponConstruction>true</DeleteUponConstruction>
@@ -18,7 +22,7 @@
   <Position>
     <Altitude>-2.0</Altitude>
     <Floating>true</Floating>
-    <FloatDepth>0.0</FloatDepth>
+    <Active>true</Active>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
@@ -27,8 +31,8 @@
     <MaxGatherers>4</MaxGatherers>
   </ResourceSupply>
   <Selectable>
+    <EditorOnly disable=""/>
     <Overlay>
-      <Texture disable=""/>
       <Outline>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
@@ -41,6 +45,4 @@
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
-  <UnitAI disable=""/>
-  <UnitMotion disable=""/>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Armour disable=""/>
-  <Footprint replace="">
-    <Circle radius="10.0"/>
-    <Height>2.5</Height>
-  </Footprint>
-  <Health disable=""/>
-  <Identity>
-    <Classes datatype="tokens">SeaCreature</Classes>
-    <Tooltip>Gather food from this bountiful oceanic resource.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <BlockMovement>false</BlockMovement>
-    <BlockPathfinding>false</BlockPathfinding>
-    <DeleteUponConstruction>true</DeleteUponConstruction>
-  </Obstruction>
-  <Position>
-    <Altitude>-2.0</Altitude>
-    <Floating>true</Floating>
-    <FloatDepth>0.0</FloatDepth>
-  </Position>
-  <ResourceSupply>
-    <KillBeforeGather>false</KillBeforeGather>
-    <Amount>1000</Amount>
-    <Type>food.fish</Type>
-    <MaxGatherers>4</MaxGatherers>
-  </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture disable=""/>
-      <Outline>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.2</LineThickness>
-      </Outline>
-    </Overlay>
-  </Selectable>
-  <StatusBars>
-    <BarWidth>4.0</BarWidth>
-    <BarHeight>0.666</BarHeight>
-    <HeightOffset>5.0</HeightOffset>
-  </StatusBars>
-  <UnitAI disable=""/>
-  <UnitMotion disable=""/>
-</Entity>