diff --git a/binaries/data/mods/internal/simulation/templates/units/pers_ship_trireme.xml b/binaries/data/mods/internal/simulation/templates/units/pers_ship_trireme.xml
index 87ec3fdfdd..19a90d7b72 100644
--- a/binaries/data/mods/internal/simulation/templates/units/pers_ship_trireme.xml
+++ b/binaries/data/mods/internal/simulation/templates/units/pers_ship_trireme.xml
@@ -4,6 +4,7 @@
     <Civ>pers</Civ>
     <SpecificName>Trireme</SpecificName>
     <History>The first Triremes were built circa 650BC, and by 500BC the Trireme was the most widely used heavy warship of the Persian Empire. In the Trireme the outriggers were now an integral part of the ship's hull. The Trireme also had a partial or full fighting deck above the rowers. The length of the Trireme remained approximately 35-38 meters, and the beam was approximately 3.5 metres. A Trireme carried 170 oarsmen. The top speed of a Trireme was approximately 11.5 knots. Some Triremes may have been able to reach higher speeds in short bursts. The Trireme could accelerate much faster than a Bireme or Penteconter, and was much more manoeuvrable. This gave the Trireme an advantage in combat, where higher speed and manoeuvrability meant a better chance of victory.</History>
+    <Icon>units/pers_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
     <WalkSpeed>18.0</WalkSpeed>
diff --git a/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag.xml b/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag.xml
index 9176f7fba4..fcc167a288 100644
--- a/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag.xml
+++ b/binaries/data/mods/public/art/actors/props/special/common/waypoint_flag.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
+  <float/>
   <group>
     <variant frequency="100">
       <mesh>props/waypoint_flag.dae</mesh>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml b/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml
index 200db10294..f1fb85a49a 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml
@@ -1,32 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <float/>
-
   <group>
     <variant frequency="1" name="base">
-      <animations>
-        <animation file="mechanical/ship_idle.psa" name="idle" speed="100"/>
-        <animation file="mechanical/ship_move.psa" name="walk" speed="100"/>
-      </animations>
       <mesh>structural/hele_bir.pmd</mesh>
       <props>
         <prop actor="props/structures/hellenes/hele_bir1.xml" attachpoint="props_main"/>
         <prop actor="props/structures/hellenes/hele_bir2.xml" attachpoint="mast"/>
         <prop actor="props/structures/hellenes/hele_bir3.xml" attachpoint="oars"/>
-        <prop actor="units/hellenes/themistocles.xml" attachpoint="01"/>
-        <prop actor="units/hellenes/super_unit_2.xml" attachpoint="03"/>
-        <prop actor="units/hellenes/infantry_archer_e.xml" attachpoint="04"/>
-        <prop actor="units/hellenes/infantry_archer_e.xml" attachpoint="06"/>
-        <prop actor="units/hellenes/super_unit_1.xml" attachpoint="10"/>
-        <prop actor="units/hellenes/super_unit_2.xml" attachpoint="08"/>
       </props>
       <texture>structural/hele_bireme.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml b/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml
index 7e586ebe19..bdf011ffcc 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/trireme.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <float/>
-
   <group>
     <variant>
       <mesh>structural/hele_tri.pmd</mesh>
@@ -24,7 +21,5 @@
       <texture>structural/hele_trireme.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_fishing.png
index 0615557137..9e2585a849 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_fishing.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_fishing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99806ed3e4cef6164ad8d1efa1afa6d486e699677d3dbdc69075de25513f768c
-size 5412
+oid sha256:b68088d7c4a565ff65080a834d5d115dfe8b18a13666d3f15b7d47903c103c07
+size 35017
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_merchant.png
new file mode 100644
index 0000000000..cae4db1677
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_merchant.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aee58925fdfc836b04c9c7728ece5a37020f68a58ee98756a603bef7d7463cd2
+size 37352
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_trireme.png
index 58baaf44b0..0e19f61f3f 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_trireme.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_trireme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:607c2d63900a8488ee20501ce237a318416fcbafa9f7105a2b0e0af9d7ce18b2
-size 7294
+oid sha256:bdf263d5404f182fa245840128963fcc04d478ef7e913881af6998452441d145
+size 34100
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_brit.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_brit.png
index cccea994ad..2c00d265be 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_brit.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_brit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f00cf42518b249c987d4ba444b409d24ab3bcba4e4a5574a723c5dbfd468065
-size 5757
+oid sha256:1b01f59390ea70b4622ea5789df9d4f9de258bb88f234e098dc06f864e0ad738
+size 23175
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_gaul.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_gaul.png
index 7d4c943daa..99e62e6060 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_gaul.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_cavalry_gaul.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c15fd60bafd12035e83a9f41bfc4060df5d66acd1c039dd686d17608c54c19f2
-size 5459
+oid sha256:c0adb1f3bc85a82fd627ba7f9ddfa0e28dd79d9b948e5154af7fdcc56363d7d9
+size 24434
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_brit.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_brit.png
index 56b13ef5bc..78be04139b 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_brit.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_brit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef7704f97a5ba2f80dedeb5e92d9d8c845613f8832aa70a8da32c70b35ed0723
-size 5160
+oid sha256:6ac3da4d35ff1b53d2fe2e13aea925608cfc3f7a360815d005de3b52d0e94457
+size 16162
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_gaul.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_gaul.png
index 5ce1cfb702..857756c701 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_gaul.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_super_infantry_gaul.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69d7b07e6a31274defc45f1db5cdd05c9de322061f3e0a42d5baebe6ea7e087b
-size 4736
+oid sha256:4ae4991c998d823822c2c8ad8b3f1aad56093c5704305b3a896ededfeaaad9bd
+size 21633
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_trader.png
index a3594d18a0..67f43d2118 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_trader.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_trader.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d81c27ecb9ca812c2085ba7ad150e7adcdfea166d73d9ce1b557d84f7731495a
-size 5592
+oid sha256:8ebcafdac2234543d8ed13e719a4981d7d7dc9190cde321f6729574af50952cf
+size 21788
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png
index dc99a6df8d..2ac4a595f4 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06837020e4cf5080a23a92e0fd9434caa965a16fd05c85c990c72aaf991e8941
-size 7707
+oid sha256:c04b2b805fa7d911ba86c484ed4df3d9d3440a6420f09831fbbe8168993fed01
+size 16415
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_javelinist.png
index 259c8538a2..e740083744 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_javelinist.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_javelinist.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c7b0c48c148b8ffdb41bda3d560dc02cd4bd21de6c87f121818a4172731d042
-size 7579
+oid sha256:5c497cbbd6aa315078fa80850fdca61b8abcde5b4bf49e769506d9dd4b9997f8
+size 18483
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_lithobolos.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_lithobolos.png
index 911fde3dd2..12037d4fe6 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_lithobolos.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_lithobolos.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:348ee9cc00c9503e1d252ce5d60d4263e0df4ab0b1caac5624b99da1152bcebe
-size 7302
+oid sha256:15f957dd60c46eeea941539d28e72157769c71ca36e75b24ac0a96dae6c9383c
+size 20808
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_oxybeles.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_oxybeles.png
index 5b629f396d..878a273774 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_oxybeles.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_mechanical_siege_oxybeles.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02ced2ff741d0fd084a0f33000622d315d165a90bd628b8cbc32a14430cc78b8
-size 8195
+oid sha256:e35826a17a795b211d262404f92e207f22236e80cebb2b05b55fcdc3daefe9c8
+size 15333
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_bireme.png
index e8f956c093..7be9d51978 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_bireme.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_bireme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:231a0373eadb865756bd79d6441fa2a051a0f7a3a1da3cc785c26536ca62c75f
-size 8741
+oid sha256:9ee34051ff76de50f7c324077986adcefce1c692a70ee884404a275f2e4c8757
+size 41239
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_fishing.png
index 08823a0881..68281883f9 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_fishing.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_fishing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9843c2fcadc9b2846bd720964cc9f1b8c97ee9fcffe7e961bff99c81ac4a9f66
-size 3284
+oid sha256:adbbf494b118e767aed0de98af10f8163dca1f65b1439d2b82d098a06b6f1644
+size 36685
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_merchant.png
new file mode 100644
index 0000000000..16034c978d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_merchant.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60d67d4ddc4a77cd691e396b0605e0db1520c00e09dea8ca2cbc5fed659d7308
+size 35575
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_trireme.png
index cf366c4495..95557494c2 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_trireme.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_trireme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce13d8899cc5855126f626a9c21fdae72100fd7a417cc1430ddad0d17307aafc
-size 9229
+oid sha256:07b5872a8b9393892e263a2c75f38435c1a2347380d4e94d276e37c858ae271b
+size 40503
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_cavalry_mace.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_cavalry_mace.png
index 3a8fac6655..68a1891feb 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_cavalry_mace.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_cavalry_mace.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:948544cd4e6c10125ec5d50b32a7bb4996707413092f2b193c90b2bf478d5bb2
-size 8523
+oid sha256:af0e9e9eff4abd1d48a350531d91af96dd4d7350ed3fd79ca43ea3c20bb079b9
+size 21713
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_mace.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_mace.png
index 6e36d7a251..38237baadd 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_mace.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_mace.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6ca15f509e970eee669dffa717278a62710cca56b3a67c9c65208b59345d1ed
-size 8823
+oid sha256:db6c36ff12b1675713f8d41edfca1ce2c9ec4d516efe1d66a6d007b79757d776
+size 14540
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_polis.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_polis.png
index a11fc77c27..f773a8321d 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_polis.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_infantry_polis.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:533955b5911d5d876e806eaf41a697e12e04be7cd1e9a1b447e2934fb44863e0
-size 35096
+oid sha256:57e842be4b20e241bfece9063dddd1f1a3efd371907dd85cec9a4a2abd7e1b64
+size 29502
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_ranged_polis.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_ranged_polis.png
index eecb375862..43b94ece45 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_ranged_polis.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_super_ranged_polis.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78db7143c4fa21b741b87ad01f42d3b6eb156a1f06b3aad9d08adc7d48858bb2
-size 7500
+oid sha256:04c0d78e7e2367bc6af0bed8639bd9b68bf2d4b85f65598e4fbb12dd1224e92e
+size 18043
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png
index bd9c3d2622..de72ed4347 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_argyraspidai.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c538de3e85f30e30c37ee2bfd9bc89cf805da84df1508552ea481ad403b8277f
-size 8169
+oid sha256:464869c5fa91bca2b467c709bff282a2d05e10a594fa4e4db62b2f39b0cbfe2d
+size 22618
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png
index 6672b81a7a..0ce176d1c9 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/macedonian_hypaspist.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24537db97f957606aea616cb28d0e0e2166873f730525798cf2590eadda4e4cc
-size 7999
+oid sha256:713eb601f65e6801b6f69cfef495c72267bf693d6dbb596b7f863ded6734912d
+size 18709
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_trireme.png
index 5aeb3d4387..8e74a78f47 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_trireme.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_trireme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ff83742a92d1b1f256dc821e7854f8006497141fef4585b6b887c71152ad676
-size 686
+oid sha256:0fd89846ac9ab45fb60c6a88a39297e5e6b244719e546b830ce64ef7a014ee60
+size 40272
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/thebes_sacred_band_hoplitai.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/thebes_sacred_band_hoplitai.png
index 400682ae58..02f5935f25 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/thebes_sacred_band_hoplitai.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/thebes_sacred_band_hoplitai.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a846ee8ad8bddc13d998e420f7f2fe0b619ed2c4f18b163f51e3e241db05c974
-size 9746
+oid sha256:bbb7dc7302e8f2c5ed8b13baa210afe4d01e7e4855c01e01de9895949618d017
+size 18588
diff --git a/binaries/data/mods/public/maps/scenarios/Miletus.pmp b/binaries/data/mods/public/maps/scenarios/Miletus.pmp
index 2aa7f08b4a..15da83de7f 100644
--- a/binaries/data/mods/public/maps/scenarios/Miletus.pmp
+++ b/binaries/data/mods/public/maps/scenarios/Miletus.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b8979afda1716d307d46399eabbc772c806fc6a2b3f38e4d293b1ad47776bbd
-size 369892
+oid sha256:ebbf7b210201d520d37a6aaaeababe6da50146dbf435caee35df3532797d55ea
+size 369940
diff --git a/binaries/data/mods/public/maps/scenarios/Miletus.xml b/binaries/data/mods/public/maps/scenarios/Miletus.xml
index 2ad59a32fa..2accea384c 100644
--- a/binaries/data/mods/public/maps/scenarios/Miletus.xml
+++ b/binaries/data/mods/public/maps/scenarios/Miletus.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05e7c9424d6f31702e6f2f66913624621a17ad0a986c82573b0c5fa59ab15a9c
-size 58825
+oid sha256:1596cc146dbc22c1c770d0b6f349ac8e1a28baf0deefa201d5c9aaffe403b24d
+size 63092
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
index ca6c9c426f..eb8a4e755c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
@@ -31,8 +31,8 @@
   <Decay>
     <Inactive/>
     <DelayTime>0.0</DelayTime>
-    <SinkRate>4.0</SinkRate>
-    <SinkAccel>9.8</SinkAccel>
+    <SinkRate>2.0</SinkRate>
+    <SinkAccel>7.0</SinkAccel>
   </Decay>
   <UnitMotion>
     <PassabilityClass>ship</PassabilityClass>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/celt_ship_merchant.xml
index e01d530288..b928a33810 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_ship_merchant.xml
@@ -4,7 +4,7 @@
     <Civ>celt</Civ>
     <SpecificName>Currach</SpecificName>
     <History>These very small boats were used mainly for fishing, but they were also used to transport goods and personnel. The shell is wickerwork, covered with animal hides. Now they are exclusive to Ireland. They do not have a keel, but are able to ride large ocean waves and navigate up shallow rivers. First written account was by Julius Caesar in 100 BC. There were rumours of larger hide boats, but they were not documented with any solid proof.</History>
-    <Icon>units/celt_ship_fishing.png</Icon>
+    <Icon>units/celt_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/hele_ship_merchant.xml
index ed76ccb82f..2f26b67659 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_ship_merchant.xml
@@ -4,7 +4,7 @@
     <Civ>hele</Civ>
     <SpecificName>Emporiko Plio</SpecificName>
     <History>Need History</History>
-    <Icon>units/hele_ship_fishing.png</Icon>
+    <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml
index 4c81e1cdef..cf18dbe10d 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_super_cavalry">
   <Identity>
     <Civ>hele</Civ>
-    <SpecificName>Hetairoi</SpecificName>
+    <SpecificName>Hetairos</SpecificName>
     <Tooltip>Bonused vs. Cavalry and Archers. Weak vs. Super Units.</Tooltip>
     <History>The Hetairoi, or Companion cavalry, were a preferred general stand in Macedonian armies. Macedonian noblemen made up this elite cavalry unit, which was key to victory for Macedonian kings starting with Philip II, who increased their number from 600 to several thousand.</History>
     <Icon>units/hele_super_cavalry_mace.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
index 20c63d853d..728ec60f4f 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_super_infantry_pikeman">
   <Identity>
     <Civ>hele</Civ>
-    <SpecificName>Pezhetairoi</SpecificName>
+    <SpecificName>Pezhetairos</SpecificName>
     <Tooltip>Bonused vs. Cavalry and Infantry. Weak vs. Ranged Units. Uses the Syntagma Formation.</Tooltip>
     <History>'Foot Companions', these were the elite troops from the Macedonian phalanx, whom carried their Sarissas with both hands, the white shields being attached to their armour. The Sarissa and the new tactics they used were developed by Philip II under Theban influence. If properly protected by cavalry on both sides, the Pezhetairoi were virtually invincible to any kind of enemy unit. They were always deployed in deep formations of 16+.</History>
     <Icon>units/hele_super_infantry_mace.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml
index fb1ca15d6f..b159ba801b 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_super_infantry_spearman">
   <Identity>
     <Civ>hele</Civ>
-    <SpecificName>Homoioi</SpecificName>
+    <SpecificName>Spartiate</SpecificName>
     <Tooltip>Bonused vs. Melee Cavalry and Melee Infantry. Weak vs. Ranged Infantry and Ranged Cavalry. Long Train Time. Small Bonus vs. All Persian Units.</Tooltip>
     <History>The Spartans had a very peculiar form of government which enabled them to be professional soldiers. It not only enabled them, but actually forced them to be superior soldiers as a small group of Spartans had to dominate an enormous number of subjects and unwilling allies. The Spartan army was superior in Hellas, and in the rest of the known world. No other army was so well trained, and had such excellent equipment. They believed that traditional training was the key to success, and for centuries they were correct, as they rarely lost a battle in spite of their small numbers. Ironic enough, this concept ended the Spartan supremacy, as the Spartan phalanx could not resist the new sloped Theban phalanx and the invading integrated Macedonian forces. The end of the Spartan power marked the decline of the domination of traditional phalanx warfare.</History>
     <Icon>units/hele_super_infantry_polis.png</Icon>