diff --git a/binaries/data/mods/public/simulation/templates/other/pyramid_great.xml b/binaries/data/mods/public/simulation/templates/other/pyramid_great.xml
index bc2d055edd..5f4f0367df 100644
--- a/binaries/data/mods/public/simulation/templates/other/pyramid_great.xml
+++ b/binaries/data/mods/public/simulation/templates/other/pyramid_great.xml
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Armour>
-    <Hack>40.0</Hack>
-    <Pierce>50.0</Pierce>
-    <Crush>50.0</Crush>
-  </Armour>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
-  <Footprint>
-    <Square width="60.5" depth="60.5"/>
+<Entity parent="template_gaia_ruins">
+  <Footprint replace="">
+    <Square width="62.0" depth="62.0"/>
     <Height>10.0</Height>
   </Footprint>
-  <Health>
-    <Max>10000</Max>
-  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Pyramid</GenericName>
     <SpecificName>Great Pyramid</SpecificName>
     <History>A monumental ornamental structure built by the Egyptians of old.</History>
-	<Tooltip>What treasures lay within this monumental tomb?</Tooltip>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
   <Loot>
-    <xp>100</xp>
-    <food>0</food>
-    <wood>0</wood>
-    <stone>20000</stone>
-    <metal>20000</metal>
+    <xp>200</xp>
   </Loot>
   <Obstruction>
     <Static width="59.0" depth="59.0"/>
   </Obstruction>
+  <ResourceSupply>
+    <Amount>10000</Amount>
+    <Type>stone.ruins</Type>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <TerritoryDecay disable=""/>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>12.0</HeightOffset>
+  </StatusBars>
   <Vision>
     <Range>72</Range>
     <RetainInFog>true</RetainInFog>
diff --git a/binaries/data/mods/public/simulation/templates/other/pyramid_minor.xml b/binaries/data/mods/public/simulation/templates/other/pyramid_minor.xml
index 597fa82cf2..39df8548d5 100644
--- a/binaries/data/mods/public/simulation/templates/other/pyramid_minor.xml
+++ b/binaries/data/mods/public/simulation/templates/other/pyramid_minor.xml
@@ -1,45 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Armour>
-    <Hack>40.0</Hack>
-    <Pierce>50.0</Pierce>
-    <Crush>50.0</Crush>
-  </Armour>
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
-  <Footprint>
-    <Square width="35.5" depth="35.5"/>
+<Entity parent="template_gaia_ruins">
+  <Footprint replace="">
+    <Square width="38.0" depth="38.0"/>
     <Height>10.0</Height>
   </Footprint>
-  <Health>
-    <Max>5000</Max>
-  </Health>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Pyramid</GenericName>
     <SpecificName>Minor Pyramid</SpecificName>
     <History>A monumental ornamental structure built by the Egyptians of old.</History>
-	<Tooltip>What treasures lay within this monumental tomb?</Tooltip>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
-  <Loot>
-    <xp>100</xp>
-    <food>0</food>
-    <wood>0</wood>
-    <stone>10000</stone>
-    <metal>10000</metal>
-  </Loot>
   <Obstruction>
     <Static width="34.0" depth="34.0"/>
   </Obstruction>
+  <ResourceSupply>
+    <Amount>5000</Amount>
+    <Type>stone.ruins</Type>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
-  <TerritoryDecay disable=""/>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>12.0</HeightOffset>
+  </StatusBars>
   <Vision>
     <Range>40</Range>
     <RetainInFog>true</RetainInFog>
diff --git a/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml b/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml
index 6aad998edb..27fab1701c 100644
--- a/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml
@@ -18,6 +18,11 @@
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.6</BarHeight>
+    <HeightOffset>12.0</HeightOffset>
+  </StatusBars>
   <Vision>
     <Range>40</Range>
     <RetainInFog>true</RetainInFog>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_temple.xml b/binaries/data/mods/public/simulation/templates/structures/rome_temple.xml
index 27292e079e..2343573ee6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_temple.xml
@@ -6,8 +6,8 @@
   </Footprint>
   <Identity>
     <Civ>rome</Civ>
-    <SpecificName>Nosocomium</SpecificName>
-    <History>Roman temples in general were not meant for congregational worship. Instead the temple housed a statue of whatever deity the temple was dedicated to and what was needed to carry out the ceremonial and cultic practice necessary for worship. The actual activity was performed outside.</History>
+    <SpecificName>Aedes</SpecificName>
+    <History>Roman temples in general were not meant for congregational worship. Instead the temple housed a statue of whatever deity the temple was dedicated to and what was needed to carry out the ceremonial and cultic practice necessary for worship. Any actual worship activity was performed outside.</History>
   </Identity>
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml b/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
index 14401f3220..5753cd6859 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
@@ -6,7 +6,8 @@
   </Footprint>
   <Identity>
     <Civ>rome</Civ>
-    <SpecificName>Nosocomium</SpecificName>
+    <SpecificName>Temple of Vesta</SpecificName>
+    <SpecificName>Aedea Vestae</SpecificName>
     <History>(Insert History)</History>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
index 2f049db365..6af1b86399 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
@@ -20,7 +20,7 @@
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>500</Amount>
-    <Type>stone.rock</Type>
+    <Type>stone.ruins</Type>
   </ResourceSupply>
   <Selectable/>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
index 529c3d7d0b..126bf488ee 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
@@ -18,12 +18,6 @@
     <Square width="17.0" depth="17.0"/>
     <Height>8.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <Max>10</Max>
-	<EjectHealth>0.1</EjectHealth>
-	<List datatype="tokens">Support</List>
-	<BuffHeal>1</BuffHeal>
-  </GarrisonHolder>
   <Health>
     <Max>1500</Max>
   </Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_champion_swordsman_polis.xml b/binaries/data/mods/public/simulation/templates/units/hele_champion_swordsman_polis.xml
index 2949962e53..2e2013a9fd 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_champion_swordsman_polis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_champion_swordsman_polis.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Armour>
     <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
+    <Pierce>11.0</Pierce>
   </Armour>
   <Attack>
     <Melee>
@@ -51,7 +51,7 @@
 	<GenericName>Athenian Light Hoplite</GenericName>
     <SpecificName>Ékdromos Athēnaïkós</SpecificName>
     <Tooltip>Poleis Champion Raider.
-Counters Support Units and Ranged Units. Countered by Melee Cavalry. Fast Move Speed.</Tooltip>
+Counters Support Units, Spear units, and Ranged Units (if they can catch them). Countered by Archers.</Tooltip>
     <History>Ekdromos (literally: out runner) was a development of the Hoplite. Development of the Hoplite took many twists and turns based on the changing dynamics on the field of battle. Once armies began using Peltasts imported from Thrace something had to be done to counter this barrage of javelins thrown into the midst of a phalanx. The Thebans began to increase the armor of their hoplites, but the Athenians took a completely different approach and lightened the load for their infantry. The Ekdromoi would dash out from the phalanx, close with the enemy ranged units at speed, and cut them down at will. This approach also worked to harass more heavily armed troops as well, the enemy carrying too much weight to catch the vexatious Ekdromoi.</History>
     <Icon>units/hele_champion_ranged_polis.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
index 9853fc1653..8f77c5c6d6 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
@@ -6,7 +6,8 @@
 	<GenericName>Consular Bodyguard</GenericName>
     <Icon>units/rome_champion_cavalry.png</Icon>
     <History>The Equites Consulares were the best of the Roman cavalry that were picked out by the commanding Consul and served under him directly. They functioned about identical to later Praetorian cavalry, but were usually made up of the most local Italian allies. The Italic cavalry was of better quality and quantity then the citizen cavalry of the Republic, and were highly prized for service.</History>
-	<Tooltip>Elite bodyguard of the Roman Consul.</Tooltip>
+	<Tooltip>Elite bodyguard of the Roman Consul on campaign.
+Good heavy cavalry and raider. Counters Support Units and Archers. Countered by Spearmen and Pikemen.</Tooltip>
   </Identity>
   <VisualActor>
     <Actor>units/romans/champion_unit_2.xml</Actor>