Index: binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -8,7 +8,7 @@
   </Cost>
   <GarrisonHolder>
     <Max>15</Max>
-    <List datatype="tokens">Support Cavalry</List>
+    <List datatype="tokens">Support Cavalry Relic</List>
   </GarrisonHolder>
   <Health>
     <Max>240</Max>
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
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
-      <AttackName>Bow</AttackName>
+      <AttackName>Arrow</AttackName>
       <Damage>
         <Pierce>12</Pierce>
       </Damage>
@@ -25,12 +25,8 @@
       <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <BuildingAI>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
-  </BuildingAI>
   <GarrisonHolder>
-    <List datatype="tokens">Support Soldier</List>
+    <List datatype="tokens">Support Soldier Relic</List>
   </GarrisonHolder>
   <Identity>
     <GenericName>Light Warship</GenericName>
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
@@ -4,12 +4,12 @@
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
-        <Crush>225</Crush>
+        <Crush>200</Crush>
       </Damage>
       <MaxRange>85</MaxRange>
       <MinRange>26</MinRange>
-      <PrepareTime>2000</PrepareTime>
-      <RepeatTime>7000</RepeatTime>
+      <PrepareTime>3000</PrepareTime>
+      <RepeatTime>6000</RepeatTime>
       <Projectile>
         <Speed>40</Speed>
         <Spread>6</Spread>
@@ -33,11 +33,6 @@
       </Splash>
     </Ranged>
   </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-    <MaxArrowCount>10</MaxArrowCount>
-    <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
-  </BuildingAI>
   <Cost>
     <Population>5</Population>
     <BuildTime>30</BuildTime>
@@ -52,7 +47,7 @@
   </Footprint>
   <GarrisonHolder>
     <Max>50</Max>
-    <List datatype="tokens">Support Soldier Siege</List>
+    <List datatype="tokens">Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
@@ -81,6 +76,6 @@
     <Acceleration op="mul">1.8</Acceleration>
   </UnitMotion>
   <Vision>
-    <Range>120</Range>
+    <Range>100</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
@@ -1,9 +1,5 @@
 <?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>
@@ -36,6 +32,6 @@
     <Acceleration op="mul">1.55</Acceleration>
   </UnitMotion>
   <Vision>
-    <Range>90</Range>
+    <Range>60</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
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_warship">
-  <BuildingAI>
-    <DefaultArrowCount>3</DefaultArrowCount>
-    <MaxArrowCount>13</MaxArrowCount>
-  </BuildingAI>
+  <Attack>
+    <Ranged>
+      <AttackName>Arrow</AttackName>
+      <Damage>
+        <Pierce op="mul">1.5</Pierce>
+      </Damage>
+      <MaxRange op="mul">1.25</MaxRange>
+    </Ranged>
+  </Attack>
   <Cost>
     <Population>3</Population>
     <BuildTime>25</BuildTime>
@@ -38,6 +43,6 @@
     <Acceleration op="mul">1.8</Acceleration>
   </UnitMotion>
   <Vision>
-    <Range>90</Range>
+    <Range>80</Range>
   </Vision>
 </Entity>