diff --git a/binaries/data/mods/public/art/actors/props/flora/farming_barley_harvest_a.xml b/binaries/data/mods/public/art/actors/props/flora/farming_barley_harvest_a.xml
index 70abc6bf9b..530987a977 100644
--- a/binaries/data/mods/public/art/actors/props/flora/farming_barley_harvest_a.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/farming_barley_harvest_a.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
+  <group>
+    <variant frequency="100" name="Base">
+      <textures>
+        <texture file="gaia/farming_barley_harvest_a.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
   <group>
     <variant name="a">
       <mesh>gaia/cross_large_short.dae</mesh>
@@ -8,14 +17,5 @@
       <mesh>gaia/cross_angledfromtop.dae</mesh>
     </variant>
   </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="gaia/farming_barley_harvest_a.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
   <material>basic_trans_wind_grain_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_celt.xml b/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_celt.xml
index 23024bbbf5..97625b7adc 100644
--- a/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_celt.xml
+++ b/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_celt.xml
@@ -3,10 +3,10 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="celt flag 1">
+      <mesh>props/garrison_flag.dae</mesh>
       <animations>
         <animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
       </animations>
-      <mesh>props/garrison_flag.dae</mesh>
       <textures>
         <texture file="props/garrison_celt_1.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
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 4c9a61d776..8fd86dcfbb 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
@@ -8,25 +8,19 @@
         <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
       </animations>
       <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant name="kush">
+    <variant name="athen">
       <textures>
-        <texture file="props/banner_kushites.png" name="baseTex"/>
+        <texture file="props/banner_athenians.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="hele">
-      <textures>
-        <texture file="props/banner_greek.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="pers">
-      <textures>
-        <texture file="props/banner_persian.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="celt">
+    <variant name="brit">
       <textures>
         <texture file="props/banner_celt.png" name="baseTex"/>
       </textures>
@@ -36,32 +30,7 @@
         <texture file="props/banner_carthage.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="iber">
-      <textures>
-        <texture file="props/banner_iberians.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="rome">
-      <textures>
-        <texture file="props/banner_romans.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="spart">
-      <textures>
-        <texture file="props/banner_spartans.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="mace">
-      <textures>
-        <texture file="props/banner_macedonians.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="athen">
-      <textures>
-        <texture file="props/banner_greek.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="brit">
+    <variant name="celt">
       <textures>
         <texture file="props/banner_celt.png" name="baseTex"/>
       </textures>
@@ -71,32 +40,59 @@
         <texture file="props/banner_celt.png" name="baseTex"/>
       </textures>
     </variant>
+    <variant name="han">
+      <textures>
+        <texture file="props/banner_han.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant name="hele">
+      <textures>
+        <texture file="props/banner_greek.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant name="iber">
+      <textures>
+        <texture file="props/banner_iberians.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant name="kush">
+      <textures>
+        <texture file="props/banner_kushites.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant name="mace">
+      <textures>
+        <texture file="props/banner_macedonians.png" name="baseTex"/>
+      </textures>
+    </variant>
     <variant name="maur">
       <textures>
         <texture file="props/banner_mauryas.png" name="baseTex"/>
       </textures>
     </variant>
+    <variant name="pers">
+      <textures>
+        <texture file="props/banner_persian.png" name="baseTex"/>
+      </textures>
+    </variant>
     <variant name="ptol">
       <textures>
         <texture file="props/banner_ptolemies.png" name="baseTex"/>
       </textures>
     </variant>
+    <variant name="rome">
+      <textures>
+        <texture file="props/banner_romans.png" name="baseTex"/>
+      </textures>
+    </variant>
     <variant name="sele">
       <textures>
         <texture file="props/banner_seleucids.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="han">
+    <variant name="spart">
       <textures>
-        <texture file="props/banner_han.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
+        <texture file="props/banner_spartans.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_gate_up.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_gate_up.xml
index 72fe77882d..de34189525 100644
--- a/binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_gate_up.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_gate_up.xml
@@ -5,12 +5,12 @@
     <variant>
       <mesh>props/hele_fortress_up_gate.dae</mesh>
       <textures>
-<texture file="props/hele_gate.png" name="baseTex"/>
-<texture file="props/hele_gate_norm.png" name="normTex"/>
-<texture file="props/hele_gate_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
-</textures>
+        <texture file="props/hele_gate.png" name="baseTex"/>
+        <texture file="props/hele_gate_norm.png" name="normTex"/>
+        <texture file="props/hele_gate_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_fortress.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
-<material>player_trans_ao_parallax_spec.xml</material>
+  <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/spartans/temple_tile_c.xml b/binaries/data/mods/public/art/actors/props/structures/spartans/temple_tile_c.xml
index a48dd4730d..a068deda72 100644
--- a/binaries/data/mods/public/art/actors/props/structures/spartans/temple_tile_c.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/spartans/temple_tile_c.xml
@@ -5,12 +5,12 @@
     <variant name="spartan temple tile b">
       <mesh>props/spart_temple_tile_c.dae</mesh>
       <textures>
-<texture file="props/hele_tile_c.dds" name="baseTex"/>
-<texture file="props/hele_tile_c_norm.png" name="normTex"/>
-<texture file="props/hele_tile_c_spec.png" name="specTex"/>
-<texture file="structural/ao/spart_temple.png" name="aoTex"/>
-</textures>
+        <texture file="props/hele_tile_c.dds" name="baseTex"/>
+        <texture file="props/hele_tile_c_norm.png" name="normTex"/>
+        <texture file="props/hele_tile_c_spec.png" name="specTex"/>
+        <texture file="structural/ao/spart_temple.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
-<material>player_trans_ao_parallax_spec.xml</material>
+  <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/special/golden_fleece.xml b/binaries/data/mods/public/art/actors/special/golden_fleece.xml
index 524d22b086..37b3c0a811 100644
--- a/binaries/data/mods/public/art/actors/special/golden_fleece.xml
+++ b/binaries/data/mods/public/art/actors/special/golden_fleece.xml
@@ -6,7 +6,7 @@
       <mesh>skeletal/goat_male.dae</mesh>
       <textures>
         <texture file="skeletal/special_fleece.png" name="baseTex"/>
-        <texture name="specTex" file="null_white.dds"/>
+        <texture file="skeletal/special_fleece.png" name="specTex"/>
         <texture file="default_norm.png" name="normTex"/>
       </textures>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/fndn_5x7_temple.xml b/binaries/data/mods/public/art/actors/structures/fndn_5x7_temple.xml
index 4b222e87a9..b0fdd9aaea 100644
--- a/binaries/data/mods/public/art/actors/structures/fndn_5x7_temple.xml
+++ b/binaries/data/mods/public/art/actors/structures/fndn_5x7_temple.xml
@@ -49,6 +49,7 @@
       <props>
         <prop actor="props/structures/decals/dirt_5x7.xml" attachpoint="root"/>
         <prop actor="props/structures/construction/scaf_5x7_temple.xml" attachpoint="root"/>
+        <prop actor="props/structures/construction/scaffold.xml" attachpoint="root"/>
         <prop actor="particle/construction_dust.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/han/minister.xml b/binaries/data/mods/public/art/actors/units/han/minister.xml
index 96ff8b9c25..fadb30fc9a 100644
--- a/binaries/data/mods/public/art/actors/units/han/minister.xml
+++ b/binaries/data/mods/public/art/actors/units/han/minister.xml
@@ -9,6 +9,10 @@
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_a.xml" attachpoint="sheath_L"/>
       </props>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -22,13 +26,5 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
   <material>player_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_sb_1_new.dae b/binaries/data/mods/public/art/meshes/structural/pers_sb_1_new.dae
index 4563c81184..a78f37ed79 100644
--- a/binaries/data/mods/public/art/meshes/structural/pers_sb_1_new.dae
+++ b/binaries/data/mods/public/art/meshes/structural/pers_sb_1_new.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:547fcf01cb89ff5da7c4c969d7bb1b52f31abe374b71e00c300a3ada742b3baf
-size 932894
+oid sha256:0c82b187d1d9eebcd83293083aa72464035fe9fb7c04c3393211799319cdf046
+size 931237
diff --git a/binaries/data/mods/public/art/textures/skins/props/garrison_mace_1.png b/binaries/data/mods/public/art/textures/skins/props/garrison_mace_1.png
new file mode 100644
index 0000000000..24481b7ef7
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/garrison_mace_1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da7257a73e1ff2a7a0c180bd4b98d3dafe42e914abab2e535e6026ad5f48fa0a
+size 11679
diff --git a/binaries/data/mods/public/art/textures/skins/props/spart_temple_decal.png b/binaries/data/mods/public/art/textures/skins/props/spart_temple_decal.png
index 2e9b87ff28..80715ca1ec 100644
--- a/binaries/data/mods/public/art/textures/skins/props/spart_temple_decal.png
+++ b/binaries/data/mods/public/art/textures/skins/props/spart_temple_decal.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d3d8c7e99477b1c106a87947cdf36c8504c8193ce28f07a6519d6376c7ed4b1
-size 3779771
+oid sha256:f053446a3f482b4b4bb50d181aa671026fc3073deb9003dee7174c7795142215
+size 3645482
diff --git a/binaries/data/mods/public/art/textures/skins/structural/assyrian_ram_2.png b/binaries/data/mods/public/art/textures/skins/structural/assyrian_ram_2.png
index a7cc3dadd4..7010657d7d 100644
--- a/binaries/data/mods/public/art/textures/skins/structural/assyrian_ram_2.png
+++ b/binaries/data/mods/public/art/textures/skins/structural/assyrian_ram_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee7d51bad2f4759bc4ca1815547f6849c950a7682a14577ffa47bf2d18404dc7
-size 421840
+oid sha256:abfef70d09a19188eefbe9b17cd5cf7702a9c508715e35e7bbb0453ca14f1332
+size 423164
diff --git a/binaries/data/mods/public/art/textures/skins/structural/celt_struct_1_spec.png b/binaries/data/mods/public/art/textures/skins/structural/celt_struct_1_spec.png
index ed174dc6d9..fba57da8ee 100644
--- a/binaries/data/mods/public/art/textures/skins/structural/celt_struct_1_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/structural/celt_struct_1_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:020c2602a3c67d155c18fee26d1817c4f79a51b8e26fb05537a1dd8080284107
-size 56931
+oid sha256:e19be51f3fd8a8210f8ba5d8e8460f6f74deabac4599724932b6031a672d2932
+size 59903
diff --git a/binaries/data/mods/public/audio/interface/alarm/alarm_ally.xml b/binaries/data/mods/public/audio/interface/alarm/alarm_ally.xml
index 9ba416c410..552f3fde16 100644
--- a/binaries/data/mods/public/audio/interface/alarm/alarm_ally.xml
+++ b/binaries/data/mods/public/audio/interface/alarm/alarm_ally.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
-	<Gain>1</Gain>
+	<Gain>0.75</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
 	<Looping>0</Looping>