diff --git a/binaries/data/mods/internal/art/actors/props/structures/chinese/merchant_sail.xml b/binaries/data/mods/internal/art/actors/props/structures/chinese/merchant_sail.xml
new file mode 100644
index 0000000000..2d11078464
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/structures/chinese/merchant_sail.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="chinese merchant sail">
+      <mesh>props/chin_merch_sail.dae</mesh>
+      <texture>props/chin_sail_dragon.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/props/structures/chinese/trireme_sail.xml b/binaries/data/mods/internal/art/actors/props/structures/chinese/trireme_sail.xml
new file mode 100644
index 0000000000..709f6b01cf
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/structures/chinese/trireme_sail.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="chinese trireme sail">
+      <mesh>props/chin_tri_sail.dae</mesh>
+      <texture>props/chin_sail_dragon.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/structures/chinese/merchant_ship.xml b/binaries/data/mods/internal/art/actors/structures/chinese/merchant_ship.xml
new file mode 100644
index 0000000000..8c7d21be9c
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/structures/chinese/merchant_ship.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant name="Chinese Merchant Ship">
+      <mesh>structural/chin_merch.dae</mesh>
+      <props>
+        <prop actor="props/structures/chinese/merchant_sail.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/chin_ship.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/structures/chinese/trireme.xml b/binaries/data/mods/internal/art/actors/structures/chinese/trireme.xml
new file mode 100644
index 0000000000..a61e65fd7d
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/structures/chinese/trireme.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant name="Chinese Trireme">
+      <mesh>structural/chin_tri.dae</mesh>
+      <props>
+        <prop actor="props/structures/chinese/trireme_sail.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+      <texture>structural/chin_ship.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml b/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml
index 6cf6438458..5c51c64be6 100644
--- a/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml
+++ b/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <mesh>structural/pers_farmstead.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
+      </props>
       <texture>structural/pers_struct.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/internal/art/actors/structures/romans/scout_tower.xml b/binaries/data/mods/internal/art/actors/structures/romans/scout_tower.xml
index de9949bf6d..b1d23bb1dd 100644
--- a/binaries/data/mods/internal/art/actors/structures/romans/scout_tower.xml
+++ b/binaries/data/mods/internal/art/actors/structures/romans/scout_tower.xml
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <mesh>structural/rome_scout_tower.dae</mesh>
       <props>
         <prop actor="props/structures/romans/scout_tower.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
       </props>
       <texture>structural/rome_struct.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/internal/art/meshes/props/chin_merch_sail.dae b/binaries/data/mods/internal/art/meshes/props/chin_merch_sail.dae
new file mode 100644
index 0000000000..5b58bd3d3c
--- /dev/null
+++ b/binaries/data/mods/internal/art/meshes/props/chin_merch_sail.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2af2ebc100bd18bab925690c5e23b4008e9180ffd0a6548c78c7da85b2650737
+size 12568
diff --git a/binaries/data/mods/internal/art/meshes/props/chin_tri_sail.dae b/binaries/data/mods/internal/art/meshes/props/chin_tri_sail.dae
new file mode 100644
index 0000000000..f12b7540b0
--- /dev/null
+++ b/binaries/data/mods/internal/art/meshes/props/chin_tri_sail.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fdc5ea16759aa7c4c2ae6e1cb1981631ccd3e16209d784607f83d1d1acc1c14
+size 19655
diff --git a/binaries/data/mods/internal/art/meshes/structural/chin_merch.dae b/binaries/data/mods/internal/art/meshes/structural/chin_merch.dae
new file mode 100644
index 0000000000..42fce5be46
--- /dev/null
+++ b/binaries/data/mods/internal/art/meshes/structural/chin_merch.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ecaad5dc99aa22b78559a9e315ec5340b19982a7479643a7334ab07fe0bad96
+size 82555
diff --git a/binaries/data/mods/internal/art/meshes/structural/chin_tri.dae b/binaries/data/mods/internal/art/meshes/structural/chin_tri.dae
new file mode 100644
index 0000000000..ed2e31fc45
--- /dev/null
+++ b/binaries/data/mods/internal/art/meshes/structural/chin_tri.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8a21bc305b7b24e00fbaa133d33f13e61047a176d07b972e0957392d60803d7
+size 188399
diff --git a/binaries/data/mods/internal/art/textures/skins/props/chin_sail_dragon.dds b/binaries/data/mods/internal/art/textures/skins/props/chin_sail_dragon.dds
new file mode 100644
index 0000000000..41f6a5aeaa
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/chin_sail_dragon.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8c835802299cc493e5b151af65acf63c43ce51f0bcdda90fe5c495ef1b28391
+size 349680
diff --git a/binaries/data/mods/internal/art/textures/skins/structural/chin_ship.dds b/binaries/data/mods/internal/art/textures/skins/structural/chin_ship.dds
new file mode 100644
index 0000000000..8651c7152a
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/structural/chin_ship.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbd3a78601acf65066ef1cdf9706453a22798ad58bbc84d30cafb6018a6f133e
+size 349680
diff --git a/binaries/data/mods/internal/art/textures/skins/structural/chin_ship.png b/binaries/data/mods/internal/art/textures/skins/structural/chin_ship.png
new file mode 100644
index 0000000000..a9be3408f1
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/structural/chin_ship.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8019ad5cc649d7d46b6646befe597213c5a0ae18cd92e747ee2893b51cf2ce5a
+size 392895
diff --git a/binaries/data/mods/internal/simulation/templates/units/chin_ship_merchant.xml b/binaries/data/mods/internal/simulation/templates/units/chin_ship_merchant.xml
new file mode 100644
index 0000000000..305fb30b83
--- /dev/null
+++ b/binaries/data/mods/internal/simulation/templates/units/chin_ship_merchant.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_merchant">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Han Merchant Ship</SpecificName>
+    <History>Need History</History>
+    <Icon>units/chin_ship_merchant.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/chinese/merchant_ship.xml</Actor>
+  </VisualActor>
+  <Footprint replace="">
+    <Square width="8.0" depth="22.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Unit radius="6.0"/>
+  </Obstruction>
+</Entity>
diff --git a/binaries/data/mods/internal/simulation/templates/units/chin_ship_trireme.xml b/binaries/data/mods/internal/simulation/templates/units/chin_ship_trireme.xml
new file mode 100644
index 0000000000..2903d1794e
--- /dev/null
+++ b/binaries/data/mods/internal/simulation/templates/units/chin_ship_trireme.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_trireme">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Lou Chuan</SpecificName>
+    <History>Meant to be a central vessel in the fleet, the lou chuan was equipped for boarding and attacking enemy vessels, as well as with siege weapons including traction trebuchets for ranged combat.</History>
+    <Icon>units/chin_ship_trireme.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/chinese/trireme.xml</Actor>
+  </VisualActor>
+  <Footprint>
+    <Square width="14.0" depth="36.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+</Entity>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/special_gym.xml b/binaries/data/mods/public/art/actors/structures/hellenes/special_gym.xml
index 042cc7f206..74bf88449d 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/special_gym.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/special_gym.xml
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <mesh>structural/hele_gym_a.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/special_gym.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
       <texture>structural/hele_struct_1.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
index b208c7a346..190f432b87 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
@@ -13,7 +13,7 @@
         <prop actor="units/hellenes/infantry_javelinist_b.xml" attachpoint="gar04"/>
         <prop actor="units/hellenes/infantry_archer_e.xml" attachpoint="gar05"/>
       </props>
-      <texture>structural/hele_struct_b.png</texture>
+      <texture>structural/hele_struct_b.dds</texture>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/chin_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/chin_ship_merchant.png
new file mode 100644
index 0000000000..b6a74e8a17
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/chin_ship_merchant.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d6d7c9436898c5456c01c685fcf227de8514faf345001a6888360bd4d37c63f
+size 38763
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/chin_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/chin_ship_trireme.png
new file mode 100644
index 0000000000..e77d4f66b6
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/chin_ship_trireme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4327cad4e91ed175c032b379db509b846e2ba9b0e687f6cd12f120f522a59e4c
+size 38483
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
index c6e3ce00cf..2eb9c2bb04 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Identity>
-    <GenericName>Bireme</GenericName>
+    <GenericName>Light Warship</GenericName>
     <Tooltip>Light Warship.</Tooltip>
   </Identity>
   <Cost>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
index b5bee58cb2..a3878d6a08 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Identity>
-    <GenericName>Quinquereme</GenericName>
+    <GenericName>Heavy Warship</GenericName>
     <Tooltip>Heavy Warship.</Tooltip>
   </Identity>
   <Cost>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
index 4929361846..1365d1af1b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Identity>
-    <GenericName>Trireme</GenericName>
+    <GenericName>Medium Warship</GenericName>
     <Tooltip>Medium Warship.</Tooltip>
   </Identity>
   <Cost>