diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_bloom_short.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_bloom_short.xml
index 4cd6de8c94..734d64aced 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_bloom_short.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_bloom_short.xml
@@ -18,6 +18,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall.xml
index 1d2fcb8673..b60fb326a7 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall.xml
@@ -17,7 +17,6 @@
       <textures><texture file="gaia/grass_field_dry_a.dds" name="baseTex"/></textures>
     </variant>
   </group>
-
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall_b.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall_b.xml
index e6ddadc9f8..fa6d9e1e75 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall_b.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_dry_tall_b.xml
@@ -18,6 +18,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_flowering_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_flowering_tall.xml
index 80a36cb8e1..1283f719df 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_flowering_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_flowering_tall.xml
@@ -27,6 +27,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_short.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_short.xml
index 006938ac26..d15840334d 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_short.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_short.xml
@@ -21,6 +21,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_tall.xml
index 1126019358..50d1123de1 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_lush_tall.xml
@@ -21,6 +21,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_short.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_short.xml
index aa1a36df07..cea486919a 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_short.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_short.xml
@@ -18,6 +18,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_tall.xml
index b76d3a5643..25d3f3a470 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_field_parched_tall.xml
@@ -18,6 +18,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_medit_field.xml b/binaries/data/mods/public/art/actors/props/flora/grass_medit_field.xml
index c602281eaf..184acd9535 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_medit_field.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_medit_field.xml
@@ -40,5 +40,5 @@
       <textures><texture file="gaia/grass_field_medit_flowering.dds" name="baseTex"/></textures>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_medit_flowering_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_medit_flowering_tall.xml
index 80a36cb8e1..1283f719df 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_medit_flowering_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_medit_flowering_tall.xml
@@ -27,6 +27,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_savanna.xml b/binaries/data/mods/public/art/actors/props/flora/grass_savanna.xml
index 6f3c01cde7..ece8f0c2cd 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_savanna.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_savanna.xml
@@ -31,5 +31,5 @@
       <textures><texture file="gaia/grass_field_savanna.dds" name="baseTex"/></textures>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large.xml
index 91b6dff2ba..a863b7b827 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large.xml
@@ -15,6 +15,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large_tall.xml
index 013a7d6378..f74b7b2307 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_large_tall.xml
@@ -15,6 +15,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small.xml
index 44ed01e748..2517637755 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small.xml
@@ -15,6 +15,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml
index ae14216601..d2062076c1 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml
@@ -13,5 +13,5 @@
       <textures><texture file="gaia/grass_field_dry.dds" name="baseTex"/></textures>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_tuft_a.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_tuft_a.xml
index 7b6ac73542..115ce88357 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_tuft_a.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_tuft_a.xml
@@ -21,6 +21,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_large.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_large.xml
index c80948b49f..959fdbec2e 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_large.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_large.xml
@@ -15,6 +15,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_large_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_large_tall.xml
index 96670f776f..11017cbc63 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_large_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_large_tall.xml
@@ -15,6 +15,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_small.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_small.xml
index 05d0e11d22..798c8116b6 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_small.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_small.xml
@@ -15,6 +15,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_small_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_small_tall.xml
index f4ca4bc61a..067b35e136 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_small_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_small_tall.xml
@@ -15,6 +15,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_soft_tuft_a.xml b/binaries/data/mods/public/art/actors/props/flora/grass_soft_tuft_a.xml
index 37812bab9d..83887807a6 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_tuft_a.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_tuft_a.xml
@@ -21,6 +21,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_temp_field.xml b/binaries/data/mods/public/art/actors/props/flora/grass_temp_field.xml
index 7c89dcf28b..26421f3a92 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_temp_field.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_temp_field.xml
@@ -36,6 +36,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_brown.xml b/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_brown.xml
index 25d702bc50..5f3099859b 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_brown.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_brown.xml
@@ -31,5 +31,5 @@
       <textures><texture file="gaia/grass_field_brown.dds" name="baseTex"/></textures>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_dry.xml b/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_dry.xml
index af3ebb3fa3..b60a3946a0 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_dry.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_temp_field_dry.xml
@@ -39,6 +39,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field.xml b/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field.xml
index 1df7f11b56..89fc5a950c 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field.xml
@@ -13,5 +13,5 @@
       <textures><texture file="gaia/grass_tropic_a.png" name="baseTex"/></textures>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml
index 9751b86d14..ecdbc70fe0 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml
@@ -7,8 +7,10 @@
   </group>
   <group>
     <variant frequency="1" name="texture">
-      <textures><texture file="gaia/grass_tropic_a.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/grass_tropic_a.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
-  <material>alphatest.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_tropical.xml b/binaries/data/mods/public/art/actors/props/flora/grass_tropical.xml
index 4fe275e12e..322e1b6bc5 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_tropical.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_tropical.xml
@@ -31,5 +31,5 @@
       <textures><texture file="gaia/grass_tropic_a.png" name="baseTex"/></textures>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_tufts_a.xml b/binaries/data/mods/public/art/actors/props/flora/grass_tufts_a.xml
index dd6d29246e..d72ad50342 100644
--- a/binaries/data/mods/public/art/actors/props/flora/grass_tufts_a.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_tufts_a.xml
@@ -18,6 +18,6 @@
     </variant>
   </group>
 
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_a_aut.dds b/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_a_aut.dds
index 3963b6bdd2..6fb256701a 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_a_aut.dds
+++ b/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_a_aut.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4174f802e3f9c0ea8670824d78f063f02e0a4407eca9902ef1e30f136def1efd
-size 16512
+oid sha256:25bed3348cdc96790ebb272e36628ae77b50eff10ad16f99cc390b543e653d8d
+size 22000
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_b_aut.dds b/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_b_aut.dds
index 96b5932f09..89a774b803 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_b_aut.dds
+++ b/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_b_aut.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a353b3f668eeec3cd969ff5fe9d6b288b72e514a97a1ceb99c58d3a453ac0ea5
-size 16512
+oid sha256:a708cd73ba81c3715ba6de0cdff0192dd0e5cc85c724ea602b39b0cbe247d417
+size 22000
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_c_aut.dds b/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_c_aut.dds
index d2bf8bbf69..1fd267e979 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_c_aut.dds
+++ b/binaries/data/mods/public/art/textures/skins/gaia/tree_oak_c_aut.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab47b3ccdf6d3fc1d98e04c76aee3c970ae8d423a74511516cacb9c95b6642ff
-size 16512
+oid sha256:e2880adfcdb4c37b8370c71a395287d3f1a5832c7004058ccaef4bd032448987
+size 22000
diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/belgian_bog_night.png b/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/belgian_bog_night.png
new file mode 100644
index 0000000000..b1023994ba
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/belgian_bog_night.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea78eed7925b4a5103daec11d7ddb9048fc7bc26b2bf3f2d8361d38cf16f265e
+size 156265
diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml
index 601d1423f0..2829a7b687 100644
--- a/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:007afe49b289bb3af925cf610ccd1436b28b0572f82ad5e2501b520c1d897bed
-size 722511
+oid sha256:ccf3083554e7ff727d112280700758ad968c9fa3cd44542b6a694fd2d323521d
+size 724589
diff --git a/binaries/data/mods/public/maps/scenarios/Belgian_Bog.xml b/binaries/data/mods/public/maps/scenarios/Belgian_Bog.xml
index 964bc4e47f..1991789883 100644
--- a/binaries/data/mods/public/maps/scenarios/Belgian_Bog.xml
+++ b/binaries/data/mods/public/maps/scenarios/Belgian_Bog.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:addeeeecb71973229c55fd4d942d2b7f01e1f07345a5643327384e059bcb8522
-size 699325
+oid sha256:7c19293cba80b31f2b8a57f84dfada246e4a4957f47b9ad5f706411dbf874582
+size 699336
diff --git a/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.pmp b/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.pmp
new file mode 100644
index 0000000000..a16a80c8ff
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.pmp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6655379e21f8cf1b84e38510f9e2035ee8d84ac3f74fe428fd737ebea4f5ac49
+size 656867
diff --git a/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml b/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml
new file mode 100644
index 0000000000..d016582195
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44bf77ccbd61e5cda0c901ea6e8e8ee8d88dab2156136f8225a59664d12656f1
+size 699414
diff --git a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.pmp b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.pmp
index e516c47773..3b5107bcf7 100644
--- a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a607bef200d8d6a46643e771451e28044125f15aae1fbde7e5533bd9e50a2ebe
+oid sha256:2e44093c66f0cb18fd3d83340c6e628b214513b4d70972c58039786390dd5d15
 size 2009487
diff --git a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.xml b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.xml
index 5460a87956..8258800942 100644
--- a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 04.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c38b34f817a0744c2ed469e30bf07791c869de1e61872ae925ff2ec49be4e08b
-size 660823
+oid sha256:c5abb99a64eac6e6a4e6d8b1780d8274ce8a69df8f76a1f793945965657590b1
+size 662120
diff --git a/binaries/data/mods/public/maps/scenarios/Median Oasis 04.xml b/binaries/data/mods/public/maps/scenarios/Median Oasis 04.xml
index 6ef9bb52e5..64cfe70b9a 100644
--- a/binaries/data/mods/public/maps/scenarios/Median Oasis 04.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Median Oasis 04.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b20da5a1b5edf4c8dd6a19fda7c9ba20a775c6f35a9109f1ee9878214789781a
-size 317827
+oid sha256:b86215608c9ef4888d2610e5a401aedd2ddf52789f2e45b3aa1ba07304aa93ae
+size 317862
diff --git a/binaries/data/mods/public/maps/scenarios/Peloponnese.xml b/binaries/data/mods/public/maps/scenarios/Peloponnese.xml
index 420977886b..478c2eb586 100644
--- a/binaries/data/mods/public/maps/scenarios/Peloponnese.xml
+++ b/binaries/data/mods/public/maps/scenarios/Peloponnese.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47fec8a015c424626a8b87dfcd4f8abd9d61cce9f6e693580a00d9d76ce6f259
-size 1065729
+oid sha256:a95876368133573094bc7c0891add970a7907e3e624157b6e513c780a835806c
+size 1065992
diff --git a/binaries/data/mods/public/maps/scenarios/Polynesia.xml b/binaries/data/mods/public/maps/scenarios/Polynesia.xml
index ba0c07f425..a617bfe637 100644
--- a/binaries/data/mods/public/maps/scenarios/Polynesia.xml
+++ b/binaries/data/mods/public/maps/scenarios/Polynesia.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cff3e382747f214203a3021f8a76c3bf70075d5240f70a2ece1ba6e4c1364ecb
-size 76362
+oid sha256:f2d4b1cf2327f1d099e07f559e54d0d8afdc5323aabf4510e476068e480e4811
+size 76317
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp
index f5f4e07918..b25a610014 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92fec6b67ad42d9b55c5d8e5f43b9f0072e14a9daba7dda11eb68e22f1a8ad45
+oid sha256:56778cd70cc90bc9076ff9a1163485ec1c5a79bf12d5a657331f2ca88b129f73
 size 2623817
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml
index 6cf54dc619..2d54ddb140 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0814f3c94e165f4ebe27d2aa8f8023eaa8d6edf579b0e20b59bf61becf3ef314
-size 134232
+oid sha256:cfad40d370ab97523786ae4241622b65678dc97ed6090ac0cab139a63521d9a8
+size 137735
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml
index ccfcb30b2b..107bf11c11 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1606b0fb2dd5129e7bfbc2265fe97f6376688c756bee78b89b95670a2375992f
-size 938331
+oid sha256:c6aed43cdc5a1d8a139f1ff396d406a54708937b7ca021ce74a3c5d42aa44288
+size 938328
diff --git a/binaries/data/mods/public/maps/scenarios/The Persian Gates.pmp b/binaries/data/mods/public/maps/scenarios/The Persian Gates.pmp
index ba586d5e5d..141b502bcb 100644
--- a/binaries/data/mods/public/maps/scenarios/The Persian Gates.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/The Persian Gates.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01b033b2a561d2e1c737a448d27350f628379a774531a61ee932a5c32556909f
-size 1476671
+oid sha256:ea58306e5895ae1f697930a07421f99b675c9f64e678280330882d2658bdd8fd
+size 1476648
diff --git a/binaries/data/mods/public/maps/scenarios/The Persian Gates.xml b/binaries/data/mods/public/maps/scenarios/The Persian Gates.xml
index 6d59675f72..1363283e59 100644
--- a/binaries/data/mods/public/maps/scenarios/The Persian Gates.xml	
+++ b/binaries/data/mods/public/maps/scenarios/The Persian Gates.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc90b86d0d9db8df191e64ef7d7aff0dfb7e23f58bbc8871b6638a17fb0d84d4
-size 189129
+oid sha256:2b07714defe911f2b4da04e99934b32ae0fd0225fd4a57072c0ff58062730fa4
+size 211820
diff --git a/binaries/data/mods/public/maps/scenarios/Tropical Island.pmp b/binaries/data/mods/public/maps/scenarios/Tropical Island.pmp
index c96c31e31c..14543eab1b 100644
--- a/binaries/data/mods/public/maps/scenarios/Tropical Island.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Tropical Island.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe41c38938516587c9081c5ea30e6c13a342ca4880a14252bab8f66b132dfccf
-size 656824
+oid sha256:3ab1e29ef9a484f687cc6519ea8582c42a7d7194f5e4a0f307ea507c5e1407cc
+size 656867
diff --git a/binaries/data/mods/public/maps/scenarios/Tropical Island.xml b/binaries/data/mods/public/maps/scenarios/Tropical Island.xml
index 1cf87ed27e..57b1c3c8f9 100644
--- a/binaries/data/mods/public/maps/scenarios/Tropical Island.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Tropical Island.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9d550df4e24d43f38958f6149cf09498021aa8822911b381ca32f88cb68cb48
-size 125985
+oid sha256:fd1196cb2597759c9e04622a41206bcc5b292c2b1b361cc897c5492e1ab05ca6
+size 108191
diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
index 5a1c9e68e6..277eed0618 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_bush_berry">
-  <Identity>
-    <Icon>gaia/flora_bush_berry.png</Icon>
-  </Identity>
   <Obstruction>
     <Unit radius="2.0"/>
   </Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
index 71c14001c3..36ea1f863d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_flora_tree">
+<Entity parent="template_gaia_flora_bush_berry">
   <Footprint>
     <Circle radius="2.5"/>
     <Height>10.0</Height>
@@ -13,7 +13,7 @@
     <Unit radius="0.9"/>
   </Obstruction>
   <ResourceSupply>
-    <Amount>300</Amount>
+    <Amount>400</Amount>
     <Type>food.fruit</Type>
   </ResourceSupply>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
index 6a7c9aa5ff..b71cdbaa40 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -15,6 +15,11 @@
       units/maur_champion_maiden
       units/maur_champion_infantry
     </Entities>
+    <Technologies datatype="tokens">
+      pair_champ_02
+      -siege_attack
+      -siege_armor
+    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryans/fortress.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml b/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
index 68eb9154a2..8350b68175 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
@@ -9,7 +9,7 @@
     <SpecificName>Berries</SpecificName>
     <Tooltip>Gather the fruit from these bushes to accumulate Food.</Tooltip>
     <History>Berries are tasty, fruity, and scrunchiously crunchable.</History>
-    <Icon>gaia/flora_tree_senegal_date_palm.png</Icon>
+    <Icon>gaia/flora_bush_berry.png</Icon>
   </Identity>
   <Minimap>
     <Type>food</Type>