diff --git a/binaries/data/mods/public/art/textures/skins/props/pyramid_great.dds b/binaries/data/mods/public/art/textures/skins/props/pyramid_great.dds
index 0b340aca67..20c0345841 100644
--- a/binaries/data/mods/public/art/textures/skins/props/pyramid_great.dds
+++ b/binaries/data/mods/public/art/textures/skins/props/pyramid_great.dds
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4f5ce11b6ab22fce0f6c6c1e8c85fd4db16707e9c1d0e9831826152fcc73e48b
+oid sha256:b6a117012a69e6bb55fae2eb1066e57e6161d258160b3fcc64805e7ba1973bc4
size 1398256
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml b/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
index ccc35b025d..56560fa4ff 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
@@ -13,6 +13,7 @@
gaia
Palisade Angle Spike
+ -StoneWall Palisade
A cheap, quick defensive spike
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
index 481f915ae0..7f8c516895 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
@@ -13,6 +13,7 @@
gaia
Palisade Curve
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
index b00d699a7a..5e59dacb8f 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
@@ -13,6 +13,7 @@
gaia
Palisade End
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
index 0f68145d50..0759f9b8da 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
@@ -13,6 +13,7 @@
gaia
Palisade Fort
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
index 10e99e2d9a..d1a129562e 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
@@ -22,6 +22,7 @@
gaia
Palisade Gate
+ -StoneWall Palisade
A cheap, quick wooden gate
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
index abb577a219..893d610dec 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
@@ -22,6 +22,7 @@
gaia
Palisade
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
index 3b180d9e45..245932aac1 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
@@ -22,6 +22,7 @@
gaia
Palisade
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
index cc4731f306..e25c225fcb 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
@@ -13,6 +13,7 @@
gaia
Outpost
+ -StoneWall Palisade
Wooden defensive structure
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
index c8b4e17701..48d5644a3d 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
@@ -22,6 +22,7 @@
gaia
Palisade
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
index ecf989e2cc..9bf54a00e1 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
@@ -13,6 +13,7 @@
gaia
Palisade
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
index f0f0ba4a11..29a39afb66 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
@@ -22,6 +22,7 @@
gaia
Palisade Tower
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
index 9c3c2f58b7..0860ac333e 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
@@ -13,6 +13,7 @@
gaia
Watchtower
+ -StoneWall Palisade
A cheap, quick tall structure
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml b/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
index 3087cc0b1a..8c201dd8a7 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
@@ -13,6 +13,7 @@
gaia
Spikes Small
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened branches
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml b/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
index ee42c62ab8..29147dc515 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
@@ -13,6 +13,7 @@
gaia
Spikes Tall
+ -StoneWall Palisade
A cheap, quick defensive structure constructed with sharpened tree trunks
gaia/special_palisade.png
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
index 3018c6388f..dd5bb92026 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
@@ -22,7 +22,7 @@
3000
- -ConquestCritical Defensive Wall
+ -ConquestCritical Defensive StoneWall
Stone Wall
Wall off your town for a stout defense.
structures/wall.png
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml
index 61da5acf27..ba68215ae5 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml
@@ -47,7 +47,7 @@
Wall Turret
Shoots arrows. Garrison to defend a city wall against attackers.
- Defensive -ConquestCritical Wall Tower
+ Defensive -ConquestCritical StoneWall Tower
structures/tower.png
phase_town
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
index 08c0a107ad..6e34df03f9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -22,6 +22,7 @@
Organic Siege
+ StoneWall
15.0
@@ -40,6 +41,7 @@
Organic Siege
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
index d0e06c3b98..e8c69229c9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -11,6 +11,7 @@
900
1500
Organic
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
index 500572ee50..5617109d77 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -25,6 +25,7 @@
1.5
+ StoneWall
@@ -33,10 +34,6 @@
80
-
-
- 5.0
-
Ranged Javelin
Champion Cavalry Skirmisher.
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
index 422fb85216..509deff6e5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -35,6 +35,7 @@
Organic Siege
+ StoneWall
24.0
@@ -61,6 +62,7 @@
Organic Siege
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
index 6400afc1d6..900b4a0314 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -35,6 +35,7 @@
Organic Siege
+ StoneWall
45.0
@@ -61,6 +62,7 @@
Organic Siege
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
index 02c900e1c1..57ffd27595 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -13,6 +13,7 @@
5.0
1000
Organic
+ StoneWall
46.0
@@ -21,6 +22,7 @@
5.0
0.0
Organic
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
index 7fbbd89f09..1dbc01456b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -26,6 +26,7 @@
Organic
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
index dc47d61eb3..cefb140905 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -34,6 +34,7 @@
Organic
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index 5db52cc617..681c8c490b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -22,6 +22,7 @@
1.5
+ StoneWall
8.0
@@ -39,6 +40,7 @@
1.5
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
index 9d5047c437..b437793739 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
@@ -8,6 +8,7 @@
4.0
1000
Organic
+ StoneWall
2.0
@@ -16,6 +17,7 @@
4.0
0.0
Organic
+ StoneWall
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
index 13103ae6f8..560b817358 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -11,6 +11,7 @@
1200
2000
Organic
+ StoneWall