diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_range.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_range.xml
new file mode 100644
index 0000000000..6fb2b74eb5
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_range.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_range">
+  <Footprint>
+    <Square width="27.0" depth="27.0"/>
+  </Footprint>
+  <Identity>
+    <Civ>skirm</Civ>
+  </Identity>
+  <Obstruction>
+    <Static width="26.0" depth="26.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <SkirmishReplacer>
+    <general>structures/{civ}_range</general>
+  </SkirmishReplacer>
+  <VisualActor>
+    <Actor>structures/hellenes/range.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_stable.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_stable.xml
new file mode 100644
index 0000000000..4f6021c82d
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_stable.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_stable">
+  <Footprint>
+    <Square width="25.0" depth="26.0"/>
+  </Footprint>
+  <Identity>
+    <Civ>skirm</Civ>
+  </Identity>
+  <Obstruction>
+    <Static width="23.0" depth="23.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <SkirmishReplacer>
+    <general>structures/{civ}_stable</general>
+  </SkirmishReplacer>
+  <VisualActor>
+    <Actor>structures/hellenes/stable.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wonder.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wonder.xml
new file mode 100644
index 0000000000..4b063a8d8b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wonder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_wonder">
+  <Footprint>
+    <Square width="62.0" depth="66.0"/>
+  </Footprint>
+  <Identity>
+    <Civ>skirm</Civ>
+  </Identity>
+  <Obstruction>
+    <Static width="59.0" depth="63.0"/>
+  </Obstruction>
+  <ProductionQueue disable=""/>
+  <SkirmishReplacer>
+    <general>structures/{civ}_wonder</general>
+  </SkirmishReplacer>
+  <VisualActor>
+    <Actor>structures/hellenes/temple_epic.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
new file mode 100644
index 0000000000..264343739c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_workshop">
+  <Identity>
+    <Civ>skirm</Civ>
+  </Identity>
+  <ProductionQueue disable=""/>
+  <SkirmishReplacer>
+    <general>structures/{civ}_workshop</general>
+  </SkirmishReplacer>
+  <VisualActor>
+    <Actor>structures/hellenes/workshop.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml b/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml
index cc550e5e15..90c7421b9b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Hippṓn</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
index ac5360dafe..dd87ec6069 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>athen</Civ>
+    <SpecificName>Hoplothēkē</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/workshop.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml b/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
index f5d24da613..72e1158d25 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Eposton</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/britons/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x5.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
index 53d139aee7..614b60c604 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_workshop">
-  <Footprint>
-    <Square width="32.0" depth="32.0"/>
-  </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Miletucerdon</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="32.0" depth="32.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/britons/workshop.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml b/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml
index aa39a6fc72..2452f81a8e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>cart</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
index acdb9938d8..c98865ca72 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Eposton</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/gauls/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml b/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml
index 36d845862a..893efa06b0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>iber</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x5.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
index 2771a5d361..6ada390287 100644
--- a/binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
@@ -4,12 +4,6 @@
     <Civ>kush</Civ>
     <SpecificName>Pr-ỉwn n ms</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -siege_attack
-      -siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/workshop.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml b/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml
index 9e01ae20b9..4b66fd6c96 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Hippṓn</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
index cb6774193e..0032c755b2 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
@@ -1,20 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_workshop">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>mace</Civ>
-    <SpecificName>Synergeîon Poliorkētṓn</SpecificName>
+    <SpecificName>Hoplothēkē</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/hellenes/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml b/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
index 2b2cbba000..9b84d419ac 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>maur</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/mauryas/stable.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
index 6139e21d4b..c64cec8826 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_workshop">
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>maur</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/mauryas/workshop.xml</Actor>
-    <FoundationActor>structures/fndn_9x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/pers_wonder.xml
index ace264a9a1..d9e1fcb2fe 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_wonder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Footprint replace="">
+  <Footprint>
     <Square width="62.0" depth="62.0"/>
     <Height>10.0</Height>
   </Footprint>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml
index c71e6fe00f..1dc32ebed2 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Hippṓn</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
index 45ddcbf2ab..3b2e2631e3 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>ptol</Civ>
+    <SpecificName>Hoplothēkē</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/workshop.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml b/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml
index 8fb021ef13..33265d8175 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>rome</Civ>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/romans/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml b/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml
index 0eafd8ddc8..2900aa6b0e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Hippṓn</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/seleucids/stable.xml</Actor>
     <FoundationActor>structures/fndn_7x6.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
index 47b04620f7..423b9751b2 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>sele</Civ>
+    <SpecificName>Hoplothēkē</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>structures/seleucids/workshop.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml b/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml
index 5d174764c0..51ffeff555 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Hippṓn</SpecificName>
   </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
   <VisualActor>
     <Actor>structures/spartans/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml b/binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
index ec4d6ce7ea..4c4fd25a99 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_structure_military_workshop">
   <Identity>
     <Civ>spart</Civ>
-    <SpecificName>Stratēgeîon</SpecificName>
+    <SpecificName>Hoplothēkē</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/workshop.xml</Actor>