Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml	(revision 11756)
@@ -1,59 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>30.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>58</MaxRange>
       <MinRange>10.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Sword</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Cavalry Spear</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>12</BuildTime>
     <Resources>
       <food>50</food>
       <wood>75</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Ranged Bow</Classes>
     <GenericName>Champion Archer</GenericName>
 	<Tooltip>Champion Archer.
 Counters: 2x vs. Swordsmen, 1.5x vs. Cavalry Spearmen. Countered by: Cavalry Swordsmen, Cavalry Skirmishers.</Tooltip>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml	(revision 11756)
@@ -1,67 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>30.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>48</MaxRange>
       <MinRange>12.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
 	  <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>1.5</Multiplier>
 		</BonusElephants>
 		<BonusChariots>
 		  <Classes>Chariot</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusChariots>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>12</BuildTime>
     <Resources>
       <food>50</food>
       <wood>80</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Ranged Javelin</Classes>
     <GenericName>Champion Skirmisher</GenericName>
 	<Tooltip>Champion Skirmisher.
 Counters: 1.5x vs. Spearmen, Cavalry Archers, Elephants, and Chariots. Countered by: Swordsmen, Cavalry Spearmen.</Tooltip>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml	(revision 11756)
@@ -1,79 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>14.0</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>15.0</Hack>
       <Pierce>25.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Sword</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Javelin</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusSiege>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>30.0</Hack>
       <Pierce>60.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Sword</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Javelin</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Charge>
   </Attack>
   <Identity>
     <Classes datatype="tokens">Melee Spear</Classes>
     <GenericName>Hero Cavalry Spearman</GenericName>
   </Identity>
   <Loot>
     <xp>500</xp>
     <food>10</food>
     <wood>20</wood>
     <stone>0</stone>
     <metal>5</metal>
   </Loot>
   <UnitMotion>
     <WalkSpeed>10.5</WalkSpeed>
     <Run>
       <Speed>26.25</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml	(revision 11756)
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>1.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>1.0</MaxRange>
       <MinRange>1.0</MinRange>
       <ProjectileSpeed>28.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>90</Max>
     <RegenRate>0.2</RegenRate>
   </Health>
   <Identity>
     <GenericName>Ranged</GenericName>
     <Classes datatype="tokens">Ranged</Classes>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml	(revision 11756)
@@ -1,79 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack>9.0</Hack>
     <Pierce>11.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>15.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Support</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Bow</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusSiege>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>45.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Support</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Bow</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Charge>
   </Attack>
   <Cost>
     <BuildTime>16</BuildTime>
     <Resources>
       <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>160</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Melee Sword</Classes>
     <GenericName>Champion Cavalry Swordsman</GenericName>
 	<Tooltip>Champion Cavalry Swordsman.
 Counters: 2x vs. All Support Units and Siege Weapons, 1.5x vs. Archers. Countered by: Spearmen, Cavalry Skirmishers, Elephants.</Tooltip>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml	(revision 11756)
@@ -1,79 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack>8.0</Hack>
     <Pierce>12.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>8.0</Hack>
       <Pierce>13.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Sword</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Javelin</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusSiege>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>24.0</Hack>
       <Pierce>45.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Sword</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Javelin</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Charge>
   </Attack>
   <Cost>
     <BuildTime>16</BuildTime>
     <Resources>
       <wood>80</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>160</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Melee Spear</Classes>
     <GenericName>Champion Cavalry Spearman</GenericName>
 	<Tooltip>Champion Cavalry Spearman.
 Counters: 2x vs. Swordsmen and Siege Weapons, 1.5x vs. Skirmishers. Countered by: Spearmen, Archers, Elephants.</Tooltip>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml	(revision 11756)
@@ -1,47 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
   <Attack>
     <Melee>
       <Hack>5.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusSiege>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>15.0</Hack>
       <Pierce>30.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Charge>
   </Attack>
   <Identity>
     <Classes datatype="tokens">Melee</Classes>
     <GenericName>Melee Cavalry</GenericName>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_war_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_war_elephant.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_war_elephant.xml	(revision 11756)
@@ -1,82 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>15.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>22.0</Hack>
       <Crush>25.0</Crush>
 	  <Bonuses>
 		<BonusStructures>
 		  <Classes>Structure</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusStructures>
 		<BonusCav>
 		  <Classes>Cavalry</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusCav>
 		<BonusGates>
 		  <Classes>Gates</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusGates>
 	  </Bonuses>
     </Melee>
     <Charge>
       <Hack>66.0</Hack>
       <Crush>75.0</Crush>
 	  <Bonuses>
 		<BonusStructures>
 		  <Classes>Structure</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusStructures>
 		<BonusCav>
 		  <Classes>Cavalry</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusCav>
 		<BonusGates>
 		  <Classes>Gates</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusGates>
 	  </Bonuses>
     </Charge>
   </Attack>
   <Cost>
     <Population>3</Population>
     <Resources>
       <food>300</food>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
-    <Circle radius="2.8"/>
+    <Circle radius="3.5"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>500</Max>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <Classes datatype="tokens">Elephant -Cavalry</Classes>
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Hinduya Pila</SpecificName>
     <Icon>units/pers_war_elephant.png</Icon>
     <History>Elephants were rare sights in Persian armies but they were used and their effect on the battlefield could not be ignored. As their tusks and feet physically attacked the enemy, archers and javelin throwers launched projectiles from atop the animal's back. While huge, they could be just as much a threat to their own side and could be easily hamstrung. But their ability to stop a full-blown cavalry charge when in a line made up for any questions of effectiveness.</History>
 	<Tooltip>Champion War Elephant.
 Good sieging capability. "Stench" Aura vs. Horses. Can run amok. Countered by Swordsmen and Skirmishers.</Tooltip>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <WalkSpeed>7.5</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>84</Range>
   </Vision>
   <VisualActor>
     <Actor>units/persians/war_elephant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_brit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_brit.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_brit.xml	(revision 11756)
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
   <Armour>
     <Hack>5.0</Hack>
     <Crush>12.0</Crush>
   </Armour>
   <Cost>
     <Population>4</Population>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>200</food>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
+    <Square width="10.0" depth="10.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <Civ>celt</Civ>
     <Classes datatype="tokens">Chariot</Classes>
 	<GenericName>Celtic Chariot</GenericName>
     <SpecificName>Carbanto</SpecificName>
     <Tooltip>Brythonic Champion Chariot.
 Counters Infantry. High trample damage.</Tooltip>
     <History>The Britons were one of the last European peoples to use two-horse chariots in combat. They had two iron-rimmed wheels and a flat riding platform that typically carried a driver and a warrior. Useless as shock weapons against tightly packed troops, they were useful for running down individual soldiers and as a stable mount to launch javelins from. The heads of defeated opponents often adorned the chassis to show the warrior's prowess.</History>
     <Icon>units/celt_champion_cavalry_brit.png</Icon>
   </Identity>
   <Obstruction>
     <Unit radius="1.5"/>
   </Obstruction>
   <UnitMotion>
     <WalkSpeed>11.0</WalkSpeed>
     <Run>
       <Speed>33.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>units/celts/champion_unit_4.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml	(revision 11756)
@@ -1,81 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>10.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
       <Crush>20.0</Crush>
 	  <Bonuses>
 		<BonusStructures>
 		  <Classes>Structure</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusStructures>
 		<BonusCav>
 		  <Classes>Cavalry</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusCav>
 		<BonusGates>
 		  <Classes>Gates</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusGates>
 	  </Bonuses>
     </Melee>
     <Charge>
       <Hack>60.0</Hack>
       <Crush>60.0</Crush>
 	  <Bonuses>
 		<BonusStructures>
 		  <Classes>Structure</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusStructures>
 		<BonusCav>
 		  <Classes>Cavalry</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusCav>
 		<BonusGates>
 		  <Classes>Gates</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusGates>
 	  </Bonuses>
     </Charge>
   </Attack>
   <Cost>
     <Resources>
       <food>200</food>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
-    <Circle radius="2.5"/>
+    <Circle radius="3.5"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>400</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Elephant -Cavalry</Classes>
 	<GenericName>War Elephant</GenericName>
     <SpecificName>Pil Malḥamit</SpecificName>
     <Icon>units/cart_champion_cavalry.png</Icon>
     <History>By far the most famous of Carthaginian weapons was the small, ugly, and now extinct, North African forest elephants. Going into battle without a war tower carrying only a driver, Carthaginian war elephants were used as terror weapons: horses could not stand their smell, inexperienced troops were frightened, and the havoc they could cause was immense. Yet by the time of the Second Punic War elephants were at the end of their time. Armies had learned the weaknesses of the giant beasts, specifically how to hamstring and confuse them. More often than not a war elephant could be just as dangerous to its own side as the enemy.</History>
 	<Tooltip>Champion War Elephant.
 Good sieging capability. "Stench" Aura vs. Horses. Can run amok. Countered by Swordsmen and Skirmishers.</Tooltip>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
     <Run>
       <Speed>14.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
   <VisualActor>
     <Actor>units/carthaginians/champion_unit_2.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml	(revision 11756)
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_siege">
   <Armour>
     <Hack>5.0</Hack>
     <Crush>6.0</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>0.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>30.0</Crush>
       <MaxRange>6.5</MaxRange>
       <RepeatTime>1500</RepeatTime>
 	  <Bonuses>
 		<BonusStruct>
 		  <Classes>Structure</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusStruct>
 		<BonusGates>
 		  <Classes>Gates</Classes>
 		  <Multiplier>3.0</Multiplier>
 		</BonusGates>
 	  </Bonuses>
-    <RestrictedClasses datatype="tokens">Organic</RestrictedClasses>
-    <PreferredClasses datatype="tokens">Gates Structure</PreferredClasses>
+      <RestrictedClasses datatype="tokens">Organic</RestrictedClasses>
+      <PreferredClasses datatype="tokens">Gates Structure</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>0.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>40.0</Crush>
       <MaxRange>6.5</MaxRange>
       <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<BonusStruct>
 		  <Classes>Structure</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusStruct>
 		<BonusGates>
 		  <Classes>Gates</Classes>
 		  <Multiplier>3.0</Multiplier>
 		</BonusGates>
 	  </Bonuses>
-    <RestrictedClasses datatype="tokens">Organic</RestrictedClasses>
-    <PreferredClasses datatype="tokens">Gates Structure</PreferredClasses>
+      <RestrictedClasses datatype="tokens">Organic</RestrictedClasses>
+      <PreferredClasses datatype="tokens">Gates Structure</PreferredClasses>
     </Charge>
   </Attack>
   <Cost>
     <BuildTime>20</BuildTime>
     <Population>5</Population>
     <Resources>
       <wood>200</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Battering Ram</GenericName>
     <Tooltip>Bonused vs. Wall Gates.</Tooltip>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <order_attack>attack/siege/ram_attack_order.xml</order_attack>
 	  <trained>attack/siege/ram_move.xml</trained>
 	  <attack>attack/siege/ram_attack.xml</attack>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.5</BarHeight>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>8.0</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>48</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml	(revision 11756)
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>2.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <MinRange>0.0</MinRange>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Charge>
   </Attack>
   <Cost>
     <BuildTime>10</BuildTime>
   </Cost>
   <Health>
     <Max>100</Max>
     <RegenRate>0.2</RegenRate>
   </Health>
   <Identity>
     <GenericName>Melee Infantry</GenericName>
     <Classes datatype="tokens">Melee</Classes>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml	(revision 11756)
@@ -1,53 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Support</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Bow</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<BonusSiege>
 		  <Classes>Siege</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusSiege>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Melee>
     <Charge>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Support</Classes>
 		  <Multiplier>2.0</Multiplier>
 		</BonusPrimary>
 		<BonusSecondary>
 		  <Classes>Infantry Bow</Classes>
 		  <Multiplier>1.5</Multiplier>
 		</BonusSecondary>
 		<ElephantStench>
 		  <Classes>Elephant</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</ElephantStench>
 		<CamelStench>
 		  <Classes>Camel</Classes>
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Charge>
   </Attack>
   <Identity>
     <Classes datatype="tokens">Sword</Classes>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 11756)
@@ -1,78 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>35.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.8</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Charge>
       <Hack>105.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.8</MaxRange>
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
   <Cost>
     <Population>1</Population>
     <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Footprint>
-    <Circle radius="2.0"/>
+    <Circle radius="3.5"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>150</Max>
   </Health>
   <Identity>
     <GenericName>Champion Cavalry</GenericName>
     <Classes datatype="tokens">Cavalry</Classes>
   </Identity>
   <Obstruction>
     <Unit radius="1.0"/>
   </Obstruction>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>arrow/256x256.png</MainTexture>
+        <MainTextureMask>arrow/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
       <order_walk>voice/hellenes/civ/civ_male_ack.xml</order_walk>
       <order_attack>voice/hellenes/civ/civ_male_attack.xml</order_attack>
       <order_gather>voice/hellenes/civ/civ_male_ack.xml</order_gather>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack>attack/weapon/sword.xml</attack>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
 	</SoundGroups>
   </Sound>
   <Stamina>
     <Max>2500</Max>
   </Stamina>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>10.0</WalkSpeed>
     <Run>
       <Speed>25.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>10.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>70</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml	(revision 11756)
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>16.0</MaxRange>
       <MinRange>10.0</MinRange>
       <ProjectileSpeed>25.0</ProjectileSpeed>
       <PrepareTime>900</PrepareTime>
       <RepeatTime>1500</RepeatTime>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Ranged Cavalry</GenericName>
 	<Classes datatype="tokens">Ranged</Classes>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 11755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 11756)
@@ -1,67 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>9.0</Hack>
     <Pierce>6.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>23.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>46.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
+      <PreferredClasses datatype="tokens">Organic</PreferredClasses>
     </Charge>
   </Attack>
   <Cost>
     <BuildTime>13</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>130</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Infantry</Classes>
     <GenericName>Champion Infantry</GenericName>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>voice/hellenes/civ/civ_male_select.xml</select>
       <order_walk>voice/hellenes/civ/civ_male_ack.xml</order_walk>
       <order_attack>voice/hellenes/civ/civ_male_attack.xml</order_attack>
       <order_gather>voice/hellenes/civ/civ_male_ack.xml</order_gather>
       <order_repair>voice/hellenes/civ/civ_male_ack.xml</order_repair>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <attack>attack/weapon/sword.xml</attack>
       <death>actor/human/death/death.xml</death>
     </SoundGroups>
   </Sound>
   <Stamina>
     <Max>1500</Max>
   </Stamina>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
     <Run>
       <Speed>17.5</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>60</Range>
   </Vision>
 </Entity>