Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wonder.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">
-    structures/epic_temple_heal
-  </Auras>
   <Footprint>
     <Square width="28.0" depth="58.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <BuffHeal>8</BuffHeal>
-  </GarrisonHolder>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Parthenōn</SpecificName>
-    <Tooltip>Bring glory to your civilization and add large tracts of land to your empire. Garrison units to heal them at an extremely quick rate.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="27.0" depth="57.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wonder.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">
-    structures/epic_temple_heal
-  </Auras>
   <Footprint>
     <Square width="29.0" depth="59.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <BuffHeal>8</BuffHeal>
-  </GarrisonHolder>
   <Identity>
-   <Civ>cart</Civ>
+    <Civ>cart</Civ>
     <SpecificName>Temple of Ba'al Hammon</SpecificName>
-    <Tooltip>Bring glory to your civilization and add large tracts of land to your empire. Garrison units to heal them at an extremely quick rate.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="27.0" depth="57.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wonder.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">
-    structures/epic_temple_heal
-  </Auras>
   <Footprint>
     <Square width="48.0" depth="66.0"/>
     <Height>20.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <BuffHeal>8</BuffHeal>
-  </GarrisonHolder>
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Mnw nht</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wonder.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">
-    structures/epic_temple_heal
-  </Auras>
   <Footprint>
     <Square width="28.0" depth="58.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <BuffHeal>8</BuffHeal>
-  </GarrisonHolder>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Hieron tou Dios tou Olympiou</SpecificName>
-    <Tooltip>Bring glory to your civilization and add large tracts of land to your empire. Garrison units to heal them at an extremely quick rate.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="27.0" depth="57.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wonder.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">
-    structures/epic_temple_heal
-  </Auras>
   <Footprint>
     <Square width="48.0" depth="66.0"/>
     <Height>20.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <BuffHeal>8</BuffHeal>
-  </GarrisonHolder>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Hieron tou Hōrou</SpecificName>
-    <Tooltip>Bring glory to your civilization and add large tracts of land to your empire. Garrison units to heal them at an extremely quick rate.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="44.0" depth="60.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">
-    structures/epic_temple_heal
-  </Auras>
   <Footprint>
     <Square width="46.0" depth="54.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <BuffHeal>8</BuffHeal>
-  </GarrisonHolder>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Aedēs Iovis Optimi Maximi</SpecificName>
-    <Tooltip>Bring glory to your civilization and add large tracts of land to your empire. Garrison units to heal them at an extremely quick rate.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="42.0" depth="50.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wonder.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">
-    structures/epic_temple_heal
-  </Auras>
   <Footprint>
     <Square width="35.0" depth="64.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <GarrisonHolder>
-    <BuffHeal>8</BuffHeal>
-  </GarrisonHolder>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Hieron tēs Artemidos Orthias</SpecificName>
-    <Tooltip>Bring glory to your civilization and add large tracts of land to your empire. Garrison units to heal them at a quick rate.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="34.0" depth="63.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -11,6 +11,7 @@
     </Foundation>
   </Armour>
   <Auras datatype="tokens">
+    structures/epic_temple_heal
     structures/wonder_pop_1
     structures/wonder_pop_2
   </Auras>
@@ -35,11 +36,11 @@
     <Height>10.0</Height>
   </Footprint>
   <GarrisonHolder>
-    <Max>30</Max>
+    <Max>50</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
+    <List datatype="tokens">Support Soldier</List>
+    <BuffHeal>5</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>