diff --git a/binaries/data/mods/public/art/actors/flora/bushes/medit_scrub_01.xml b/binaries/data/mods/public/art/actors/flora/bushes/medit_scrub_01.xml
new file mode 100644
index 0000000000..1445c72851
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/flora/bushes/medit_scrub_01.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="bush_1">
+      <mesh>gaia/medit_bush_01.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_2">
+      <mesh>gaia/medit_bush_02.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_3">
+      <mesh>gaia/medit_bush_02.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_4">
+      <mesh>gaia/medit_bush_01.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_5">
+      <mesh>gaia/medit_bush_03.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_6">
+      <mesh>gaia/medit_bush_03.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_7">
+      <mesh>gaia/medit_bush_04.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_8">
+      <mesh>gaia/medit_bush_04.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/acacia.xml b/binaries/data/mods/public/art/actors/flora/trees/acacia.xml
index 3347124043..01a0b7f5b5 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/acacia.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/acacia.xml
@@ -25,18 +25,12 @@
     <variant frequency="1" name="Variant-04">
       <mesh>gaia/trees/trunks/acacia_04.dae</mesh>
     </variant>
-    <variant frequency="1" name="Variant-05">
-      <mesh>gaia/trees/trunks/acacia_05.dae</mesh>
-    </variant>
     <variant frequency="10" name="Variant-06">
       <mesh>gaia/trees/trunks/acacia_06.dae</mesh>
     </variant>
     <variant frequency="1" name="Variant-07">
       <mesh>gaia/trees/trunks/acacia_07.dae</mesh>
     </variant>
-    <variant frequency="2" name="Variant-08">
-      <mesh>gaia/trees/trunks/acacia_08.dae</mesh>
-    </variant>
     <variant frequency="1" name="Variant-09">
       <mesh>gaia/trees/trunks/acacia_09.dae</mesh>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/acacia_large.xml b/binaries/data/mods/public/art/actors/flora/trees/acacia_large.xml
new file mode 100644
index 0000000000..585d068c1a
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/flora/trees/acacia_large.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Acacia">
+      <props>
+        <prop actor="flora/trees/acacia_large_top.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/acacia.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Variant-05">
+      <mesh>gaia/trees/trunks/acacia_05.dae</mesh>
+    </variant>
+    <variant frequency="1" name="Variant-08">
+      <mesh>gaia/trees/trunks/acacia_08.dae</mesh>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/acacia_large_top.xml b/binaries/data/mods/public/art/actors/flora/trees/acacia_large_top.xml
new file mode 100644
index 0000000000..3dff46cecd
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/flora/trees/acacia_large_top.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Acacia Top">
+      <textures>
+        <texture file="gaia/acacia.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <!-- Need to keep the variant names in sync with the parent. -->
+    <variant frequency="1" name="Variant-05">
+      <mesh>gaia/trees/leaves/acacia_05.dae</mesh>
+    </variant>
+    <variant frequency="1" name="Variant-08">
+      <mesh>gaia/trees/leaves/acacia_08.dae</mesh>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/acacia_top.xml b/binaries/data/mods/public/art/actors/flora/trees/acacia_top.xml
index 6d67d3b571..e5a9cd7b00 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/acacia_top.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/acacia_top.xml
@@ -22,18 +22,12 @@
     <variant frequency="1" name="Variant-04">
       <mesh>gaia/trees/leaves/acacia_04.dae</mesh>
     </variant>
-    <variant frequency="1" name="Variant-05">
-      <mesh>gaia/trees/leaves/acacia_05.dae</mesh>
-    </variant>
     <variant frequency="10" name="Variant-06">
       <mesh>gaia/trees/leaves/acacia_06.dae</mesh>
     </variant>
     <variant frequency="1" name="Variant-07">
       <mesh>gaia/trees/leaves/acacia_07.dae</mesh>
     </variant>
-    <variant frequency="2" name="Variant-08">
-      <mesh>gaia/trees/leaves/acacia_08.dae</mesh>
-    </variant>
     <variant frequency="1" name="Variant-09">
       <mesh>gaia/trees/leaves/acacia_09.dae</mesh>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/maple_autumn.xml b/binaries/data/mods/public/art/actors/flora/trees/maple_autumn.xml
new file mode 100644
index 0000000000..43df217b5e
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/flora/trees/maple_autumn.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="maple_1">
+      <mesh>gaia/maple_a.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/ground_tree_decal_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="maple_2">
+      <mesh>gaia/maple_b.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/ground_tree_decal_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="a">
+      <textures>
+        <texture file="gaia/maple_tree_autumn_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="b">
+      <textures>
+        <texture file="gaia/maple_tree_autumn_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="c">
+      <textures>
+        <texture file="gaia/maple_tree_autumn_c.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="d-green">
+      <textures>
+        <texture file="gaia/maple_tree_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/oak_holly_autumn.xml b/binaries/data/mods/public/art/actors/flora/trees/oak_holly_autumn.xml
new file mode 100644
index 0000000000..0d40c6da20
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/flora/trees/oak_holly_autumn.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="base">
+      <props>
+        <prop actor="flora/trees/oak_holly_branches.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="3" name="a">
+      <textures>
+        <texture file="gaia/oak_holly_autumn_1.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="b">
+      <textures>
+        <texture file="gaia/oak_holly_autumn_2.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="c">
+      <textures>
+        <texture file="gaia/oak_holly_autumn_3.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="green-a">
+      <textures>
+        <texture file="gaia/oak_holly_1.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="green-b">
+      <textures>
+        <texture file="gaia/oak_holly_2.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="green-c">
+      <textures>
+        <texture file="gaia/oak_holly_3.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="1">
+      <mesh>gaia/oak_holly_1.dae</mesh>
+    </variant>
+    <variant frequency="2" name="2">
+      <mesh>gaia/oak_holly_2.dae</mesh>
+    </variant>
+    <variant frequency="2" name="3">
+      <mesh>gaia/oak_holly_3.dae</mesh>
+    </variant>
+    <variant frequency="2" name="4">
+      <mesh>gaia/oak_holly_4.dae</mesh>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/oak_hungarian_autumn.xml b/binaries/data/mods/public/art/actors/flora/trees/oak_hungarian_autumn.xml
index e1d0e8634d..7b75171050 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/oak_hungarian_autumn.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/oak_hungarian_autumn.xml
@@ -10,21 +10,51 @@
     </variant>
   </group>
   <group>
-    <variant frequency="3" name="a">
+    <variant frequency="1" name="a">
       <textures>
         <texture file="gaia/oak_hungarian_autumn_1.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="3" name="b">
+    <variant frequency="1" name="b">
       <textures>
         <texture file="gaia/oak_hungarian_autumn_2.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="3" name="c">
+    <variant frequency="1" name="c">
       <textures>
         <texture file="gaia/oak_hungarian_autumn_3.png" name="baseTex"/>
       </textures>
     </variant>
+    <variant frequency="1" name="d">
+      <textures>
+        <texture file="gaia/oak_hungarian_autumn_4.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="e">
+      <textures>
+        <texture file="gaia/oak_hungarian_autumn_5.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="f">
+      <textures>
+        <texture file="gaia/oak_hungarian_autumn_6.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="green-a">
+      <textures>
+        <texture file="gaia/oak_hungarian_1.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="green-b">
+      <textures>
+        <texture file="gaia/oak_hungarian_2.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="green-c">
+      <textures>
+        <texture file="gaia/oak_hungarian_3.png" name="baseTex"/>
+      </textures>
+    </variant>
   </group>
   <group>
     <variant frequency="2" name="1">
diff --git a/binaries/data/mods/public/art/actors/geology/stonemine_desert.xml b/binaries/data/mods/public/art/actors/geology/stonemine_desert.xml
index 1e8285f05f..f0780398d6 100644
--- a/binaries/data/mods/public/art/actors/geology/stonemine_desert.xml
+++ b/binaries/data/mods/public/art/actors/geology/stonemine_desert.xml
@@ -28,11 +28,20 @@
     </variant>
   </group>
   <group>
-    <variant name="stone-desert-a">
-      <textures><texture file="gaia/stone_desert_a.dds" name="baseTex"/></textures>
+    <variant frequency="1" name="stone_sahara_01">
+      <textures>
+        <texture file="gaia/stone_sahara_01.png" name="baseTex"/>
+        <texture file="gaia/stone_sahara_01_norm.png" name="normTex"/>
+        <texture file="gaia/stone_sahara_01_spec.png" name="specTex"/>
+      </textures>
     </variant>
-    <variant name="stone-desert-b">
-      <textures><texture file="gaia/stone_desert_b.dds" name="baseTex"/></textures>
+    <variant frequency="1" name="stone_sahara_02">
+      <textures>
+        <texture file="gaia/stone_sahara_02.png" name="baseTex"/>
+        <texture file="gaia/stone_sahara_02_norm.png" name="normTex"/>
+        <texture file="gaia/stone_sahara_02_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
+  <material>rock_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml b/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_large.xml
similarity index 58%
rename from binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml
rename to binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_large.xml
index c6a27532b9..feeea574f6 100644
--- a/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml
+++ b/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_large.xml
@@ -2,41 +2,35 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="a">
-      <mesh>gaia/rock_stonemine_desert_bl01.dae</mesh>
+    <variant frequency="1" name="base">
       <textures>
         <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
         <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
         <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
-        <texture file="gaia/ao/rock_stonemine_desert_bl01_ao.png" name="aoTex"/>
       </textures>
       <props>
-        <prop actor="geology/decal_stone_desert_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/gravel_sahara_3v3.xml" attachpoint="root"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="a">
+      <mesh>gaia/rock_stonemine_desert_bl01.dae</mesh>
+      <textures>
+        <texture file="gaia/ao/rock_stonemine_desert_bl01_ao.png" name="aoTex"/>
+      </textures>
+    </variant>
     <variant frequency="1" name="b">
       <mesh>gaia/rock_stonemine_desert_bl02.dae</mesh>
       <textures>
-        <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
-        <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
-        <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
         <texture file="gaia/ao/rock_stonemine_desert_bl02_ao.png" name="aoTex"/>
       </textures>
-      <props>
-        <prop actor="geology/decal_stone_desert_b.xml" attachpoint="root"/>
-      </props>
     </variant>
     <variant frequency="1" name="c">
       <mesh>gaia/rock_stonemine_desert_bl03.dae</mesh>
       <textures>
-        <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
-        <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
-        <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
         <texture file="gaia/ao/rock_stonemine_desert_bl03_ao.png" name="aoTex"/>
       </textures>
-      <props>
-        <prop actor="geology/decal_stone_desert_b.xml" attachpoint="root"/>
-      </props>
     </variant>
   </group>
   <material>rock_norm_spec_ao.xml</material>
diff --git a/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml b/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small.xml
similarity index 92%
rename from binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
rename to binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small.xml
index e5e3616865..dec07541ef 100644
--- a/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
+++ b/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small.xml
@@ -24,7 +24,7 @@
   <group>
     <variant frequency="1" name="decal">
       <props>
-        <prop actor="geology/decal_stone_desert_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/gravel_sahara_3v3.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml b/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml
index d665ba9f08..987ea7b3bf 100644
--- a/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml
+++ b/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml
@@ -8,10 +8,23 @@
         <prop actor="geology/decal_stone_desert_a.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="gaia/stonequarry_desert.png" name="baseTex"/>
         <texture file="gaia/ao/geo_stonemine_large_ao.png" name="aoTex"/>
-        <texture file="gaia/stonequarry_desert_spec.png" name="specTex"/>
-        <texture file="gaia/stonequarry_desert_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="stone_sahara_01">
+      <textures>
+        <texture file="gaia/stone_sahara_01.png" name="baseTex"/>
+        <texture file="gaia/stone_sahara_01_norm.png" name="normTex"/>
+        <texture file="gaia/stone_sahara_01_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="stone_sahara_02">
+      <textures>
+        <texture file="gaia/stone_sahara_02.png" name="baseTex"/>
+        <texture file="gaia/stone_sahara_02_norm.png" name="normTex"/>
+        <texture file="gaia/stone_sahara_02_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/geology/stonemine_desert_small.xml b/binaries/data/mods/public/art/actors/geology/stonemine_desert_small.xml
index 51996e7aa6..449bc5ab0a 100644
--- a/binaries/data/mods/public/art/actors/geology/stonemine_desert_small.xml
+++ b/binaries/data/mods/public/art/actors/geology/stonemine_desert_small.xml
@@ -1,39 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="formation-01">
-      <mesh>gaia/geo_medit_01.dae</mesh>
+    <variant frequency="1" name="stone_sahara_01">
+      <textures>
+        <texture file="gaia/stone_sahara_01.png" name="baseTex"/>
+        <texture file="gaia/stone_sahara_01_norm.png" name="normTex"/>
+        <texture file="gaia/stone_sahara_01_spec.png" name="specTex"/>
+      </textures>
     </variant>
-    <variant frequency="1" name="formation-02">
-      <mesh>gaia/geo_medit_02.dae</mesh>
-    </variant>
-    <variant frequency="1" name="formation-03">
-      <mesh>gaia/geo_medit_03.dae</mesh>
-    </variant>
-    <variant frequency="1" name="formation-04">
-      <mesh>gaia/geo_medit_04.dae</mesh>
-    </variant>
-    <variant frequency="1" name="formation-05">
-      <mesh>gaia/geo_medit_05.dae</mesh>
-    </variant>
-    <variant frequency="1" name="formation-06">
-      <mesh>gaia/geo_medit_06.dae</mesh>
+    <variant frequency="1" name="stone_sahara_02">
+      <textures>
+        <texture file="gaia/stone_sahara_02.png" name="baseTex"/>
+        <texture file="gaia/stone_sahara_02_norm.png" name="normTex"/>
+        <texture file="gaia/stone_sahara_02_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="stone-a">
-      <textures><texture file="gaia/stone_desert_small_a.dds" name="baseTex"/></textures>
+    <variant frequency="2" name="formation-a">
+      <mesh>gaia/stonemine_granite_a.dae</mesh>
     </variant>
-    <variant frequency="1" name="stone-b">
-      <textures><texture file="gaia/stone_desert_small_b.png" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="decal">
-      <props>
-        <prop actor="geology/decal_stone_desert_a.xml" attachpoint="root"/>
-      </props>
+    <variant frequency="2" name="formation-b">
+      <mesh>gaia/stonemine_granite_b.dae</mesh>
+    </variant>
+    <variant frequency="2" name="formation-c">
+      <mesh>gaia/stonemine_granite_c.dae</mesh>
+    </variant>
+    <variant frequency="1" name="boulder-a">
+      <mesh>gaia/stone_granite_boulder_a.dae</mesh>
+    </variant>
+    <variant frequency="1" name="boulder-b">
+      <mesh>gaia/stone_granite_boulder_b.dae</mesh>
+    </variant>
+    <variant frequency="1" name="boulder-c">
+      <mesh>gaia/stone_granite_boulder_c.dae</mesh>
     </variant>
   </group>
+  <material>rock_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/flora/bush_temperate_autumn.xml b/binaries/data/mods/public/art/actors/props/flora/bush_temperate_autumn.xml
new file mode 100644
index 0000000000..a1a39e07aa
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/flora/bush_temperate_autumn.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="mesh_bush_1">
+      <mesh>gaia/temp_bush_01.dae</mesh>
+    </variant>
+    <variant frequency="1" name="mesh_bush_2">
+      <mesh>gaia/temp_bush_02.dae</mesh>
+    </variant>
+    <variant frequency="1" name="mesh_bush_3">
+      <mesh>gaia/temp_bush_03.dae</mesh>
+    </variant>
+    <variant frequency="1" name="mesh_bush_4">
+      <mesh>gaia/temp_bush_04.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="tex_aut_bush_1">
+      <textures>
+        <texture file="gaia/temperate_tree_04.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="tex_aut_bush_2">
+      <textures>
+        <texture file="gaia/temperate_tree_05.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="tex_aut_bush_3">
+      <textures>
+        <texture file="gaia/temperate_tree_06.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="tex_aut_bush_4">
+      <textures>
+        <texture file="gaia/temperate_tree_09.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="tex_sum_bush_1">
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="tex_sum_bush_2">
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/meshes/gaia/medit_bush_01.dae b/binaries/data/mods/public/art/meshes/gaia/medit_bush_01.dae
new file mode 100644
index 0000000000..fc688c3c1a
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/medit_bush_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:661939e1430065175f35432d3edbea33eb7fe9faee18c4691f2d6ec21668d6ac
+size 15288
diff --git a/binaries/data/mods/public/art/meshes/gaia/medit_bush_02.dae b/binaries/data/mods/public/art/meshes/gaia/medit_bush_02.dae
new file mode 100644
index 0000000000..1a2035fc5a
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/medit_bush_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1114d4b5e7a17a6c989e82be07fa12345dcccbf1417b71d5960005b46d991b2a
+size 15263
diff --git a/binaries/data/mods/public/art/meshes/gaia/medit_bush_03.dae b/binaries/data/mods/public/art/meshes/gaia/medit_bush_03.dae
new file mode 100644
index 0000000000..4b6bef7290
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/medit_bush_03.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a230595f84964c39c3f752651e73a3d4295b4b1b617cdb843b4f65c1b5bf3fc
+size 15353
diff --git a/binaries/data/mods/public/art/meshes/gaia/medit_bush_04.dae b/binaries/data/mods/public/art/meshes/gaia/medit_bush_04.dae
new file mode 100644
index 0000000000..646e73bcae
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/medit_bush_04.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b24d0881d5d27eb44ddd69eb9ec3fcc558181745c7260dfdfa867baf743f0cec
+size 19404
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_a.png b/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_a.png
new file mode 100644
index 0000000000..89c40ab620
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9e50e190009c9bdc4eb741aa1ac49a664ac041a62ad717aa9b21a6cece18498
+size 122808
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_b.png b/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_b.png
new file mode 100644
index 0000000000..2970c1c508
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32514dab176dbcd604d0a4bddf3f0b704b49d555fe9f2f92a67aa4eb3097029c
+size 122713
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_c.png b/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_c.png
new file mode 100644
index 0000000000..544e002521
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/maple_tree_autumn_c.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:337836ce3815ecc7180b9f9d8278a84a518acccf3b78374a0deb2dd559db07f7
+size 142820
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_1.png b/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_1.png
new file mode 100644
index 0000000000..f024e9df0a
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53a4393089a78fd44d0939ab949b8104d10cd8bb538afe08049e4385d48b0528
+size 444049
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_2.png b/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_2.png
new file mode 100644
index 0000000000..004ff3b666
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66728ccafaee4dfe5d95225ee1bf326ab65e6eb3042ddc77440cdd8295963320
+size 450666
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_3.png b/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_3.png
new file mode 100644
index 0000000000..09d7750bc7
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/oak_holly_autumn_3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1195b3c6d057338691967473f7035a7aab07a2a98a651594756ba634b20b7155
+size 460774
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_4.png b/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_4.png
new file mode 100644
index 0000000000..bf2159a4b1
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb735db9b22c7d04710ae7d33f0b044d28f07a8456782d4fbbf1ed3ad0ba6b47
+size 395585
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_5.png b/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_5.png
new file mode 100644
index 0000000000..0fab37def2
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23009f22a3e933d2551855a705faa2813c8922b4844e7c2f46436dd504446492
+size 395874
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_6.png b/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_6.png
new file mode 100644
index 0000000000..c59db7b15f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/oak_hungarian_autumn_6.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bb8d55a69b7bed297d9da25cc7fa942a42e13f947a96b6d915e5fe307d1af3b
+size 385132
diff --git a/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_large.xml b/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_large.xml
index 59d5bfcae4..4eb7d1ed36 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_large.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_large.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_rock_large">
+  <Identity>
+    <Icon>gaia/geology_stone_2.png</Icon>
+  </Identity>
   <VisualActor>
-    <Actor>geology/stonemine_desert_badlands_new.xml</Actor>
+    <Actor>geology/stonemine_desert_badlands_large.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_small.xml b/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_small.xml
new file mode 100644
index 0000000000..d4181e406b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/rock/badlands_small.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_rock">
+  <Identity>
+    <Icon>gaia/geology_stone_2.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>geology/stonemine_desert_badlands_small.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/acacia_large.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/acacia_large.xml
new file mode 100644
index 0000000000..d6a2b222c2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/acacia_large.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_tree">
+  <Identity>
+    <SpecificName>Ancient Acacia</SpecificName>
+  </Identity>
+  <ResourceSupply>
+    <Max>300</Max>
+  </ResourceSupply>
+  <VisualActor>
+    <Actor>flora/trees/acacia_large.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_badlands.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_badlands.xml
index 35cd6fc94e..94ecce0430 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_badlands.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_badlands.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_tree">
+<Entity parent="bush|template_gaia_tree">
   <Identity>
     <SpecificName>Hardy Bush</SpecificName>
   </Identity>
-  <ResourceSupply>
-    <Max>75</Max>
-  </ResourceSupply>
   <VisualActor>
     <Actor>props/flora/bush_tempe_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_mediterranean.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_mediterranean.xml
new file mode 100644
index 0000000000..d919d65265
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_mediterranean.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="bush|template_gaia_tree">
+  <Identity>
+    <SpecificName>Scrub</SpecificName>
+  </Identity>
+  <ResourceSupply>
+    <Max>50</Max>
+  </ResourceSupply>
+  <VisualActor>
+    <Actor>flora/bushes/medit_scrub_01.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_01.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_01.xml
index 981902431c..fc86a529b6 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_01.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_01.xml
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_tree">
-  <Footprint>
-    <Circle radius="5"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Bush</SpecificName>
-  </Identity>
-  <ResourceSupply>
-    <Max>200</Max>
-  </ResourceSupply>
-  <VisualActor>
-    <Actor>props/flora/bush_tempe_underbrush.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="bush|template_gaia_tree">
+  <Footprint>
+    <Circle radius="5"/>
+    <Height>15.0</Height>
+  </Footprint>
+  <VisualActor>
+    <Actor>props/flora/bush_tempe_underbrush.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_02.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_02.xml
index cd53a9edb0..062c20e1a4 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_02.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_02.xml
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_tree">
-  <Footprint>
-    <Circle radius="5"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Bush</SpecificName>
-  </Identity>
-  <ResourceSupply>
-    <Max>200</Max>
-  </ResourceSupply>
-  <VisualActor>
-    <Actor>props/flora/bush_juniper_prickly.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="bush|template_gaia_tree">
+  <Footprint>
+    <Circle radius="5"/>
+    <Height>15.0</Height>
+  </Footprint>
+  <VisualActor>
+    <Actor>props/flora/bush_juniper_prickly.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_03.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_03.xml
index f81677c768..10f2b9b721 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_03.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_steppe_03.xml
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_tree">
-  <Footprint>
-    <Circle radius="5"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Bush</SpecificName>
-  </Identity>
-  <ResourceSupply>
-    <Max>200</Max>
-  </ResourceSupply>
-  <VisualActor>
-    <Actor>props/flora/bush_medit_underbrush.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="bush|template_gaia_tree">
+  <Footprint>
+    <Circle radius="5"/>
+    <Height>15.0</Height>
+  </Footprint>
+  <VisualActor>
+    <Actor>props/flora/bush_medit_underbrush.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate.xml
index bab0ed03c0..1b7aad4953 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_tree">
-  <Identity>
-    <SpecificName>Bush</SpecificName>
-  </Identity>
-  <ResourceSupply>
-    <Max>50</Max>
-  </ResourceSupply>
+<Entity parent="bush|template_gaia_tree">
   <VisualActor>
     <Actor>flora/trees/temperate_bush_biome.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_autumn.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_autumn.xml
new file mode 100644
index 0000000000..0bd68a417e
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_autumn.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="bush|template_gaia_tree">
+  <VisualActor>
+    <Actor>props/flora/bush_temperate_autumn.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_winter.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_winter.xml
index 34fca12fda..0807da2ee1 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_winter.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_temperate_winter.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_tree">
-  <Identity>
-    <SpecificName>Bush</SpecificName>
-  </Identity>
+<Entity parent="bush|template_gaia_tree">
   <ResourceSupply>
     <Max>50</Max>
   </ResourceSupply>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_tropic.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_tropic.xml
index c9c3b99c3e..f0c2fec5ca 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/tree/bush_tropic.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/bush_tropic.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_tree">
-  <Identity>
-    <SpecificName>Bush</SpecificName>
-  </Identity>
+<Entity parent="bush|template_gaia_tree">
   <ResourceSupply>
     <Max>50</Max>
   </ResourceSupply>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/maple_autumn.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/maple_autumn.xml
new file mode 100644
index 0000000000..b02febc16c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/maple_autumn.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_tree">
+  <Identity>
+    <SpecificName>Maple</SpecificName>
+  </Identity>
+  <ResourceSupply>
+    <Max>200</Max>
+  </ResourceSupply>
+  <VisualActor>
+    <Actor>flora/trees/maple_autumn.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/tree/oak_holly_autumn.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/oak_holly_autumn.xml
new file mode 100644
index 0000000000..e0cd3293e7
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/oak_holly_autumn.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_tree">
+  <Identity>
+    <SpecificName>Holly Oak</SpecificName>
+  </Identity>
+  <ResourceSupply>
+    <Max>200</Max>
+  </ResourceSupply>
+  <VisualActor>
+    <Actor>flora/trees/oak_holly_autumn.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/mixins/bush.xml b/binaries/data/mods/public/simulation/templates/mixins/bush.xml
new file mode 100644
index 0000000000..110dc202a0
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/mixins/bush.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+  <Identity>
+    <SpecificName>Bush</SpecificName>
+  </Identity>
+  <Obstruction>
+    <BlockMovement>false</BlockMovement>
+    <BlockPathfinding>false</BlockPathfinding>
+    <BlockFoundation>false</BlockFoundation>
+    <BlockConstruction>false</BlockConstruction>
+    <DeleteUponConstruction>true</DeleteUponConstruction>
+  </Obstruction>
+  <ResourceSupply>
+    <Max>100</Max>
+  </ResourceSupply>
+  <StatusBars>
+    <HeightOffset>8</HeightOffset>
+  </StatusBars>
+</Entity>