Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 11495)
@@ -1,43 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_archer">
   <Armour>
     <Hack>8.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
   <Attack>
     <Ranged>
-      <Pierce>40.0</Pierce>
+      <Pierce>50.0</Pierce>
       <MaxRange>60</MaxRange>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Sword</Classes>
 		  <Multiplier>3.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Cavalry Spear</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 	  </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>35</BuildTime>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
   </Cost>
+  <Health>
+    <Max>750</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
   <Identity>
     <GenericName>Hero Archer</GenericName>
     <Classes datatype="tokens">Hero</Classes>
 	<Tooltip>Hero Archer.
 Counters Swordsmen and Cavalry Spearmen. Countered by Skirmishers and other Cavalry types.</Tooltip>
   </Identity>
   <Loot>
     <xp>350</xp>
     <food>5</food>
     <wood>20</wood>
     <stone>0</stone>
     <metal>10</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 11495)
@@ -1,48 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
   <Armour>
     <Hack>8.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
   <Attack>
     <Ranged>
-      <Pierce>50.0</Pierce>
+      <Pierce>55.0</Pierce>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Spear</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Cavalry Bow</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusElephants>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusElephants>
 		<BonusChariots>
 		  <Classes>Chariot</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusChariots>
 	  </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>35</BuildTime>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
   </Cost>
+  <Health>
+    <Max>750</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
   <Identity>
     <Classes datatype="tokens">Hero</Classes>
     <GenericName>Hero Skirmisher</GenericName>
   </Identity>
   <Loot>
     <xp>350</xp>
     <food>5</food>
     <wood>20</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_senegal_date_palm.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_senegal_date_palm.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_senegal_date_palm.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Senegal Date Palm</SpecificName>
     <History>The Senegal Date Palm is an evergreen palm tree generally found on the continent of Africa. Their fruit, the date, is an important food crop in ancient and modern times.</History>
-    <Icon>gaia/flora_tree_senegal_date_palm.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/palm_senegal_date.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_date_palm.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_date_palm.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_date_palm.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Date Palm</SpecificName>
     <History>The Date Palm is found all over the Southern and Eastern Mediterranean. Their fruit, the date, is an important food crop in ancient and modern times.</History>
-    <Icon>gaia/flora_tree_date_palm.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/palm_date.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar_lombardy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar_lombardy.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar_lombardy.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Lombardy Poplar Tree</SpecificName>
     <History>The lombardy poplar is an leafed deciduous.</History>
-    <Icon>gaia/flora_tree_poplar_lombardy.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/lumbardypoplar.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Pine Tree</SpecificName>
     <History>The pine is an evergreen conifer.</History>
-    <Icon>gaia/flora_tree_pine.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/pine.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Poplar Tree</SpecificName>
     <History>The poplar is a leafed deciduous.</History>
-    <Icon>gaia/flora_tree_poplar.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/poplar.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_tall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_tall.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_tall.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Cretan Date Palm</SpecificName>
     <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
-    <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/palm_cretan_date_tall.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml	(revision 11495)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="2.5"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Apple Tree</SpecificName>
     <History>Apple trees bear delicious fruit and are bountiful.</History>
-    <Icon>gaia/flora_tree_apple.png</Icon>
+    <Icon>gaia/flora_bush_berry.png</Icon>
   </Identity>
   <Obstruction>
     <Unit radius="0.9"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.fruit</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/apple_bloom.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml	(revision 11495)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="2.5"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Baobab</SpecificName>
     <History>The baobab is the giant African tree that dots the landscape of the African savanna.</History>
-    <Icon>gaia/flora_tree_baobab.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>400</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/baobab.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_aleppo_pine.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_aleppo_pine.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_aleppo_pine.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Aleppo Pine Tree</SpecificName>
     <History>This pine has an irregular shap and can be found in the highlands of the Mediterranean area.</History>
-    <Icon>gaia/flora_tree_aleppo_pine.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/aleppo_pine.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml	(revision 11495)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Cretan Date Palm</SpecificName>
     <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
-    <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/palm_cretan_date_short.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_carob.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_carob.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_carob.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Carob Tree</SpecificName>
     <History>The carob is a leafed evergreen common in the Aegean Sea region.</History>
-    <Icon>gaia/flora_tree_carob.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/carob.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cypress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cypress.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cypress.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Cypress Tree</SpecificName>
     <History>Pliny narrates several remarkable, but not incredible, instances of the durability of Cypress-wood. He says that there were in his time Cypresses still standing at Rome which were more ancient than the city itself; but that the tree was not a native of Italy, having been originally introduced from Greece to the Greek colony of Tarentum; whence, indeed, Cato, in his work on "Rural Economy," recommends that its seed should be procured. The doors of the temple of Diana, at Ephesus, were, Pliny relates, of Cypress-wood, and appeared quite new when four centuries old; as did also the statue of Jupiter in the Capitol, which was of the same material and half as old again. The tree in his time was employed for rafters, joists, and especially for vine-props, so that a Cypress grove was thought a valuable dowry for a daughter.</History>
-    <Icon>gaia/flora_tree_cypress.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/mediterranean_cypress.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine_animated.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine_animated.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine_animated.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Pine Tree</SpecificName>
     <History>The pine is an evergreen conifer.</History>
-    <Icon>gaia/flora_tree_pine.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/pine_animated.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_medit_fan_palm.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_medit_fan_palm.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_medit_fan_palm.xml	(revision 11495)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Identity>
     <SpecificName>Mediterranean Fan Palm</SpecificName>
     <History>The Mediterranean Fan Palm is common throughout low-lying areas around the Mediterranean Sea.</History>
-    <Icon>gaia/flora_tree_medit_fan_palm.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>flora/trees/palm_medit_fan_palm.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml	(revision 11495)
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="2.5"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Cretan Date Palm</SpecificName>
     <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
-    <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
   </Identity>
   <Obstruction>
     <Unit radius="2.25"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/palm_cretan_date_patch.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml	(revision 11495)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="3.5"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Fig</SpecificName>
     <History>The Common Fig is widely grown for its edible fruit throughout its natural range in the Mediterranean region, North Africa, Persia, and northern India.</History>
     <Tooltip>Gather figs for Food.</Tooltip>
-    <Icon>gaia/flora_tree_apple.png</Icon>
+    <Icon>gaia/flora_bush_berry.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>500</Amount>
     <Type>food.fruit</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/fig.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(revision 11495)
@@ -1,61 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Armour>
     <Hack>4.0</Hack>
     <Crush>2.0</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>50.0</Pierce>
       <Crush>50.0</Crush>
       <MaxRange>60</MaxRange>
       <MinRange>8.0</MinRange>
       <ProjectileSpeed>60.0</ProjectileSpeed>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
 	  <Bonuses>
 		<BonusOrganic>
 		  <Classes>Organic</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusOrganic>
 	  </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
 	<Population>2</Population>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Bolt Shooter</GenericName>
     <Tooltip>Bonused vs. Infantry and Cavalry units.</Tooltip>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>0</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>10</metal>
   </Loot>
-  <Sound>
-    <SoundGroups>
-      <select>attack/siege/siege_select.xml</select>
-    </SoundGroups>
-  </Sound>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>70</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista.xml	(revision 11495)
@@ -1,43 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege_onager">
   <Attack>
     <Ranged>
       <Hack>60.0</Hack>
       <Crush>60.0</Crush>
       <MaxRange>80</MaxRange>
       <MinRange>16.0</MinRange>
       <ProjectileSpeed>22.0</ProjectileSpeed>
       <RepeatTime>8000</RepeatTime>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>300</wood>
       <stone>100</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="6.0" depth="7.0"/>
     <Height>4.5</Height>
   </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Ballista</SpecificName>
     <Icon>units/rome_mechanical_siege_ballista.png</Icon>
   </Identity>
   <Obstruction>
     <Unit radius="3.5"/>
   </Obstruction>
-  <Sound>
-    <SoundGroups>
-      <attack>attack/siege/ballist_attack.xml</attack>
-    </SoundGroups>
-  </Sound>
   <Vision>
     <Range>94</Range>
   </Vision>
   <VisualActor>
     <Actor>units/romans/siege_rock.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(revision 11495)
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Armour>
     <Hack>4.0</Hack>
     <Crush>10.0</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>50.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>50.0</Crush>
       <MaxRange>68</MaxRange>
       <MinRange>12.0</MinRange>
       <ProjectileSpeed>30.0</ProjectileSpeed>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
 	  <Bonuses>
 		<BonusStruct>
 		  <Classes>Structure</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusStruct>
 	  </Bonuses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>100</stone>
     </Resources>
   </Cost>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <GenericName>Siege Catapult</GenericName>
     <Tooltip>Bonused vs. Structures and Massed Infantry.</Tooltip>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>0</food>
     <wood>20</wood>
     <stone>10</stone>
     <metal>0</metal>
   </Loot>
   <Sound>
     <SoundGroups>
-      <select>attack/siege/siege_select.xml</select>
+      <attack>attack/siege/ballist_attack.xml</attack>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.5</BarHeight>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>5.5</WalkSpeed>
     <Run>
       <Speed>10.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/units/shields/hele_round_themistocles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/units/shields/hele_round_themistocles.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/art/actors/props/units/shields/hele_round_themistocles.xml	(revision 11495)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant name="base">
       <mesh>props/shield/aspis_f.dae</mesh>
       <props>
-        <prop actor="props/units/shields/hele_aspis_back.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/hele_aspis_back_black.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
     <variant>
       <texture>props/shield/hele_round_l.dds</texture>
     </variant>
   </group>
   <material>playercolor_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml	(revision 11495)
@@ -1,23 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
-  
-
+  <castshadow/>
   <group>
     <variant name="a">
       <mesh>gaia/grass_sm_tall_a.dae</mesh>
     </variant>
     <variant name="b">
       <mesh>gaia/grass_sm_tall_b.dae</mesh>
     </variant>
   </group>
-
   <group>
     <variant>
       <texture>gaia/grass_field_dry.dds</texture>
     </variant>
   </group>
-
-  <material>basic_trans.xml</material>
-
+  <material>alphatest.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_persia_rocks.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/siege_rock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/siege_rock.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/siege_rock.xml	(revision 11495)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="100" name="carthaginian ballista">
       <animations>
-        <animation event="0.5" load="0" name="melee" speed="100"/>
+        <animation event="0.75" file="mechanical/rome_ballista_atttack.dae" load="0.7" name="melee" speed="100"/>
       </animations>
       <mesh>structural/kart_ballista.dae</mesh>
       <props>
         <prop actor="props/units/weapons/rock_flaming.xml" attachpoint="projectile"/>
       </props>
       <texture>structural/hele_siege.dds</texture>
     </variant>
   </group>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/flora/trees/palm_tropical.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/flora/trees/palm_tropical.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/art/actors/flora/trees/palm_tropical.xml	(revision 11495)
@@ -1,35 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
-    <variant frequency="1" name="mesh-a">
-      <mesh>gaia/palm_desert_a.dae</mesh>
-    </variant>
-    <variant frequency="1" name="mesh-b">
-      <mesh>gaia/palm_desert_b.dae</mesh>
-    </variant>
-    <variant frequency="1" name="mesh-c">
-      <mesh>gaia/palm_desert_c.dae</mesh>
-    </variant>
-    <variant frequency="1" name="mesh-d">
-      <mesh>gaia/palm_desert_d.dae</mesh>
+    <variant frequency="100" name="texture">
+      <texture>gaia/tree_palm_2_a.png</texture>
     </variant>
   </group>
-
   <group>
-    <variant frequency="1" name="texture-palm-brown">
-      <texture>gaia/tree_palm_a.dds</texture>
+    <variant frequency="2" name="tropical palm straight">
+      <mesh>gaia/tree_palm_tropical_01.dae</mesh>
+    </variant>
+    <variant frequency="1" name="tropical palm bent">
+      <mesh>gaia/tree_palm_tropical_02.dae</mesh>
+    </variant>
+    <variant frequency="1" name="tropical palm dual swayed">
+      <mesh>gaia/tree_palm_tropical_03.dae</mesh>
     </variant>
-    <variant frequency="4" name="texture-palm-b">
-      <texture>gaia/tree_palm_b.dds</texture>
+    <variant frequency="1" name="tropical palm dual">
+      <mesh>gaia/tree_palm_tropical_04.dae</mesh>
     </variant>
-    <variant frequency="2" name="texture-palm-c">
-      <texture>gaia/tree_palm_c.dds</texture>
+    <variant frequency="1" name="tropical palm triple">
+      <mesh>gaia/tree_palm_tropical_05.dae</mesh>
     </variant>
   </group>
-
-  <material>basic_trans.xml</material>
-
+  <material>alphatest.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/units/shields/hele_round_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/units/shields/hele_round_e.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/art/actors/props/units/shields/hele_round_e.xml	(revision 11495)
@@ -1,46 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
       <mesh>props/shield/aspis_sm_f.dae</mesh>
       <props>
         <prop actor="props/units/shields/hele_round_back.xml" attachpoint="root"/>
         <prop actor="props/units/shields/hele_aspis_cape.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="shield-e-ship">
       <texture>props/shield/hele_round_e.dds</texture>
     </variant>
     <variant frequency="1" name="shield-f-gorgon">
       <texture>props/shield/hele_round_f.dds</texture>
     </variant>
     <variant frequency="1" name="shield-s-rays">
       <texture>props/shield/hele_round_s.dds</texture>
     </variant>
     <variant frequency="1" name="shield-w2-fancy laurel">
       <texture>props/shield/hele_round_w_2.dds</texture>
     </variant>
     <variant frequency="1" name="shield-y-pegasus">
       <texture>props/shield/hele_round_y.dds</texture>
     </variant>
     <variant frequency="1" name="shield-ab-fancy snake">
       <texture>props/shield/hele_round_ab.dds</texture>
     </variant>
     <variant frequency="1" name="shield-ac-fancy eye">
       <texture>props/shield/hele_round_ac.dds</texture>
     </variant>
     <variant frequency="1" name="shield-ad-octopus">
       <texture>props/shield/hele_round_ad.dds</texture>
     </variant>
-    <variant frequency="1" name="shield-ae-helmet">
-      <texture>props/shield/hele_round_ae.dds</texture>
-    </variant>
     <variant frequency="1" name="shield-af-winged creatures">
       <texture>props/shield/hele_round_af.dds</texture>
     </variant>
   </group>
   <material>playercolor_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/units/heads/hele_themistocles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/units/heads/hele_themistocles.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/art/actors/props/units/heads/hele_themistocles.xml	(revision 11495)
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Helmet-Crest">
-      <mesh>props/helmet/hele_helmet_o.dae</mesh>
-    </variant>
     <variant frequency="1" name="Helmet-High Crest">
       <mesh>props/helmet/hele_themistocles_highcrest.dae</mesh>
     </variant>
   </group>
   <group>
     <variant>
       <texture>props/helmet/hele_thermistocles.dds</texture>
     </variant>
   </group>
   <material>playercolor_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml	(revision 11494)
+++ ps/trunk/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml	(revision 11495)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <group>
     <variant frequency="1" name="massive">
       <mesh>gaia/grass_large_2_tall.dae</mesh>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="texture">
       <texture>gaia/grass_tropic_a.png</texture>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>alphatest.xml</material>
 </actor>