diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
index b7d0c33ca6..ade78e7b1d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
index bfa9c9e94f..6d42919771 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>2.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>3</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <Footprint>
     <Circle radius="1.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
index 6fc435a323..5d4953391b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
index ec4f5d6b9f..e9dd3c68b1 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
index f5980ee10c..3c624da337 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
-    <Hack>6.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/other/bench.xml b/binaries/data/mods/public/simulation/templates/other/bench.xml
index b7744afdb9..aa0a816355 100644
--- a/binaries/data/mods/public/simulation/templates/other/bench.xml
+++ b/binaries/data/mods/public/simulation/templates/other/bench.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>10</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/celt_homestead.xml b/binaries/data/mods/public/simulation/templates/other/celt_homestead.xml
index 9ad6ba0e58..f6d6330abc 100644
--- a/binaries/data/mods/public/simulation/templates/other/celt_homestead.xml
+++ b/binaries/data/mods/public/simulation/templates/other/celt_homestead.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Cost>
     <PopulationBonus>20</PopulationBonus>
     <BuildTime>600</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/other/column_doric.xml b/binaries/data/mods/public/simulation/templates/other/column_doric.xml
index 98496ea6e8..10fa7d3561 100644
--- a/binaries/data/mods/public/simulation/templates/other/column_doric.xml
+++ b/binaries/data/mods/public/simulation/templates/other/column_doric.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>5.0</Crush>
+    <Hack>2</Hack>
+    <Pierce>5</Pierce>
+    <Crush>2</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Fence</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
index 10e0bdd94a..ad270f7e43 100644
--- a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
+++ b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>5.0</Crush>
+    <Hack>2</Hack>
+    <Pierce>5</Pierce>
+    <Crush>2</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
index 2efb010d36..c1e1b65049 100644
--- a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
+++ b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>5.0</Crush>
+    <Hack>2</Hack>
+    <Pierce>5</Pierce>
+    <Crush>2</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/fence_long.xml b/binaries/data/mods/public/simulation/templates/other/fence_long.xml
index 4f621ccdbe..674ae0aa71 100644
--- a/binaries/data/mods/public/simulation/templates/other/fence_long.xml
+++ b/binaries/data/mods/public/simulation/templates/other/fence_long.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>2.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>10</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/fence_short.xml b/binaries/data/mods/public/simulation/templates/other/fence_short.xml
index 189daab2ea..8b754d0777 100644
--- a/binaries/data/mods/public/simulation/templates/other/fence_short.xml
+++ b/binaries/data/mods/public/simulation/templates/other/fence_short.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>2.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>10</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/fence_stone.xml b/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
index 9245f1bddc..8e7ea6baa6 100644
--- a/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>15.0</Pierce>
-    <Crush>5.0</Crush>
+    <Hack>2</Hack>
+    <Pierce>10</Pierce>
+    <Crush>2</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
index f99b0fc8ed..21a3bf8491 100644
--- a/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
+++ b/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+<Entity parent="template_structure_civic">
   <BuildRestrictions>
     <Category>Special</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
index 1c86524f98..184a124a91 100644
--- a/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
+<Entity parent="template_structure_civic">
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
index 1ac0e275cd..e6e8eb9c4a 100644
--- a/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Armour>
-    <Hack>20.0</Hack>
-    <Pierce>40.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
+<Entity parent="template_structure_civic">
   <BuildRestrictions>
     <Category>Stoa</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/other/obelisk.xml b/binaries/data/mods/public/simulation/templates/other/obelisk.xml
index f175b85fb1..89834bea6a 100644
--- a/binaries/data/mods/public/simulation/templates/other/obelisk.xml
+++ b/binaries/data/mods/public/simulation/templates/other/obelisk.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>20.0</Crush>
+    <Hack>2</Hack>
+    <Pierce>10</Pierce>
+    <Crush>2</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
index c49a68e107..2390c54085 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_gate">
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Cost>
     <BuildTime>15</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
index a365b801db..857efb8945 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_long">
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Cost>
     <BuildTime>15</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
index 2e0c15437a..4b4120f79c 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Cost>
     <BuildTime>12</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
index c3a7d1f695..6dc09512f2 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Cost>
     <BuildTime>10</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
index 46c5c0bb1c..5fbeb605be 100644
--- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Armour>
-    <Hack>5.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>10.0</Crush>
-  </Armour>
   <Cost>
     <BuildTime>10</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml b/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
index 8c1bd0650f..fa5fa3dcab 100644
--- a/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
+++ b/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>10</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/table_square.xml b/binaries/data/mods/public/simulation/templates/other/table_square.xml
index 2cd14a5402..adb6626add 100644
--- a/binaries/data/mods/public/simulation/templates/other/table_square.xml
+++ b/binaries/data/mods/public/simulation/templates/other/table_square.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>10</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
diff --git a/binaries/data/mods/public/simulation/templates/other/temp_hele_isp_sword.xml b/binaries/data/mods/public/simulation/templates/other/temp_hele_isp_sword.xml
index 87dca88a03..eab0c92522 100644
--- a/binaries/data/mods/public/simulation/templates/other/temp_hele_isp_sword.xml
+++ b/binaries/data/mods/public/simulation/templates/other/temp_hele_isp_sword.xml
@@ -1,32 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_infantry_spearman_a">
-  <Armour>
-    <Hack>7.0</Hack>
-    <Pierce>5.0</Pierce>
-    <Crush>12.0</Crush>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Hack>17.0</Hack>
-      <Pierce>8.5</Pierce>
-    </Melee>
-    <Charge>
-      <Hack>35.0</Hack>
-      <Pierce>17.0</Pierce>
-    </Charge>
-  </Attack>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Identity>
-    <Icon>units/hele_infantry_spearman.png</Icon>
-  </Identity>
-  <UnitMotion>
-    <WalkSpeed>7.25</WalkSpeed>
-    <Run>
-      <Speed>14.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>temp/sword_hoplite_1.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 18f582b495..033a473468 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_entity_full">
   <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>1.0</Pierce>
-    <Crush>1.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>1</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>