Index: binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship">
-  <Attack>
-    <Ranged>
-      <AttackName>Bow</AttackName>
-      <Damage>
-        <Pierce>12</Pierce>
-      </Damage>
-      <MaxRange>45</MaxRange>
-      <PrepareTime>1000</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Bonuses>
-        <BonusShip>
-          <Classes>Ship</Classes>
-          <Multiplier>3.0</Multiplier>
-        </BonusShip>
-      </Bonuses>
-      <Projectile>
-        <Speed>100</Speed>
-        <Spread>2</Spread>
-        <Gravity>50</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>2</DefaultArrowCount>
-    <MaxArrowCount>10</MaxArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
-  </BuildingAI>
-  <Cost>
-    <Population>2</Population>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <wood>120</wood>
-      <metal>60</metal>
-    </Resources>
-  </Cost>
-  <GarrisonHolder>
-    <Max>20</Max>
-    <List datatype="tokens">Support Cavalry</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>800</Max>
-  </Health>
-  <Identity>
-    <GenericName>Light Warship</GenericName>
-    <Tooltip>Garrison units for transport and to increase firepower. Deals triple damage against Ships.</Tooltip>
-    <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <xp>80</xp>
-    <wood>24</wood>
-    <metal>12</metal>
-  </Loot>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/cartouche.png</MainTexture>
-        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.55</WalkSpeed>
-    <Acceleration op="mul">1.55</Acceleration>
-  </UnitMotion>
-  <Vision>
-    <Range>90</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship">
-  <Attack>
-    <Ranged>
-      <AttackName>Stone</AttackName>
-      <Damage>
-        <Crush>150</Crush>
-      </Damage>
-      <MaxRange>100</MaxRange>
-      <MinRange>40</MinRange>
-      <PrepareTime>2000</PrepareTime>
-      <RepeatTime>5000</RepeatTime>
-      <Projectile>
-        <Speed>40</Speed>
-        <Spread>6</Spread>
-        <Gravity>20</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Ship Structure</PreferredClasses>
-      <RangeOverlay>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.175</LineThickness>
-      </RangeOverlay>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-    <MaxArrowCount>10</MaxArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
-  </BuildingAI>
-  <Cost>
-    <Population>5</Population>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <wood>600</wood>
-      <metal>300</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="14.0" depth="56.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>50</Max>
-    <List datatype="tokens">Support Soldier Siege</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <Identity>
-    <GenericName>Heavy Warship</GenericName>
-    <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
-    <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <xp>200</xp>
-    <wood>120</wood>
-    <metal>60</metal>
-  </Loot>
-  <Position>
-    <TurnRate>4</TurnRate>
-  </Position>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/cartouche.png</MainTexture>
-        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.8</WalkSpeed>
-    <Acceleration op="mul">1.8</Acceleration>
-  </UnitMotion>
-  <Vision>
-    <Range>110</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship">
-  <Attack>
-    <Ranged>
-      <AttackName>Bow</AttackName>
-      <Damage>
-        <Pierce>12</Pierce>
-      </Damage>
-      <MaxRange>55</MaxRange>
-      <PrepareTime>1000</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Bonuses>
-        <BonusShip>
-          <Classes>Ship</Classes>
-          <Multiplier>3.0</Multiplier>
-        </BonusShip>
-      </Bonuses>
-      <Projectile>
-        <Speed>100</Speed>
-        <Spread>2</Spread>
-        <Gravity>50</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>3</DefaultArrowCount>
-    <MaxArrowCount>13</MaxArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
-  </BuildingAI>
-  <Cost>
-    <Population>3</Population>
-    <BuildTime>25</BuildTime>
-    <Resources>
-      <wood>200</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <GarrisonHolder>
-    <Max>30</Max>
-    <List datatype="tokens">Support Soldier Siege</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>1400</Max>
-  </Health>
-  <Identity>
-    <GenericName>Medium Warship</GenericName>
-    <Tooltip>Garrison units for transport and to increase firepower. Deals triple damage against Ships.</Tooltip>
-    <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <xp>140</xp>
-    <wood>40</wood>
-    <metal>20</metal>
-  </Loot>
-  <Position>
-    <TurnRate>4</TurnRate>
-  </Position>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/cartouche.png</MainTexture>
-        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.8</WalkSpeed>
-    <Acceleration op="mul">1.8</Acceleration>
-  </UnitMotion>
-  <Vision>
-    <Range>90</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_warship.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_warship.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_warship.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_ship">
+  <Attack>
+    <Ranged>
+      <AttackName>Bow</AttackName>
+      <Damage>
+        <Pierce>12</Pierce>
+      </Damage>
+      <MaxRange>45</MaxRange>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+      <Bonuses>
+        <BonusShip>
+          <Classes>Ship</Classes>
+          <Multiplier>3.0</Multiplier>
+        </BonusShip>
+      </Bonuses>
+      <Projectile>
+        <Speed>100</Speed>
+        <Spread>2</Spread>
+        <Gravity>50</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <BuildingAI>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
+  </BuildingAI>
+  <GarrisonHolder>
+    <List datatype="tokens">Support Soldier</List>
+  </GarrisonHolder>
+  <Identity>
+    <GenericName>Light Warship</GenericName>
+    <Tooltip>Garrison units for transport and to increase firepower. Deals triple damage against Ships.</Tooltip>
+    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
+  </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/cartouche.png</MainTexture>
+        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_warship_heavy.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_warship_heavy.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_warship_heavy.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_ship_warship">
+  <Attack>
+    <Ranged>
+      <AttackName>Stone</AttackName>
+      <Damage>
+        <Crush>150</Crush>
+      </Damage>
+      <MaxRange>100</MaxRange>
+      <MinRange>40</MinRange>
+      <PrepareTime>2000</PrepareTime>
+      <RepeatTime>5000</RepeatTime>
+      <Projectile>
+        <Speed>40</Speed>
+        <Spread>6</Spread>
+        <Gravity>20</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Ship Structure</PreferredClasses>
+      <RangeOverlay>
+        <LineTexture>outline_border.png</LineTexture>
+        <LineTextureMask>outline_border_mask.png</LineTextureMask>
+        <LineThickness>0.175</LineThickness>
+      </RangeOverlay>
+    </Ranged>
+  </Attack>
+  <BuildingAI>
+    <DefaultArrowCount>1</DefaultArrowCount>
+    <MaxArrowCount>10</MaxArrowCount>
+    <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
+  </BuildingAI>
+  <Cost>
+    <Population>5</Population>
+    <BuildTime>30</BuildTime>
+    <Resources>
+      <wood>600</wood>
+      <metal>300</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="14.0" depth="56.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>50</Max>
+    <List datatype="tokens">Support Soldier Siege</List>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Heavy Warship</GenericName>
+    <Tooltip>Garrison units for transport. Garrison Stone Throwers to increase firepower.</Tooltip>
+    <VisibleClasses datatype="tokens">Heavy</VisibleClasses>
+    <Classes datatype="tokens">Quinquereme</Classes>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+  <Loot>
+    <xp>200</xp>
+    <wood>120</wood>
+    <metal>60</metal>
+  </Loot>
+  <Position>
+    <TurnRate>4</TurnRate>
+  </Position>
+  <Sound>
+    <SoundGroups>
+      <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.8</WalkSpeed>
+    <Acceleration op="mul">1.8</Acceleration>
+  </UnitMotion>
+  <Vision>
+    <Range>110</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_warship_light.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_warship_light.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_warship_light.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_ship_warship">
+  <BuildingAI>
+    <DefaultArrowCount>2</DefaultArrowCount>
+    <MaxArrowCount>10</MaxArrowCount>
+  </BuildingAI>
+  <Cost>
+    <Population>2</Population>
+    <BuildTime>20</BuildTime>
+    <Resources>
+      <wood>120</wood>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
+  <GarrisonHolder>
+    <Max>20</Max>
+  </GarrisonHolder>
+  <Health>
+    <Max>800</Max>
+  </Health>
+  <Identity>
+    <GenericName>Light Warship</GenericName>
+    <VisibleClasses datatype="tokens">Light</VisibleClasses>
+    <Classes datatype="tokens">Bireme</Classes>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+  </Identity>
+  <Loot>
+    <xp>80</xp>
+    <wood>24</wood>
+    <metal>12</metal>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.55</WalkSpeed>
+    <Acceleration op="mul">1.55</Acceleration>
+  </UnitMotion>
+  <Vision>
+    <Range>90</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_warship_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_warship_medium.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_warship_medium.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_ship_warship">
+  <BuildingAI>
+    <DefaultArrowCount>3</DefaultArrowCount>
+    <MaxArrowCount>13</MaxArrowCount>
+  </BuildingAI>
+  <Cost>
+    <Population>3</Population>
+    <BuildTime>25</BuildTime>
+    <Resources>
+      <wood>200</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <GarrisonHolder>
+    <Max>30</Max>
+    <List datatype="tokens">Siege</List>
+  </GarrisonHolder>
+  <Health>
+    <Max>1400</Max>
+  </Health>
+  <Identity>
+    <GenericName>Medium Warship</GenericName>
+    <Tooltip>Garrison units for transport and to increase firepower. Deals triple damage against Ships.</Tooltip>
+    <VisibleClasses datatype="tokens">Medium</VisibleClasses>
+    <Classes datatype="tokens">Trireme</Classes>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+  </Identity>
+  <Loot>
+    <xp>140</xp>
+    <wood>40</wood>
+    <metal>20</metal>
+  </Loot>
+  <Position>
+    <TurnRate>4</TurnRate>
+  </Position>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.8</WalkSpeed>
+    <Acceleration op="mul">1.8</Acceleration>
+  </UnitMotion>
+  <Vision>
+    <Range>90</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="civ/athen|template_unit_ship_bireme">
+<Entity parent="civ/athen|template_unit_ship_warship_light">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="civ/athen|template_unit_ship_trireme">
+<Entity parent="civ/athen|template_unit_ship_warship_medium">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="9.0" depth="36.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_quinquereme">
+<Entity parent="template_unit_ship_warship_heavy">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Quinquereme</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="12.0" depth="48.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/han/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/han/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square depth="16.0" width="8.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/han/ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/han/ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_quinquereme">
+<Entity parent="template_unit_ship_warship_heavy">
   <Footprint>
     <Square depth="46.0" width="20.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/han/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/han/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square depth="34.0" width="17.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/mace/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="14.0" depth="32.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="10.0" depth="28.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/pers/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="7.0" depth="37.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/pers/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="9.0" depth="42.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_quinquereme">
+<Entity parent="template_unit_ship_warship_heavy">
   <Cost>
     <Population>5</Population>
     <BuildTime>60</BuildTime>
Index: binaries/data/mods/public/simulation/templates/units/ptol/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_quinquereme">
+<Entity parent="template_unit_ship_warship_heavy">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Octḗrēs</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/ptol/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/rome/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_quinquereme">
+<Entity parent="template_unit_ship_warship_heavy">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Quīnquerēmis Rōmāna</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/rome/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="10.0" depth="43.0"/>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/units/sele/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_quinquereme">
+<Entity parent="template_unit_ship_warship_heavy">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Pentères</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/sele/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/spart/ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/spart/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_warship_medium">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/viking_longship.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/viking_longship.xml
+++ binaries/data/mods/public/simulation/templates/units/viking_longship.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_warship_light">
   <Footprint>
     <Square width="14.0" depth="56.0"/>
     <Height>10.0</Height>
@@ -8,14 +8,6 @@
     <SpecificName>Longship</SpecificName>
     <Icon>units/viking_longship.png</Icon>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/cartouche.png</MainTexture>
-        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>structures/viking/longship.xml</Actor>
   </VisualActor>