Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_healer_b.xml	(revision 23570)
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>units/ptol_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/ptol_support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/ptol_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml	(revision 23570)
@@ -1,77 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Armour>
     <Hack>2</Hack>
     <Pierce>5</Pierce>
     <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">!SeaCreature</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="4.0" depth="10.0"/>
     <Height>6.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Fishing Boat</GenericName>
+    <SelectionGroupName>template_unit_ship_fishing</SelectionGroupName>
     <Tooltip>Fish the waters for food.</Tooltip>
   </Identity>
   <Loot>
     <xp>1</xp>
     <wood>10</wood>
     <metal>0</metal>
   </Loot>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>1.8</food.fish>
       <treasure disable=""/>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <order_walk>actor/ship/boat_move.xml</order_walk>
       <order_attack>actor/ship/boat_move.xml</order_attack>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>2.0</BarWidth>
     <BarHeight>0.333</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml	(revision 23570)
@@ -1,67 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Armour>
     <Hack>2</Hack>
     <Pierce>5</Pierce>
     <Crush>2</Crush>
   </Armour>
   <Cost>
     <Resources>
       <wood>0</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>15</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Dog</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
     <Max>400</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Merchantman</GenericName>
+    <SelectionGroupName>template_unit_ship_merchant</SelectionGroupName>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
   </Identity>
   <Loot>
     <xp>25</xp>
     <wood>15</wood>
     <metal>0</metal>
   </Loot>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
     <Capacities>
       <food>75</food>
       <wood>75</wood>
       <stone>50</stone>
       <metal>50</metal>
     </Capacities>
   </ResourceGatherer>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
     <GarrisonGainMultiplier>0.2</GarrisonGainMultiplier>
   </Trader>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.35</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>50</Range>
   </Vision>
   <VisionSharing>
     <Bribable>true</Bribable>
   </VisionSharing>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 23570)
@@ -1,99 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Attack>
     <Melee>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Slaughter>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Auras datatype="tokens">
     units/female_inspiration
   </Auras>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}_civil_centre
       structures/{civ}_crannog
       structures/{civ}_military_colony
       structures/{civ}_house
       structures/{civ}_storehouse
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_corral
       structures/{civ}_dock
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food>50</food>
     </Resources>
   </Cost>
   <Health>
     <Max>25</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FemaleCitizen</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
     <GenericName>Female Citizen</GenericName>
+    <SelectionGroupName>template_unit_support_female_citizen</SelectionGroupName>
     <Phenotype>female</Phenotype>
     <Formations disable=""/>
   </Identity>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>1</food.fruit>
       <food.grain>0.5</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.7</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.35</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.35</metal.ore>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_female.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <Vision>
     <Range>32</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 23570)
@@ -1,60 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Cost>
     <Resources>
       <food>250</food>
     </Resources>
   </Cost>
   <Heal>
     <Range>12</Range>
     <HP>5</HP>
     <Rate>2000</Rate>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
     <RangeOverlay>
       <LineTexture>heal_overlay_range.png</LineTexture>
       <LineTextureMask>heal_overlay_range_mask.png</LineTextureMask>
       <LineThickness>0.35</LineThickness>
     </RangeOverlay>
   </Heal>
   <Health>
     <Max>85</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
+    <SelectionGroupName>template_unit_support_healer</SelectionGroupName>
     <Rank>Basic</Rank>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Heal units.</Tooltip>
   </Identity>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>plus/128x128.png</MainTexture>
         <MainTextureMask>plus/128x128_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml	(revision 23570)
@@ -1,85 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Builder>
     <Rate>0.5</Rate>
     <Entities datatype="tokens">
       structures/{civ}_house
       structures/{civ}_storehouse
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_corral
       structures/{civ}_outpost
       structures/wallset_palisade
       structures/{civ}_dock
       structures/{civ}_barracks
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_defense_tower
       structures/{civ}_wallset_stone
       structures/{civ}_civil_centre
       structures/{civ}_fortress
     </Entities>
   </Builder>
   <Cost>
     <Population>0</Population>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>50</metal>
     </Resources>
   </Cost>
   <Health>
     <RegenRate>-0.25</RegenRate>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Slave Worker</VisibleClasses>
     <GenericName>Slave</GenericName>
+    <SelectionGroupName>template_unit_support_slave</SelectionGroupName>
     <Tooltip>Gatherer with a finite life span. Bonused at mining and lumbering.</Tooltip>
   </Identity>
   <Loot>
     <xp>1</xp>
     <food>0</food>
     <wood>1</wood>
     <stone>1</stone>
     <metal>1</metal>
   </Loot>
   <ResourceGatherer>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>0.5</food.fish>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.35</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>1.0</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>1.0</stone.rock>
       <stone.ruins>5</stone.ruins>
       <metal.ore>1.0</metal.ore>
       <treasure disable=""/>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_wood>resource/lumbering/lumbering.xml</gather_wood>
       <gather_stone>resource/mining/pickaxe.xml</gather_stone>
       <gather_metal>resource/mining/mining.xml</gather_metal>
       <trained>actor/singlesteps/steps_gravel_trained.xml</trained>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml	(revision 23570)
@@ -1,53 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Cost>
     <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
       <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <GenericName>Trader</GenericName>
+    <SelectionGroupName>template_unit_support_trader</SelectionGroupName>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
     <Formations disable=""/>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_trade>voice/{lang}/civ/civ_{phenotype}_trade.xml</order_trade>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
     </SoundGroups>
   </Sound>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
   </Trader>
   <UnitAI>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisionSharing>
     <Bribable>true</Bribable>
   </VisionSharing>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml	(revision 23570)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Gýnē Athēnaía</SpecificName>
     <GenericName>Athenian Woman</GenericName>
     <Icon>units/hele_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/athen_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/athen_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml	(revision 23570)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
       structures/brit_rotarymill
     </Entities>
   </Builder>
   <Identity>
     <Civ>brit</Civ>
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/brit_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>brit</Civ>
-    <SelectionGroupName>units/brit_support_healer_b</SelectionGroupName>
     <GenericName>Druid</GenericName>
     <SpecificName>Druid</SpecificName>
     <Icon>units/celt_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/brit_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/celts/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml	(revision 23570)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Aštāh</SpecificName>
     <GenericName>Carthaginian Woman</GenericName>
     <Icon>units/cart_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/cart_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>cart</Civ>
     <Phenotype>female</Phenotype>
-    <SelectionGroupName>units/cart_support_healer_b</SelectionGroupName>
     <SpecificName>Kehinit</SpecificName>
     <Icon>units/cart_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/cart_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/carthaginians/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml	(revision 23570)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
       structures/gaul_rotarymill
     </Entities>
   </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/gaul_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>gaul</Civ>
-    <SelectionGroupName>units/gaul_support_healer_b</SelectionGroupName>
     <GenericName>Druid</GenericName>
     <SpecificName>Druid</SpecificName>
     <Icon>units/celt_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/gaul_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/celts/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml	(revision 23570)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Emazteki</SpecificName>
     <GenericName>Iberian Woman</GenericName>
     <Icon>units/iber_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/iber_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml	(revision 23570)
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>iber</Civ>
     <Phenotype>female</Phenotype>
-    <SelectionGroupName>units/iber_support_healer_b</SelectionGroupName>
     <GenericName>Priestess of Ataekina</GenericName>
     <SpecificName>Emakumezko Apaiz de Ataekina</SpecificName>
     <Icon>units/iber_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/iber_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/iberians/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml	(revision 23570)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Shmt</SpecificName>
     <GenericName>Kushite Woman</GenericName>
     <Icon>units/kush_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/kush_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_healer_b.xml	(revision 23570)
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>kush</Civ>
-    <SelectionGroupName>units/kush_support_healer_b</SelectionGroupName>
     <GenericName>Priest</GenericName>
     <SpecificName>wʿb nsw</SpecificName>
     <Icon>units/kush_support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/kush_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/kushites/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml	(revision 23570)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Gýnē Makedonikḗ</SpecificName>
     <GenericName>Macedonian Woman</GenericName>
     <Icon>units/hele_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/mace_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/mace_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/mace_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/hellenes/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml	(revision 23570)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Naari</SpecificName>
     <GenericName>Indian Woman</GenericName>
     <Icon>units/maur_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/maur_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>maur</Civ>
-    <SelectionGroupName>units/maur_support_healer_b</SelectionGroupName>
     <GenericName>Brahmin Priest</GenericName>
     <SpecificName>Brāhmaṇa Pujari</SpecificName>
     <Icon>units/maur_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/maur_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/mauryas/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml	(revision 23570)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SpecificName>Banu Miyanrudani</SpecificName>
     <GenericName>Mesopotamian Woman</GenericName>
     <Icon>units/pers_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/pers_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/persians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_healer_b.xml	(revision 23570)
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers_support_healer_b</SelectionGroupName>
     <GenericName>Median Magus</GenericName>
     <SpecificName>Maguš Māda</SpecificName>
     <Icon>units/pers_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/pers_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml	(revision 23570)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Gýnē Aigýptia</SpecificName>
     <GenericName>Egyptian Woman</GenericName>
     <Icon>units/ptol_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/ptol_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml	(revision 23570)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Rōmāna</SpecificName>
     <GenericName>Roman Woman</GenericName>
     <Icon>units/rome_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/rome_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/romans/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml	(revision 23570)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <SpecificName>Syrías Gýnē</SpecificName>
     <GenericName>Syrian Woman</GenericName>
     <Icon>units/sele_support_female.png</Icon>
-    <SelectionGroupName>units/sele_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml	(revision 23570)
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Attack>
     <Melee>
       <Damage>
         <Hack op="mul">1.5</Hack>
       </Damage>
     </Melee>
   </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/wallset_palisade
       structures/{civ}_defense_tower
       structures/{civ}_sentry_tower
     </Entities>
   </Builder>
   <Health>
     <Max op="mul">1.4</Max>
   </Health>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
     <GenericName>Spartan Woman</GenericName>
     <SpecificName>Spartiâtis</SpecificName>
     <Icon>units/spart_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/spart_support_female_citizen</SelectionGroupName>
   </Identity>
   <UnitAI>
     <CanPatrol>true</CanPatrol>
   </UnitAI>
   <VisualActor>
     <Actor>units/spartans/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_healer_b.xml	(revision 23570)
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
-    <SelectionGroupName>units/rome_support_healer_b</SelectionGroupName>
     <GenericName>Doctor</GenericName>
     <SpecificName>Medicus</SpecificName>
     <Icon>units/rome_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/rome_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/romans/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/sele_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/sele_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/hellenes/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_healer_b.xml	(revision 23569)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_healer_b.xml	(revision 23570)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/spart_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/spart_support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/spartans/healer.xml</Actor>
   </VisualActor>
 </Entity>