Index: binaries/data/mods/public/simulation/templates/gaia/ruins/metal_statue_isis.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/ruins/metal_statue_isis.xml
+++ binaries/data/mods/public/simulation/templates/gaia/ruins/metal_statue_isis.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_ruins">
-  <Footprint replace="">
-    <Square width="10" depth="10"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Isis Cult Image</SpecificName>
-    <Icon>gaia/geology_metal.png</Icon>
-  </Identity>
-  <Obstruction>
-    <Static width="7.5" depth="7.5"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Max>800</Max>
-    <Type>metal.ruins</Type>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>structures/ptolemies/statue_isis.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_ruins">
+  <Footprint replace="">
+    <Square width="10" depth="10"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Isis Cult Image</SpecificName>
+    <Icon>gaia/geology_metal.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="7.5" depth="7.5"/>
+  </Obstruction>
+  <ResourceSupply>
+    <Max>800</Max>
+    <Type>metal.ruins</Type>
+  </ResourceSupply>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+    </SoundGroups>
+  </Sound>
+  <VisualActor>
+    <Actor>structures/ptolemies/statue_isis.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_bird.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_bird.xml
+++ binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_bird.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_ruins">
-  <Footprint replace="">
-    <Square width="3.0" depth="5.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Stone Resource</GenericName>
-    <SpecificName>Kushite Bird Statue</SpecificName>
-    <Icon>gaia/geology_stone_1.png</Icon>
-  </Identity>
-  <Obstruction>
-    <Static width="1.5" depth="3.5"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Max>200</Max>
-    <Type>stone.ruins</Type>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>props/structures/kushites/statue_bird.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_ruins">
+  <Footprint replace="">
+    <Square width="3.0" depth="5.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <GenericName>Stone Resource</GenericName>
+    <SpecificName>Kushite Bird Statue</SpecificName>
+    <Icon>gaia/geology_stone_1.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="1.5" depth="3.5"/>
+  </Obstruction>
+  <ResourceSupply>
+    <Max>200</Max>
+    <Type>stone.ruins</Type>
+  </ResourceSupply>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+    </SoundGroups>
+  </Sound>
+  <VisualActor>
+    <Actor>props/structures/kushites/statue_bird.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_lion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_lion.xml
+++ binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_lion.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_ruins">
-  <Footprint replace="">
-    <Square width="3.0" depth="5.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Stone Resource</GenericName>
-    <SpecificName>Apademak Lion Statue</SpecificName>
-    <Icon>gaia/geology_stone_1.png</Icon>
-  </Identity>
-  <Obstruction>
-    <Static width="1.5" depth="3.5"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Max>200</Max>
-    <Type>stone.ruins</Type>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>props/structures/kushites/statue_pedestal_rectangular_lion.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_ruins">
+  <Footprint replace="">
+    <Square width="3.0" depth="5.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <GenericName>Stone Resource</GenericName>
+    <SpecificName>Apademak Lion Statue</SpecificName>
+    <Icon>gaia/geology_stone_1.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="1.5" depth="3.5"/>
+  </Obstruction>
+  <ResourceSupply>
+    <Max>200</Max>
+    <Type>stone.ruins</Type>
+  </ResourceSupply>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+    </SoundGroups>
+  </Sound>
+  <VisualActor>
+    <Actor>props/structures/kushites/statue_pedestal_rectangular_lion.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_ram.xml
+++ binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite_ram.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_ruins">
-  <Footprint replace="">
-    <Square width="3.0" depth="5.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Stone Resource</GenericName>
-    <SpecificName>Ammon-Ra Ram Statue</SpecificName>
-    <Icon>gaia/geology_stone_1.png</Icon>
-  </Identity>
-  <Obstruction>
-    <Static width="1.5" depth="3.5"/>
-  </Obstruction>
-  <ResourceSupply>
-    <Max>200</Max>
-    <Type>stone.ruins</Type>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>props/structures/kushites/statue_pedestal_rectangular.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_ruins">
+  <Footprint replace="">
+    <Square width="3.0" depth="5.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <GenericName>Stone Resource</GenericName>
+    <SpecificName>Ammon-Ra Ram Statue</SpecificName>
+    <Icon>gaia/geology_stone_1.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="1.5" depth="3.5"/>
+  </Obstruction>
+  <ResourceSupply>
+    <Max>200</Max>
+    <Type>stone.ruins</Type>
+  </ResourceSupply>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+    </SoundGroups>
+  </Sound>
+  <VisualActor>
+    <Actor>props/structures/kushites/statue_pedestal_rectangular.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/metal_weapons_small.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/metal_weapons_small.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/metal_weapons_small.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_treasure">
-  <Footprint>
-    <Square width="3.5" depth="3.5"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Iron Weapons</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="2.75" depth="2.75"/>
-  </Obstruction>
-  <Selectable replace="">
-    <Overlay>
-      <Texture>
-        <MainTexture>128x128/ellipse.png</MainTexture>
-        <MainTextureMask>128x128/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Treasure>
-    <Resources>
-      <metal>100</metal>
-    </Resources>
-  </Treasure>
-  <VisualActor>
-    <Actor>props/special/eyecandy/treasure_weapons.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_treasure">
+  <Footprint>
+    <Square width="3.5" depth="3.5"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Iron Weapons</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="2.75" depth="2.75"/>
+  </Obstruction>
+  <Selectable replace="">
+    <Overlay>
+      <Texture>
+        <MainTexture>128x128/ellipse.png</MainTexture>
+        <MainTextureMask>128x128/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Treasure>
+    <Resources>
+      <metal>100</metal>
+    </Resources>
+  </Treasure>
+  <VisualActor>
+    <Actor>props/special/eyecandy/treasure_weapons.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_granite.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_granite.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_granite.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_treasure">
-  <Identity>
-    <SpecificName>Cut Granite</SpecificName>
-  </Identity>
-  <Treasure>
-    <Resources>
-      <stone>200</stone>
-    </Resources>
-  </Treasure>
-  <VisualActor>
-    <Actor>props/special/eyecandy/stone_pile.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_treasure">
+  <Identity>
+    <SpecificName>Cut Granite</SpecificName>
+  </Identity>
+  <Treasure>
+    <Resources>
+      <stone>200</stone>
+    </Resources>
+  </Treasure>
+  <VisualActor>
+    <Actor>props/special/eyecandy/stone_pile.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_granite_large.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_granite_large.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_granite_large.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_treasure">
-  <Footprint replace="">
-    <Square width="6.0" depth="6.0"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Cut Stone</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="4.0" depth="4.0"/>
-  </Obstruction>
-  <Treasure>
-    <Resources>
-      <stone>300</stone>
-    </Resources>
-  </Treasure>
-  <VisualActor>
-    <Actor>props/special/eyecandy/brick_pile_06.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Square width="6.0" depth="6.0"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Cut Stone</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="4.0" depth="4.0"/>
+  </Obstruction>
+  <Treasure>
+    <Resources>
+      <stone>300</stone>
+    </Resources>
+  </Treasure>
+  <VisualActor>
+    <Actor>props/special/eyecandy/brick_pile_06.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_red.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_red.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_red.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_treasure">
-  <Footprint replace="">
-    <Circle radius="4.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Cut Sandstone</SpecificName>
-    <Icon>gaia/geology_stone_2.png</Icon>
-  </Identity>
-  <Obstruction>
-    <Static width="6.5" depth="6.5"/>
-  </Obstruction>
-  <Treasure>
-    <Resources>
-      <stone>200</stone>
-    </Resources>
-  </Treasure>
-  <VisualActor>
-    <Actor>props/special/eyecandy/stone_pile_red.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_treasure">
+  <Footprint replace="">
+    <Circle radius="4.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Cut Sandstone</SpecificName>
+    <Icon>gaia/geology_stone_2.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="6.5" depth="6.5"/>
+  </Obstruction>
+  <Treasure>
+    <Resources>
+      <stone>200</stone>
+    </Resources>
+  </Treasure>
+  <VisualActor>
+    <Actor>props/special/eyecandy/stone_pile_red.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_sandstone.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_sandstone.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/stone_pile_sandstone.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_treasure">
-  <Identity>
-    <SpecificName>Cut Sandstone</SpecificName>
-    <Icon>gaia/geology_stone_1.png</Icon>
-  </Identity>
-  <Treasure>
-    <Resources>
-      <stone>200</stone>
-    </Resources>
-  </Treasure>
-  <VisualActor>
-    <Actor>props/special/eyecandy/stone_pile_sandstone.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_treasure">
+  <Identity>
+    <SpecificName>Cut Sandstone</SpecificName>
+    <Icon>gaia/geology_stone_1.png</Icon>
+  </Identity>
+  <Treasure>
+    <Resources>
+      <stone>200</stone>
+    </Resources>
+  </Treasure>
+  <VisualActor>
+    <Actor>props/special/eyecandy/stone_pile_sandstone.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/treasure/wood_lumber.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/treasure/wood_lumber.xml
+++ binaries/data/mods/public/simulation/templates/gaia/treasure/wood_lumber.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_treasure">
-  <Footprint>
-    <Square width="4.0" depth="7.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Identity>
-    <SpecificName>Milled Lumber</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="3.5" depth="6.5"/>
-  </Obstruction>
-  <Treasure>
-    <Resources>
-      <wood>200</wood>
-    </Resources>
-  </Treasure>
-  <VisualActor>
-    <Actor>props/special/eyecandy/wood_pile.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_treasure">
+  <Footprint>
+    <Square width="4.0" depth="7.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <Identity>
+    <SpecificName>Milled Lumber</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="3.5" depth="6.5"/>
+  </Obstruction>
+  <Treasure>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
+  </Treasure>
+  <VisualActor>
+    <Actor>props/special/eyecandy/wood_pile.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/mixins/hoplite.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/hoplite.xml
+++ binaries/data/mods/public/simulation/templates/mixins/hoplite.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <UnitAI>
     <Formations datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml
+++ binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Entity parent="mercenary">
   <Cost>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml
+++ binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Entity parent="mercenary">
   <Cost>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml
+++ binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Entity parent="mercenary">
   <Cost>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
+++ binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <Cost>
     <BuildTime op="mul">0.7</BuildTime>
Index: binaries/data/mods/public/simulation/templates/obstructors/placement.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/obstructors/placement.xml
+++ binaries/data/mods/public/simulation/templates/obstructors/placement.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity>
-  <AIProxy/>
-  <Footprint>
-    <Square width="38.5" depth="7.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Obstructor</GenericName>
-    <Icon>structures/wall.png</Icon>
-    <Tooltip>Placement obstructor to prevent construction but not movement</Tooltip>
-    <Undeletable>false</Undeletable>
-  </Identity>
-  <Obstruction>
-    <Active>true</Active>
-    <BlockMovement>false</BlockMovement>
-    <BlockPathfinding>false</BlockPathfinding>
-    <BlockFoundation>true</BlockFoundation>
-    <BlockConstruction>true</BlockConstruction>
-    <DeleteUponConstruction>false</DeleteUponConstruction>
-    <DisableBlockMovement>false</DisableBlockMovement>
-    <DisableBlockPathfinding>false</DisableBlockPathfinding>
-    <Static width="37.0" depth="6.0"/>
-  </Obstruction>
-  <Ownership/>
-  <Position>
-    <Altitude>0</Altitude>
-    <Anchor>upright</Anchor>
-    <Floating>false</Floating>
-    <FloatDepth>0.0</FloatDepth>
-    <TurnRate>6.0</TurnRate>
-  </Position>
-  <Selectable>
-    <Overlay>
-      <Outline>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.4</LineThickness>
-      </Outline>
-    </Overlay>
-  </Selectable>
-  <Visibility>
-    <RetainInFog>true</RetainInFog>
-    <AlwaysVisible>false</AlwaysVisible>
-    <Corpse>false</Corpse>
-    <Preview>false</Preview>
-  </Visibility>
-  <VisualActor>
-    <Actor>structures/hellenes/wall_long.xml</Actor>
-    <SilhouetteDisplay>false</SilhouetteDisplay>
-    <SilhouetteOccluder>false</SilhouetteOccluder>
-    <VisibleInAtlasOnly>true</VisibleInAtlasOnly>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+  <AIProxy/>
+  <Footprint>
+    <Square width="38.5" depth="7.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaia</Civ>
+    <GenericName>Obstructor</GenericName>
+    <Icon>structures/wall.png</Icon>
+    <Tooltip>Placement obstructor to prevent construction but not movement</Tooltip>
+    <Undeletable>false</Undeletable>
+  </Identity>
+  <Obstruction>
+    <Active>true</Active>
+    <BlockMovement>false</BlockMovement>
+    <BlockPathfinding>false</BlockPathfinding>
+    <BlockFoundation>true</BlockFoundation>
+    <BlockConstruction>true</BlockConstruction>
+    <DeleteUponConstruction>false</DeleteUponConstruction>
+    <DisableBlockMovement>false</DisableBlockMovement>
+    <DisableBlockPathfinding>false</DisableBlockPathfinding>
+    <Static width="37.0" depth="6.0"/>
+  </Obstruction>
+  <Ownership/>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <FloatDepth>0.0</FloatDepth>
+    <TurnRate>6.0</TurnRate>
+  </Position>
+  <Selectable>
+    <Overlay>
+      <Outline>
+        <LineTexture>outline_border.png</LineTexture>
+        <LineTextureMask>outline_border_mask.png</LineTextureMask>
+        <LineThickness>0.4</LineThickness>
+      </Outline>
+    </Overlay>
+  </Selectable>
+  <Visibility>
+    <RetainInFog>true</RetainInFog>
+    <AlwaysVisible>false</AlwaysVisible>
+    <Corpse>false</Corpse>
+    <Preview>false</Preview>
+  </Visibility>
+  <VisualActor>
+    <Actor>structures/hellenes/wall_long.xml</Actor>
+    <SilhouetteDisplay>false</SilhouetteDisplay>
+    <SilhouetteOccluder>false</SilhouetteOccluder>
+    <VisibleInAtlasOnly>true</VisibleInAtlasOnly>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/special/flare_target_marker.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/flare_target_marker.xml
+++ binaries/data/mods/public/simulation/templates/special/flare_target_marker.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="special/actor">
-  <Decay>
-    <Active>true</Active>
-    <SinkingAnim>false</SinkingAnim>
-    <DelayTime>6</DelayTime>
-    <SinkRate>10000</SinkRate>
-    <SinkAccel>0</SinkAccel>
-  </Decay>
-  <Ownership/>
-  <Position>
-    <Floating>true</Floating>
-  </Position>
-  <VisualActor>
-    <Actor>special/flare_target_marker.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special/actor">
+  <Decay>
+    <Active>true</Active>
+    <SinkingAnim>false</SinkingAnim>
+    <DelayTime>6</DelayTime>
+    <SinkRate>10000</SinkRate>
+    <SinkAccel>0</SinkAccel>
+  </Decay>
+  <Ownership/>
+  <Position>
+    <Floating>true</Floating>
+  </Position>
+  <VisualActor>
+    <Actor>special/flare_target_marker.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/apartment.xml
@@ -37,11 +37,11 @@
   <Population>
     <Bonus op="add">10</Bonus>
   </Population>
+  <TerritoryDecay>
+    <DecayRate op="mul">2</DecayRate>
+  </TerritoryDecay>
   <VisualActor>
     <FoundationActor>structures/carthaginians/fndn_house.xml</FoundationActor>
     <Actor>structures/carthaginians/apartment.xml</Actor>
   </VisualActor>
-  <TerritoryDecay>
-    <DecayRate op="mul">2</DecayRate>
-  </TerritoryDecay>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/han/defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/han/defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/han/defense_tower.xml
@@ -11,6 +11,12 @@
     <Civ>han</Civ>
     <SpecificName>Fángyù Tǎ</SpecificName>
   </Identity>
+  <Obstruction>
+    <Static depth="8.0" width="7.0"/>
+  </Obstruction>
+  <StatusBars>
+    <HeightOffset>22.0</HeightOffset>
+  </StatusBars>
   <Upgrade>
     <GreatArcheryTower>
       <Entity>structures/{civ}/defense_tower_great</Entity>
@@ -23,12 +29,6 @@
       <Variant>upgrading</Variant>
     </GreatArcheryTower>
   </Upgrade>
-  <Obstruction>
-    <Static depth="8.0" width="7.0"/>
-  </Obstruction>
-  <StatusBars>
-    <HeightOffset>22.0</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>structures/han/tower_large.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/han/house.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/han/house.xml
+++ binaries/data/mods/public/simulation/templates/structures/han/house.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house_big">
-  <GarrisonHolder>
-    <List datatype="tokens">Minister</List>
-  </GarrisonHolder>
   <Footprint>
     <Square depth="18.0" width="18.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <List datatype="tokens">Minister</List>
+  </GarrisonHolder>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Mín Jū</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/ice_house.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <BuildRestrictions>
-    <Territory>own</Territory>
-    <Category>Yakhchal</Category>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>60</BuildTime>
-    <Resources>
-      <stone>100</stone>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Circle radius="10.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <GarrisonHolder disable=""/>
-  <Health>
-    <Max>800</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Ice House</GenericName>
-    <SpecificName>Yakhchāl</SpecificName>
-    <VisibleClasses datatype="tokens">-City Village IceHouse</VisibleClasses>
-    <Classes datatype="tokens">
-	  CivSpecific
-	</Classes>
-    <RequiredTechnology>phase_village</RequiredTechnology>
-    <Icon>structures/yakhchal.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>20</stone>
-    <wood>20</wood>
-  </Loot>
-  <Obstruction>
-    <Static width="16.0" depth="16.0"/>
-  </Obstruction>
-  <ProductionQueue/>
-  <Researcher>
-    <Technologies datatype="tokens">
-      subterranean_aqueducts
-    </Technologies>
-  </Researcher>
-  <ResourceTrickle>
-    <Rates>
-      <food>1.0</food>
-    </Rates>
-    <Interval>2000</Interval>
-  </ResourceTrickle>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_farmstead.xml</select>
-      <constructed>interface/complete/building/complete_farmstead.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>20</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>20</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>structures/persians/ice_house.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_special">
+  <BuildRestrictions>
+    <Territory>own</Territory>
+    <Category>Yakhchal</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <stone>100</stone>
+      <wood>100</wood>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Circle radius="10.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder disable=""/>
+  <Health>
+    <Max>800</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Ice House</GenericName>
+    <SpecificName>Yakhchāl</SpecificName>
+    <VisibleClasses datatype="tokens">-City Village IceHouse</VisibleClasses>
+    <Classes datatype="tokens">
+	  CivSpecific
+	</Classes>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+    <Icon>structures/yakhchal.png</Icon>
+  </Identity>
+  <Loot>
+    <stone>20</stone>
+    <wood>20</wood>
+  </Loot>
+  <Obstruction>
+    <Static width="16.0" depth="16.0"/>
+  </Obstruction>
+  <ProductionQueue/>
+  <Researcher>
+    <Technologies datatype="tokens">
+      subterranean_aqueducts
+    </Technologies>
+  </Researcher>
+  <ResourceTrickle>
+    <Rates>
+      <food>1.0</food>
+    </Rates>
+    <Interval>2000</Interval>
+  </ResourceTrickle>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_farmstead.xml</select>
+      <constructed>interface/complete/building/complete_farmstead.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>20</Radius>
+    <Weight>30000</Weight>
+  </TerritoryInfluence>
+  <Vision>
+    <Range>20</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>structures/persians/ice_house.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/pers/inn.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/inn.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/inn.xml
@@ -14,7 +14,7 @@
   <Obstruction>
     <Static width="28.0" depth="15.0"/>
   </Obstruction>
-    <Population>
+  <Population>
     <Bonus>15</Bonus>
   </Population>
   <TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/structures/ptol/temple_2.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/temple_2.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/temple_2.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_temple">
-  <Footprint>
-    <Square width="30.0" depth="33.0"/>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Naos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="27.0" depth="30.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/ptolemies/temple_2.xml</Actor>
-    <FoundationActor>structures/fndn_7x8.xml</FoundationActor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_temple">
+  <Footprint>
+    <Square width="30.0" depth="33.0"/>
+  </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Naos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="27.0" depth="30.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/ptolemies/temple_2.xml</Actor>
+    <FoundationActor>structures/fndn_7x8.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
@@ -24,6 +24,12 @@
       </RangeOverlay>
     </Ranged>
   </Attack>
+  <BuildingAI>
+    <DefaultArrowCount>3</DefaultArrowCount>
+    <MaxArrowCount>15</MaxArrowCount>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
+  </BuildingAI>
   <BuildRestrictions>
     <Territory>neutral enemy</Territory>
     <Category>ArmyCamp</Category>
@@ -32,12 +38,6 @@
       <MinDistance>80</MinDistance>
     </Distance>
   </BuildRestrictions>
-  <BuildingAI>
-    <DefaultArrowCount>3</DefaultArrowCount>
-    <MaxArrowCount>15</MaxArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
-  </BuildingAI>
   <Capturable>
     <CapturePoints op="mul">3</CapturePoints>
     <RegenRate>10.0</RegenRate>
Index: binaries/data/mods/public/simulation/templates/structures/shrine_egyptian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/shrine_egyptian.xml
+++ binaries/data/mods/public/simulation/templates/structures/shrine_egyptian.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="shrine|template_structure_civic_temple">
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Sanctuary Kiosk</GenericName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/ptolemies/kiosk.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="shrine|template_structure_civic_temple">
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>Sanctuary Kiosk</GenericName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/ptolemies/kiosk.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/shrine_italian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/shrine_italian.xml
+++ binaries/data/mods/public/simulation/templates/structures/shrine_italian.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="shrine|template_structure_civic_temple">
-  <Footprint replace="">
-    <Circle radius="12.0"/>
-    <Height>18.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>rome</Civ>
-    <GenericName>Temple of Healing</GenericName>
-    <SpecificName>Aedēs Sanitatem</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="19.0" depth="19.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/romans/temple_vesta.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="shrine|template_structure_civic_temple">
+  <Footprint replace="">
+    <Circle radius="12.0"/>
+    <Height>18.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>rome</Civ>
+    <GenericName>Temple of Healing</GenericName>
+    <SpecificName>Aedēs Sanitatem</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="19.0" depth="19.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/romans/temple_vesta.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/shrine_kushite.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/shrine_kushite.xml
+++ binaries/data/mods/public/simulation/templates/structures/shrine_kushite.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="shrine|template_structure_civic_temple">
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Shrine</GenericName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/kushites/shrine.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="shrine|template_structure_civic_temple">
+  <Identity>
+    <Civ>kush</Civ>
+    <GenericName>Shrine</GenericName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/kushites/shrine.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/tent_desert.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/tent_desert.xml
+++ binaries/data/mods/public/simulation/templates/structures/tent_desert.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <BuildRestrictions>
-    <Territory>own neutral enemy</Territory>
-  </BuildRestrictions>
-  <Capturable>
-    <CapturePoints>25</CapturePoints>
-    <RegenRate>0</RegenRate>
-    <GarrisonRegenRate>5</GarrisonRegenRate>
-  </Capturable>
-  <Cost>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="12.0" depth="11.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>100</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Desert Army Tent</SpecificName>
-    <GenericName>Tent</GenericName>
-    <Icon>structures/mercenary_camp.png</Icon>
-    <VisibleClasses datatype="tokens">Tent</VisibleClasses>
-	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <Static width="10.0" depth="10.0"/>
-  </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-      <constructed>interface/complete/building/complete_universal.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay>
-    <DecayRate>1</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>structures/tent_big.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_special">
+  <BuildRestrictions>
+    <Territory>own neutral enemy</Territory>
+  </BuildRestrictions>
+  <Capturable>
+    <CapturePoints>25</CapturePoints>
+    <RegenRate>0</RegenRate>
+    <GarrisonRegenRate>5</GarrisonRegenRate>
+  </Capturable>
+  <Cost>
+    <BuildTime>20</BuildTime>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="12.0" depth="11.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Support Infantry</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
+  <Health>
+    <Max>100</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Desert Army Tent</SpecificName>
+    <GenericName>Tent</GenericName>
+    <Icon>structures/mercenary_camp.png</Icon>
+    <VisibleClasses datatype="tokens">Tent</VisibleClasses>
+	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
+  </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="10.0"/>
+  </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+      <constructed>interface/complete/building/complete_universal.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay>
+    <DecayRate>1</DecayRate>
+  </TerritoryDecay>
+  <TerritoryInfluence disable=""/>
+  <VisualActor>
+    <Actor>structures/tent_big.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/tent_mace.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/tent_mace.xml
+++ binaries/data/mods/public/simulation/templates/structures/tent_mace.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <BuildRestrictions>
-    <Territory>own neutral enemy</Territory>
-  </BuildRestrictions>
-  <Capturable>
-    <CapturePoints>25</CapturePoints>
-    <RegenRate>0</RegenRate>
-    <GarrisonRegenRate>5</GarrisonRegenRate>
-  </Capturable>
-  <Cost>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>100</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Macedonian Army Tent</SpecificName>
-    <GenericName>Tent</GenericName>
-    <Icon>structures/mercenary_camp.png</Icon>
-    <VisibleClasses datatype="tokens">Tent</VisibleClasses>
-	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <Static width="8.0" depth="8.0"/>
-  </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-      <constructed>interface/complete/building/complete_universal.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay>
-    <DecayRate>1</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>structures/tent_greek.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_special">
+  <BuildRestrictions>
+    <Territory>own neutral enemy</Territory>
+  </BuildRestrictions>
+  <Capturable>
+    <CapturePoints>25</CapturePoints>
+    <RegenRate>0</RegenRate>
+    <GarrisonRegenRate>5</GarrisonRegenRate>
+  </Capturable>
+  <Cost>
+    <BuildTime>20</BuildTime>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="9.0" depth="9.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Support Infantry</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
+  <Health>
+    <Max>100</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Macedonian Army Tent</SpecificName>
+    <GenericName>Tent</GenericName>
+    <Icon>structures/mercenary_camp.png</Icon>
+    <VisibleClasses datatype="tokens">Tent</VisibleClasses>
+	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
+  </Identity>
+  <Obstruction>
+    <Static width="8.0" depth="8.0"/>
+  </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+      <constructed>interface/complete/building/complete_universal.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay>
+    <DecayRate>1</DecayRate>
+  </TerritoryDecay>
+  <TerritoryInfluence disable=""/>
+  <VisualActor>
+    <Actor>structures/tent_greek.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/tent_rome.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/tent_rome.xml
+++ binaries/data/mods/public/simulation/templates/structures/tent_rome.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <BuildRestrictions>
-    <Territory>own neutral enemy</Territory>
-  </BuildRestrictions>
-  <Capturable>
-    <CapturePoints>25</CapturePoints>
-    <RegenRate>0</RegenRate>
-    <GarrisonRegenRate>5</GarrisonRegenRate>
-  </Capturable>
-  <Cost>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="11.0" depth="11.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>100</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Roman Army Tent</SpecificName>
-    <GenericName>Tent</GenericName>
-    <Icon>structures/mercenary_camp.png</Icon>
-    <VisibleClasses datatype="tokens">Tent</VisibleClasses>
-	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <Static width="8.0" depth="8.0"/>
-  </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_universal.xml</select>
-      <constructed>interface/complete/building/complete_universal.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay>
-    <DecayRate>1</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>props/structures/romans/rome_tent.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_special">
+  <BuildRestrictions>
+    <Territory>own neutral enemy</Territory>
+  </BuildRestrictions>
+  <Capturable>
+    <CapturePoints>25</CapturePoints>
+    <RegenRate>0</RegenRate>
+    <GarrisonRegenRate>5</GarrisonRegenRate>
+  </Capturable>
+  <Cost>
+    <BuildTime>20</BuildTime>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="11.0" depth="11.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Support Infantry</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
+  <Health>
+    <Max>100</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Roman Army Tent</SpecificName>
+    <GenericName>Tent</GenericName>
+    <Icon>structures/mercenary_camp.png</Icon>
+    <VisibleClasses datatype="tokens">Tent</VisibleClasses>
+	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
+  </Identity>
+  <Obstruction>
+    <Static width="8.0" depth="8.0"/>
+  </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_universal.xml</select>
+      <constructed>interface/complete/building/complete_universal.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
+  <TerritoryDecay>
+    <DecayRate>1</DecayRate>
+  </TerritoryDecay>
+  <TerritoryInfluence disable=""/>
+  <VisualActor>
+    <Actor>props/structures/romans/rome_tent.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/trading_post_celtic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/trading_post_celtic.xml
+++ binaries/data/mods/public/simulation/templates/structures/trading_post_celtic.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="trading_post|template_structure_economic_market">
-  <Footprint>
-    <Square width="22.0" depth="22.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>gaul</Civ>
-    <SpecificName>Celtic Tavern</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="20.0" depth="20.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/celts/tavern.xml</Actor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="trading_post|template_structure_economic_market">
+  <Footprint>
+    <Square width="22.0" depth="22.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>gaul</Civ>
+    <SpecificName>Celtic Tavern</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="20.0" depth="20.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/celts/tavern.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -30,6 +30,11 @@
       </RangeOverlay>
     </Ranged>
   </Attack>
+  <BuildingAI>
+    <DefaultArrowCount>3</DefaultArrowCount>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
+  </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Category>CivilCentre</Category>
@@ -38,11 +43,6 @@
       <MinDistance>200</MinDistance>
     </Distance>
   </BuildRestrictions>
-  <BuildingAI>
-    <DefaultArrowCount>3</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
-  </BuildingAI>
   <Capturable>
     <CapturePoints>2500</CapturePoints>
     <RegenRate>5.0</RegenRate>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
+  <BuildingAI>
+    <DefaultArrowCount>1</DefaultArrowCount>
+  </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Category>Colony</Category>
@@ -8,9 +11,6 @@
       <MinDistance>120</MinDistance>
     </Distance>
   </BuildRestrictions>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-  </BuildingAI>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -24,6 +24,11 @@
       </RangeOverlay>
     </Ranged>
   </Attack>
+  <BuildingAI>
+    <DefaultArrowCount>4</DefaultArrowCount>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
+  </BuildingAI>
   <BuildRestrictions>
     <Category>Fortress</Category>
     <Distance>
@@ -31,11 +36,6 @@
       <MinDistance>80</MinDistance>
     </Distance>
   </BuildRestrictions>
-  <BuildingAI>
-    <DefaultArrowCount>4</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
-  </BuildingAI>
   <Capturable>
     <CapturePoints op="mul">8</CapturePoints>
     <RegenRate>10.0</RegenRate>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
@@ -45,9 +45,6 @@
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
-  <Vision>
-    <Range>0</Range>
-  </Vision>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.8</WalkSpeed>
@@ -55,4 +52,7 @@
     <Acceleration op="mul">1.8</Acceleration>
     <Weight op="mul">5.0</Weight>
   </UnitMotion>
+  <Vision>
+    <Range>0</Range>
+  </Vision>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -68,6 +68,13 @@
     <wood>100</wood>
     <metal>60</metal>
   </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Pierce>50</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Selectable>
     <Overlay>
       <Texture>
@@ -89,13 +96,6 @@
   <StatusBars>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Pierce>50</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
   <UnitMotion>
     <WalkSpeed op="mul">0.7</WalkSpeed>
     <Acceleration op="mul">0.7</Acceleration>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -45,7 +45,6 @@
       <metal>10</metal>
     </Capacities>
   </ResourceGatherer>
-  <TreasureCollector disable=""/>
   <Sound>
     <SoundGroups>
       <build>resource/construction/con_wood.xml</build>
@@ -60,4 +59,5 @@
       <trained>actor/singlesteps/steps_gravel_trained.xml</trained>
     </SoundGroups>
   </Sound>
+  <TreasureCollector disable=""/>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
@@ -10,6 +10,11 @@
     <Icon>units/athen_ship_trireme.png</Icon>
   </Identity>
   <ProductionQueue/>
+  <Researcher>
+    <Technologies datatype="tokens">
+      iphicratean_reforms
+    </Technologies>
+  </Researcher>
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
@@ -17,11 +22,6 @@
       units/{civ}/champion_marine
     </Entities>
   </Trainer>
-  <Researcher>
-    <Technologies datatype="tokens">
-      iphicratean_reforms
-    </Technologies>
-  </Researcher>
   <VisualActor>
     <Actor>structures/athenians/trireme.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing.xml
+++ binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_crossbowman">
-  <Auras datatype="tokens">
-    units/heroes/han_hero_wei_qing_1
-    units/heroes/han_hero_wei_qing_2
-  </Auras>
   <Attack>
     <Ranged>
       <Damage>
@@ -11,6 +7,10 @@
       </Damage>
     </Ranged>
   </Attack>
+  <Auras datatype="tokens">
+    units/heroes/han_hero_wei_qing_1
+    units/heroes/han_hero_wei_qing_2
+  </Auras>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Wèi Qīng</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_chariot.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_crossbowman">
-  <Auras datatype="tokens">
-    units/heroes/han_hero_wei_qing_1
-    units/heroes/han_hero_wei_qing_2
-  </Auras>
   <Attack>
     <Ranged>
       <Damage>
@@ -11,6 +7,10 @@
       </Damage>
     </Ranged>
   </Attack>
+  <Auras datatype="tokens">
+    units/heroes/han_hero_wei_qing_1
+    units/heroes/han_hero_wei_qing_2
+  </Auras>
   <Footprint replace="">
     <Square depth="10.0" width="10.0"/>
     <Height>5.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_horse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_horse.xml
+++ binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_horse.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_crossbowman">
-  <Auras datatype="tokens">
-    units/heroes/han_hero_wei_qing_1
-    units/heroes/han_hero_wei_qing_2
-  </Auras>
   <Attack>
     <Ranged>
       <Damage>
@@ -11,6 +7,10 @@
       </Damage>
     </Ranged>
   </Attack>
+  <Auras datatype="tokens">
+    units/heroes/han_hero_wei_qing_1
+    units/heroes/han_hero_wei_qing_2
+  </Auras>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Wèi Qīng</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml
@@ -25,9 +25,6 @@
   <Promotion>
     <Entity>units/han/infantry_pikeman_a</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/han/infantry_halberdman_b.xml</Actor>
-  </VisualActor>
   <Resistance>
     <Entity>
       <Damage>
@@ -41,4 +38,7 @@
       special/formations/anti_cavalry
     </Formations>
   </UnitAI>
+  <VisualActor>
+    <Actor>units/han/infantry_halberdman_b.xml</Actor>
+  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/han/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/han/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/han/infantry_spearman_b.xml
@@ -14,12 +14,12 @@
   <Promotion>
     <Entity>units/han/infantry_spearman_a</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/han/infantry_spearman_b.xml</Actor>
-  </VisualActor>
   <UnitAI>
     <Formations datatype="tokens">
       special/formations/anti_cavalry
     </Formations>
   </UnitAI>
+  <VisualActor>
+    <Actor>units/han/infantry_spearman_b.xml</Actor>
+  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
@@ -19,6 +19,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
+  </UnitMotion>
   <Upgrade>
     <Immortal_archer>
       <Entity>units/pers/champion_infantry_archer</Entity>
@@ -27,9 +30,6 @@
       <Time>8</Time>
     </Immortal_archer>
   </Upgrade>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_c2.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer.xml
@@ -11,6 +11,9 @@
     <VisibleClasses datatype="tokens">Immortal</VisibleClasses>
     <Icon>units/pers_champion_infantry_archer.png</Icon>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.79</WalkSpeed>
+  </UnitMotion>
   <Upgrade>
     <Immortal_spearman>
       <Entity>units/pers/champion_infantry</Entity>
@@ -19,9 +22,6 @@
       <Time>8</Time>
     </Immortal_spearman>
   </Upgrade>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.79</WalkSpeed>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/persians/infantry_archer_c.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
@@ -16,9 +16,6 @@
   <Health>
     <Max op="mul">1.4</Max>
   </Health>
-  <Loot>
-    <xp op="add">1</xp>
-  </Loot>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
@@ -26,6 +23,9 @@
     <SpecificName>Spartiâtis</SpecificName>
     <Icon>units/spart_support_female_citizen.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">1</xp>
+  </Loot>
   <UnitAI>
     <CanPatrol>true</CanPatrol>
   </UnitAI>