diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_long.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_long.xml
new file mode 100644
index 0000000000..dea4acf831
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_long.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ props/rubble_stone_wall_long.dae
+
+
+
+
+
+
+
+
+
+ basic_trans_ao.xml
+
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_medium.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_medium.xml
new file mode 100644
index 0000000000..aaabdf6844
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_medium.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ props/rubble_stone_wall_medium.dae
+
+
+
+
+
+
+
+
+
+ basic_trans_ao.xml
+
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_short.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_short.xml
new file mode 100644
index 0000000000..6247b3b93c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_short.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ props/rubble_stone_wall_short.dae
+
+
+
+
+
+
+
+
+
+ basic_trans_ao.xml
+
diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_tower.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_tower.xml
new file mode 100644
index 0000000000..446e675909
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_tower.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ props/rubble_stone_wall_tower.dae
+
+
+
+
+
+
+
+
+
+ basic_trans_ao.xml
+
diff --git a/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_long.dae b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_long.dae
new file mode 100644
index 0000000000..c75efdf4f7
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_long.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bb95d17d97d76c79f529c125828546152d2df67b264c287b6f5d7864c8c93e3
+size 336134
diff --git a/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_medium.dae b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_medium.dae
new file mode 100644
index 0000000000..2ae5e4937d
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_medium.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ed4cab202ec76a4888ef3344f2405e0e4f98d3b73bcdbeb22fdfa3d5c041bef
+size 144778
diff --git a/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_short.dae b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_short.dae
new file mode 100644
index 0000000000..d32e486b4b
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_short.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cd511a23162abb36ac0ee90f7079100868241b8bc7dc422eab3a160215db4cc
+size 119440
diff --git a/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_tower.dae b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_tower.dae
new file mode 100644
index 0000000000..8d0ff3259d
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/rubble_stone_wall_tower.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6acd78ce92661ae054d48b451b3625b185969dbdf61dbb8574db307fa40ac499
+size 178113
diff --git a/binaries/data/mods/public/art/meshes/structural/waterfall good3.png b/binaries/data/mods/public/art/meshes/structural/waterfall good3.png
new file mode 100644
index 0000000000..b24970bb6a
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/waterfall good3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc8e5bf3f11f103fd97ff1019040212961174d5611392b7d3cad2d0adf3bdcfc
+size 390697
diff --git a/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_long_AO.png b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_long_AO.png
new file mode 100644
index 0000000000..75b9c34773
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_long_AO.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5a25e7f02141ed3cef1b7c7aee07b12a9699a173f45daffb8e47cd83f163348
+size 248595
diff --git a/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_medium_AO.png b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_medium_AO.png
new file mode 100644
index 0000000000..a1d0e9983e
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_medium_AO.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:470d1c19ec990a81a0d1c516998876c422ee9ec720a5d55479f991f3cb5e52cc
+size 208907
diff --git a/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_short_AO.png b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_short_AO.png
new file mode 100644
index 0000000000..2d28af35e0
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_short_AO.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50d563c73c626269403c74c0b9ce3803c3cae00b9d4256cbc71fd181488925ea
+size 197172
diff --git a/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_tower_AO.png b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_tower_AO.png
new file mode 100644
index 0000000000..c6a676b30f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/ao/rubble_stone_wall_tower_AO.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dd63cf6164f566f8d152ac97e62be84ca77cdf3ebef52187d050f99e9f664e6
+size 203643
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_long.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_long.xml
new file mode 100644
index 0000000000..8dbc48371f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_long.xml
@@ -0,0 +1,6 @@
+
+
+
+ structures/destruct_stone_wall_long.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_medium.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_medium.xml
new file mode 100644
index 0000000000..436a544b0b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_medium.xml
@@ -0,0 +1,6 @@
+
+
+
+ structures/destruct_stone_wall_medium.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_short.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_short.xml
new file mode 100644
index 0000000000..683f5e6a96
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_short.xml
@@ -0,0 +1,6 @@
+
+
+
+ structures/destruct_stone_wall_short.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_tower.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_tower.xml
new file mode 100644
index 0000000000..19da737544
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_wall_tower.xml
@@ -0,0 +1,6 @@
+
+
+
+ structures/destruct_stone_wall_tower.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
index fc62c36848..a56fb8b54d 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
@@ -1,74 +1,74 @@
-
-
-
- 15.0
- 40.0
- 10.0
-
- 4.0
- 8.0
- 3.0
-
-
-
- Wall
-
-
- 20
-
- 60
-
-
-
-
- 8.0
-
-
- 20
-
-
- 2000
- rubble/rubble_wall
-
-
- City Gate
- Allow units access through a city wall. Can be locked to prevent access.
- -ConquestCritical Defensive StoneWall Gates
- structures/gate.png
- phase_town
-
-
- 100
- 0
- 20
- 20
- 0
-
-
-
-
-
-
-
-
-
-
-
-
- interface/complete/building/complete_gate.xml
- attack/destruction/building_collapse_large.xml
- interface/select/building/sel_gate.xml
- interface/select/building/sel_gate.xml
- interface/select/building/sel_gate.xml
- interface/select/building/sel_gate.xml
-
-
-
- false
- 20
- 65536
-
-
- structures/fndn_wall.xml
-
-
+
+
+
+ 15.0
+ 40.0
+ 10.0
+
+ 4.0
+ 8.0
+ 3.0
+
+
+
+ Wall
+
+
+ 20
+
+ 60
+
+
+
+
+ 8.0
+
+
+ 20
+
+
+ 2000
+ rubble/rubble_stone_wall_long
+
+
+ City Gate
+ Allow units access through a city wall. Can be locked to prevent access.
+ -ConquestCritical Defensive StoneWall Gates
+ structures/gate.png
+ phase_town
+
+
+ 100
+ 0
+ 20
+ 20
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+ interface/complete/building/complete_gate.xml
+ attack/destruction/building_collapse_large.xml
+ interface/select/building/sel_gate.xml
+ interface/select/building/sel_gate.xml
+ interface/select/building/sel_gate.xml
+ interface/select/building/sel_gate.xml
+
+
+
+ false
+ 20
+ 65536
+
+
+ structures/fndn_wall.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
index e8d5a36497..a8080504c9 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
@@ -1,13 +1,16 @@
-
-
-
- 30
-
- 30
-
-
-
- LongWall
- Long wall segments can be converted to gates.
-
-
+
+
+
+ 30
+
+ 30
+
+
+
+rubble/rubble_stone_wall_long
+
+
+ LongWall
+ Long wall segments can be converted to gates.
+
+
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
index 72fe5f5219..8708670b7e 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
@@ -1,9 +1,12 @@
-
-
-
- 20
-
- 20
-
-
-
+
+
+
+ 20
+
+ 20
+
+
+
+rubble/rubble_stone_wall_medium
+
+
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml
index 024e8617b9..960bcc5130 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml
@@ -1,9 +1,12 @@
-
-
-
- 10
-
- 10
-
-
-
+
+
+
+ 10
+
+ 10
+
+
+
+rubble/rubble_stone_wall_short
+
+
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 3ebf005f07..dd3ffbbfc1 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
@@ -1,94 +1,94 @@
-
-
-
- 20.0
- 40.0
- 15.0
-
- 5.0
- 8.0
- 4.0
-
-
-
-
- 0.0
- 25.0
- 0.0
- 40.0
- 12.0
- 75.0
- 1200
- 2000
- 1.5
-
-
-
- 1
- 1
-
-
- Wall
-
-
- 20
-
- 60
-
-
-
-
- 8.0
-
-
- 5
- 0.1
- Support Infantry
- 0
- 2
-
-
- 4000
- rubble/rubble_2x2
-
-
- Wall Turret
- Shoots arrows. Garrison to defend a city wall against attackers.
- Defensive -ConquestCritical StoneWall Tower
- structures/tower.png
- phase_town
-
-
- 100
- 0
- 10
- 15
- 0
-
-
-
-
-
-
-
-
- interface/complete/building/complete_tower.xml
- attack/weapon/arrowfly.xml
- attack/destruction/building_collapse_large.xml
-
-
-
- 20.0
-
-
- false
- 20
- 65536
-
-
- 60
-
-
- structures/fndn_2x2.xml
-
-
+
+
+
+ 20.0
+ 40.0
+ 15.0
+
+ 5.0
+ 8.0
+ 4.0
+
+
+
+
+ 0.0
+ 25.0
+ 0.0
+ 40.0
+ 12.0
+ 75.0
+ 1200
+ 2000
+ 1.5
+
+
+
+ 1
+ 1
+
+
+ Wall
+
+
+ 20
+
+ 60
+
+
+
+
+ 8.0
+
+
+ 5
+ 0.1
+ Support Infantry
+ 0
+ 2
+
+
+ 4000
+ rubble/rubble_stone_wall_tower
+
+
+ Wall Turret
+ Shoots arrows. Garrison to defend a city wall against attackers.
+ Defensive -ConquestCritical StoneWall Tower
+ structures/tower.png
+ phase_town
+
+
+ 100
+ 0
+ 10
+ 15
+ 0
+
+
+
+
+
+
+
+
+ interface/complete/building/complete_tower.xml
+ attack/weapon/arrowfly.xml
+ attack/destruction/building_collapse_large.xml
+
+
+
+ 20.0
+
+
+ false
+ 20
+ 65536
+
+
+ 60
+
+
+ structures/fndn_2x2.xml
+
+