Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js	(révision 18615)
+++ binaries/data/mods/public/simulation/components/Identity.js	(copie de travail)
@@ -57,19 +57,19 @@ Identity.prototype.Schema =
 				"<value>Elite</value>" +
 			"</choice>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Unit, Infantry, Melee, Cavalry, Ranged, Mechanical, Ship, Siege, Champion, Hero, Elephant, Chariot, Mercenary, Spear, Sword, Bow, Javelin, Sling, Support, Animal, Domestic, Organic, Structure, Civic, CivCentre, Economic, Defensive, Gates, Wall, BarterMarket, Village, Town, City, ConquestCritical, Worker, Female, Healer, Slave, CitizenSoldier, Trade, Market, NavalMarket, Warship, SeaCreature, ForestPlant, DropsiteFood, DropsiteWood, DropsiteStone, DropsiteMetal, GarrisonTower, GarrisonFortress'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, Elephant, Female, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit, WoodenTower'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements, if the classes need spaces. Underscores will be replaced with spaces.'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Resource, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
Index: binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml	(copie de travail)
@@ -20,11 +20,11 @@
     <Circle radius="26.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>athen</Civ>
-    <Classes datatype="tokens">Market</Classes>
+    <VisibleClasses datatype="tokens">Market</VisibleClasses>
     <GenericName>Settlement</GenericName>
     <SpecificName>Minor Greek Polis</SpecificName>
     <Tooltip>This is a minor Greek city.</Tooltip>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml	(copie de travail)
@@ -20,11 +20,11 @@
     <Circle radius="26.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>athen</Civ>
-    <Classes datatype="tokens">Market</Classes>
+    <VisibleClasses datatype="tokens">Market</VisibleClasses>
     <GenericName>Settlement</GenericName>
     <SpecificName>Greek Polis</SpecificName>
     <Tooltip>This is a major Greek city.</Tooltip>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml	(copie de travail)
@@ -8,11 +8,11 @@
   </BuildRestrictions>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Naval Shipyard</GenericName>
     <SpecificName>Cothon</SpecificName>
-    <Classes datatype="tokens">-City Town Shipyard</Classes>
+    <VisibleClasses datatype="tokens">-City Shipyard Town</VisibleClasses>
     <History>The structure is based upon the center island of the inner harbor constructed to house the war fleet of the Carthaginian navy at Carthage.</History>
     <Tooltip>Construct and repair mighty warships.</Tooltip>
     <Icon>structures/uber_dock.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml	(copie de travail)
@@ -24,14 +24,11 @@
     <GenericName>Elephant Stables</GenericName>
     <SpecificName>Vāraṇaśālā</SpecificName>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>structures/elephant_stables.png</Icon>
     <Tooltip>Train elephant units.</Tooltip>
-    <Classes datatype="tokens">
-	  -City
-	  Town
-	</Classes>
+    <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
   </Identity>
   <Obstruction>
     <Static width="30.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml	(copie de travail)
@@ -23,14 +23,11 @@
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Persian Palace</GenericName>
     <SpecificName>Apadana</SpecificName>
-    <Classes datatype="tokens">
-	  Palace
-	  Apadana
-	</Classes>
+    <Classes datatype="tokens">Palace Apadana</Classes>
     <History>The term Apadana designates a large hypostyle palace found in Persia. The best known example, and by far the largest, was the great Apadana at Persepolis. Functioning as the empire's central audience hall, the palace is famous for the reliefs of the tribute-bearers and of the army, including the Immortals. The annual tribute that the Persians received from their satrapies and vassal states, as regularised by Darius the Great, accounted for incredible annual revenue.</History>
     <Icon>structures/palace.png</Icon>
     <Tooltip>"Satrapy Tribute": Gain a trickle of food, wood, stone, and metal resources. Train Persian heroes and their "Immortals" bodyguards.</Tooltip>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/pers_palace.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_palace.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/pers_palace.xml	(copie de travail)
@@ -20,13 +20,11 @@
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Persian Palace</GenericName>
     <SpecificName>Taçara</SpecificName>
-    <Classes datatype="tokens">
-	  Palace
-	</Classes>
+    <Classes datatype="tokens">Palace</Classes>
     <Icon>structures/palace.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="38.5" depth="22.5"/>
   </Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_stables.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/pers_stables.xml	(copie de travail)
@@ -34,11 +34,11 @@
       -units/{civ}_infantry_slinger_b
       -units/{civ}_infantry_archer_b
     </Entities>
     <Technologies datatype="tokens">
       -training_conscription
-      persians/training_levy_cavalry	  
+      persians/training_levy_cavalry
       persians/training_conscription_cavalry
       successors/special_war_horses
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml	(copie de travail)
@@ -14,11 +14,12 @@
   </Health>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Lighthouse</GenericName>
     <SpecificName>Pháros</SpecificName>
-    <Classes datatype="tokens">Lighthouse Town -City -ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical Lighthouse</Classes>
+    <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
     <Tooltip>Build along the shore to reveal the shorelines over the entire map. Very large vision range: 180 meters.</Tooltip>
     <History>The Ptolemaic dynasty in Egypt built the magnificent Lighthouse of Alexandria near the harbor mouth of that Nile Delta city. This structure could be seen for many kilometers out to sea and was one of the Seven Wonders of the World.</History>
     <Icon>structures/lighthouse.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml	(copie de travail)
@@ -56,13 +56,11 @@
   </Health>
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Entrenched Army Camp</GenericName>
     <SpecificName>Castrum Vallum</SpecificName>
-    <Classes datatype="tokens">
-      ArmyCamp
-    </Classes>
+    <Classes datatype="tokens">ArmyCamp</Classes>
     <Icon>structures/roman_camp.png</Icon>
     <Tooltip>Build anywhere on the map, even in enemy territory. Construct siege weapons and train citizen-soldiers. Heal garrisoned units slowly.</Tooltip>
     <History>Sometimes it was a temporary camp built facing the route by which the army is to march, other times a defensive or offensive (for sieges) structure. Within this gate the tents of the first centuries or cohorts are pitched, and the dragons (ensigns of cohorts) and other ensigns planted. The Decumane gate is directly opposite to the Praetorian in the rear of the camp, and through this the soldiers are conducted to the place appointed for punishment or execution.</History>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml	(copie de travail)
@@ -22,15 +22,13 @@
   </Health>
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Siege Wall Gate</GenericName>
     <SpecificName>Porta Circummunitionis</SpecificName>
-    <Classes datatype="tokens">
-	  SiegeWall
-	</Classes>
+    <Classes datatype="tokens">SiegeWall</Classes>
     <History>Quick building, but expensive wooden and earthen walls used to surround and siege an enemy town or fortified position. The most famous examples are the Roman sieges of the Iberian stronghold of Numantia and the Gallic stronghold of Alesia.</History>
-	<Icon>structures/wooden_gate.png</Icon>
+    <Icon>structures/wooden_gate.png</Icon>
   </Identity>
   <Obstruction>
     <Obstructions>
       <Right width="13" depth="5" x="12" z="0"/>
       <Left width="13" depth="5" x="-12" z="0"/>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml	(copie de travail)
@@ -48,13 +48,11 @@
   <Identity>
     <Civ>rome</Civ>
     <SelectionGroupName>structures/rome_wallset_siege</SelectionGroupName>
     <GenericName>Siege Wall</GenericName>
     <SpecificName>Murus Circummunitionis</SpecificName>
-    <Classes datatype="tokens">
-	  SiegeWall
-	</Classes>
+    <Classes datatype="tokens">SiegeWall</Classes>
     <Icon>structures/palisade_wall.png</Icon>
     <Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
     <History>Quick building, but expensive wooden and earthen walls used to surround and siege an enemy town or fortified position. The most famous examples are the Roman sieges of the Iberian stronghold of Numantia and the Gallic stronghold of Alesia.</History>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml	(copie de travail)
@@ -39,18 +39,16 @@
       </Archer3>
     </VisibleGarrisonPoints>
   </GarrisonHolder>
   <Identity>
     <Civ>rome</Civ>
-	<SelectionGroupName>structures/rome_wallset_siege</SelectionGroupName>
-	<GenericName>Siege Wall</GenericName>
+    <SelectionGroupName>structures/rome_wallset_siege</SelectionGroupName>
+    <GenericName>Siege Wall</GenericName>
     <SpecificName>Murus Circummunitionis</SpecificName>
-    <Classes datatype="tokens">
-	  SiegeWall
-	</Classes>
+    <Classes datatype="tokens">SiegeWall</Classes>
     <Icon>structures/palisade_wall.png</Icon>
-	<Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
+    <Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
     <History>Quick building, but expensive wooden and earthen walls used to surround and siege an enemy town or fortified position. The most famous examples are the Roman sieges of the Iberian stronghold of Numantia and the Gallic stronghold of Alesia.</History>
   </Identity>
   <Obstruction>
     <Static width="25.0" depth="5.0"/>
   </Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml	(copie de travail)
@@ -26,18 +26,16 @@
   <Health>
     <Max op="mul">0.75</Max>
   </Health>
   <Identity>
     <Civ>rome</Civ>
-	<SelectionGroupName>structures/rome_wallset_siege</SelectionGroupName>
-	<GenericName>Siege Wall</GenericName>
+    <SelectionGroupName>structures/rome_wallset_siege</SelectionGroupName>
+    <GenericName>Siege Wall</GenericName>
     <SpecificName>Murus Circummunitionis</SpecificName>
-    <Classes datatype="tokens">
-	  SiegeWall
-	</Classes>
+    <Classes datatype="tokens">SiegeWall</Classes>
     <Icon>structures/palisade_wall.png</Icon>
-	<Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
+    <Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
     <History>Quick building, but expensive wooden and earthen walls used to surround and siege an enemy town or fortified position. The most famous examples are the Roman sieges of the Iberian stronghold of Numantia and the Gallic stronghold of Alesia.</History>
   </Identity>
   <Obstruction>
     <Static width="13.0" depth="5.0"/>
   </Obstruction>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml	(copie de travail)
@@ -26,12 +26,13 @@
   <Health>
     <Max op="mul">0.75</Max>
   </Health>
   <Identity>
     <Civ>rome</Civ>
-	<GenericName>Siege Wall Tower</GenericName>
+    <GenericName>Siege Wall Tower</GenericName>
     <SpecificName>Turris Circummunitionis</SpecificName>
+    <Classes datatype="tokens">SiegeWall</Classes>
   </Identity>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
   <TerritoryDecay>
Index: binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml	(copie de travail)
@@ -18,13 +18,11 @@
   </Health>
   <Identity>
     <Civ>spart</Civ>
     <GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssítion</SpecificName>
-    <Classes datatype="tokens">
-	  Syssiton
-	</Classes>
+    <Classes datatype="tokens">Syssiton</Classes>
     <Tooltip>Train Spartan heroes and Spartiate champion hoplites.</Tooltip>
     <History>The Syssítia were where full-blooded Spartans, even Spartan kings, were barracked and dined together.</History>
     <Icon>structures/gymnasion.png</Icon>
   </Identity>
   <Obstruction>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml	(copie de travail)
@@ -42,12 +42,13 @@
     <Max>2000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Military Colony</GenericName>
-	<SpecificName>Klēroukhía</SpecificName>
-    <Classes datatype="tokens">Town Colony</Classes>
+    <SpecificName>Klēroukhía</SpecificName>
+    <Classes datatype="tokens">Colony</Classes>
+    <VisibleClasses datatype="tokens">Town</VisibleClasses>
     <Icon>structures/military_settlement.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
     <Static width="23.0" depth="23.0"/>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_structure_defense.xml	(copie de travail)
@@ -10,8 +10,8 @@
       <Crush>1.0</Crush>
     </Foundation>
   </Armour>
   <Identity>
     <GenericName>Defensive Structure</GenericName>
-    <VisibleClasses datatype="tokens">Defensive</VisibleClasses>
+    <Classes datatype="tokens">Defensive</Classes>
   </Identity>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml	(copie de travail)
@@ -4,11 +4,12 @@
      gates, wall segments of various length, etc.) using the WallSet component (to be overridden by child
      templates). -->
 <Entity>
   <Identity>
     <Icon>structures/wall.png</Icon>
-    <Classes datatype="tokens">Town StoneWall</Classes>
+    <Classes datatype="tokens">StoneWall</Classes>
+    <VisibleClasses datatype="tokens">Town</VisibleClasses>
     <GenericName>City Wall</GenericName>
     <Tooltip>Wall off your town for a stout defense.</Tooltip>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <WallSet>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(copie de travail)
@@ -60,12 +60,12 @@
     <SpawnEntityOnDeath>rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Fortress</GenericName>
     <Tooltip>Train heroes, champions, and siege weapons. Research siege weapon improvements.</Tooltip>
-    <Classes datatype="tokens">GarrisonFortress</Classes>
-    <VisibleClasses datatype="tokens">Defensive City Fortress</VisibleClasses>
+    <Classes datatype="tokens">Defensive Fortress GarrisonFortress</Classes>
+    <VisibleClasses datatype="tokens">City</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>100</xp>
Index: binaries/data/mods/public/simulation/templates/template_structure_special.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_special.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_structure_special.xml	(copie de travail)
@@ -39,14 +39,12 @@
     <SpawnEntityOnDeath>rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Special Building</GenericName>
     <Tooltip>This is a special building unique to a particular civilization.</Tooltip>
-    <Classes datatype="tokens">
-      City
-      SpecialBuilding
-    </Classes>
+    <Classes datatype="tokens">SpecialBuilding</Classes>
+    <VisibleClasses datatype="tokens">City</VisibleClasses>
     <Icon>.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
Index: binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_wonder.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_structure_wonder.xml	(copie de travail)
@@ -44,11 +44,11 @@
     <SpawnEntityOnDeath>rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Wonder</GenericName>
     <Tooltip>Bring glory to your civilization and add large tracts of land to your empire.</Tooltip>
-    <Classes datatype="tokens">City Wonder</Classes>
+    <VisibleClasses datatype="tokens">City Wonder</VisibleClasses>
     <Icon>structures/wonder.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>200</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(copie de travail)
@@ -21,11 +21,11 @@
   </Footprint>
   <Health>
     <Max>750</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
+    <Classes datatype="tokens">Elephant</Classes>
     <GenericName>War Elephant</GenericName>
     <Icon>gaia/fauna_elephant.png</Icon>
     <History>War elephants were used by many Eastern and African cultures.</History>
   </Identity>
   <Position>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_ranged.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_ranged.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_ranged.xml	(copie de travail)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Identity>
     <GenericName>Champion Ranged</GenericName>
-    <Classes datatype="tokens">Ranged</Classes>
+    <VisibleClasses datatype="tokens">Ranged</VisibleClasses>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(copie de travail)
@@ -27,11 +27,11 @@
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Hero</Classes>
+    <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
     <GenericName>Hero Cavalry Skirmisher</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(copie de travail)
@@ -42,11 +42,12 @@
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
+    <Classes datatype="tokens">Elephant</Classes>
+    <VisibleClasses datatype="tokens">Melee</VisibleClasses>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(copie de travail)
@@ -57,12 +57,12 @@
   <Health>
     <Max>80</Max>
   </Health>
   <Identity>
     <GenericName>Infantry</GenericName>
-    <Classes datatype="tokens">CitizenSoldier Worker Human Organic</Classes>
-    <VisibleClasses datatype="tokens">Infantry Citizen Soldier</VisibleClasses>
+    <Classes datatype="tokens">CitizenSoldier Human Organic</Classes>
+    <VisibleClasses datatype="tokens">Citizen Infantry Soldier Worker</VisibleClasses>
     <Rank>Basic</Rank>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml	(copie de travail)
@@ -15,11 +15,11 @@
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>2</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-	<GarrisonArrowClasses>Infantry Ranged</GarrisonArrowClasses>
+    <GarrisonArrowClasses>Infantry Ranged</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>2</Population>
     <BuildTime>20</BuildTime>
     <Resources>
@@ -43,11 +43,11 @@
   <Health>
     <Max>800</Max>
   </Health>
   <Identity>
     <GenericName>Light Warship</GenericName>
-    <Classes datatype="tokens">Warship Light Bow Ranged</Classes>
+    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <ResourceGatherer disable=""/>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml	(copie de travail)
@@ -28,13 +28,13 @@
       <heavydamage>0.35</heavydamage> 
     </DamageVariants>
   </Health>
   <Identity>
     <GenericName>Fire Ship</GenericName>
-    <Classes datatype="tokens">Warship Fireship Melee</Classes>
+    <VisibleClasses datatype="tokens">Fireship Melee Warship</VisibleClasses>
     <Tooltip>Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly.</Tooltip>
-	<RequiredTechnology>phase_town</RequiredTechnology>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml	(copie de travail)
@@ -53,12 +53,12 @@
     <Max>2000</Max>
   </Health>
   <Identity>
     <GenericName>Heavy Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
-    <Classes datatype="tokens">Warship Heavy Ranged</Classes>
-	<RequiredTechnology>phase_city</RequiredTechnology>
+    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
+    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/siege/ballist_attack.xml</attack>
     </SoundGroups>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml	(copie de travail)
@@ -15,11 +15,11 @@
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <MaxArrowCount>13</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-	<GarrisonArrowClasses>Infantry Ranged</GarrisonArrowClasses>
+    <GarrisonArrowClasses>Infantry Ranged</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>3</Population>
     <BuildTime>25</BuildTime>
     <Resources>
@@ -43,11 +43,11 @@
   <Health>
     <Max>1400</Max>
   </Health>
   <Identity>
     <GenericName>Medium Warship</GenericName>
-    <VisibleClasses datatype="tokens">Warship Medium Ranged</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <ResourceGatherer disable=""/>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml	(copie de travail)
@@ -36,11 +36,11 @@
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <GenericName>Bolt Shooter</GenericName>
-	<Classes datatype="tokens">BoltShooter Ranged</Classes>
+    <VisibleClasses datatype="tokens">BoltShooter Ranged</VisibleClasses>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>0</food>
     <wood>10</wood>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml	(copie de travail)
@@ -43,11 +43,11 @@
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <GenericName>Siege Catapult</GenericName>
-    <Classes datatype="tokens">Ranged Catapult</Classes>
+    <VisibleClasses datatype="tokens">Catapult Ranged</VisibleClasses>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>0</food>
     <wood>20</wood>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml	(copie de travail)
@@ -34,19 +34,19 @@
   <Health>
     <Max>400</Max>
   </Health>
   <Identity>
     <GenericName>Battering Ram</GenericName>
-    <Classes datatype="tokens">Melee Ram</Classes>
+    <VisibleClasses datatype="tokens">Melee Ram</VisibleClasses>
   </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>
+      <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>
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml	(copie de travail)
@@ -52,11 +52,11 @@
   <Health>
     <Max>500</Max>
   </Health>
   <Identity>
     <GenericName>Siege Tower</GenericName>
-    <Classes datatype="tokens">Ranged SiegeTower</Classes>
+    <VisibleClasses datatype="tokens">SiegeTower Ranged</VisibleClasses>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(copie de travail)
@@ -39,13 +39,14 @@
   <Health>
     <Max>25</Max>
   </Health>
   <Identity>
     <GenericName>Female Citizen</GenericName>
-	<Gender>female</Gender>
+    <Gender>female</Gender>
     <History>Women in the ancient world took on a variety of roles - from leadership (Celts) to servant (Greeks). Women are hard workers, the economic backbone of any civilization. In history, it was typical when all the males (capable of fighting) were killed for the females, children, and elderly to be sold as slaves.</History>
-    <Classes datatype="tokens">Worker Female Citizen</Classes>
+    <Classes datatype="tokens">Female</Classes>
+    <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
     <Formations disable=""/>
   </Identity>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(copie de travail)
@@ -14,11 +14,11 @@
   </Heal>
   <Health>
     <Max>85</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Healer</Classes>
+    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
     <Tooltip>Heal units.</Tooltip>
     <Rank>Basic</Rank>
   </Identity>
   <Promotion>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml	(copie de travail)
@@ -17,11 +17,11 @@
   </Cost>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
 	<SelectionGroupName>units/athen_infantry_marine_archer_b</SelectionGroupName>
-    <Classes datatype="tokens">Mercenary</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
     <History>Mercenary archers from the big island of Crete. They were widely regarded as the best archers in all of Hellas and had a long tradition of hiring themselves out to Hellenic states such as Athens for use aboard Triremes naval vessels. Alexander hired them to accompany him on his world conquest march and while in his service they dueled admirably with the greatly feared eastern archers.</History>
     <Icon>units/hele_infantry_archer.png</Icon>
 	<RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml	(copie de travail)
@@ -4,14 +4,14 @@
     <Square width="10.0" depth="10.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
-    <Classes datatype="tokens">Chariot</Classes>
-	<GenericName>Celtic Chariot</GenericName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <GenericName>Celtic Chariot</GenericName>
     <SpecificName>Carbanto</SpecificName>
-	<SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
+    <SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
     <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>
   <VisualActor>
     <Actor>units/celts/champion_unit_4.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(copie de travail)
@@ -6,11 +6,11 @@
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <Gender>female</Gender>
-    <Classes datatype="tokens">Chariot</Classes>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <SpecificName>Boudicca</SpecificName>
     <History>Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colors over which a thick cloak was fastened by a brooch.</History>
     <Icon>units/celt_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/cart_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_support_trader.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/cart_support_trader.xml	(copie de travail)
@@ -4,11 +4,10 @@
     <Circle radius="2.0"/>
     <Height>7.5</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
-    <Classes datatype="tokens">Camel</Classes>
     <SpecificName>Mekir</SpecificName>
     <History>Of all the merchants of the ancient world, the Carthaginians were the most traveled. Their vast fleet of trading ships went as far as Britain and down the coast of West Africa. Culturally sensitive, the Carthaginians would make allowances for the particular customs of their trading partners, some transactions taking place without direct contact or negotiation. Thanks to the long voyages of Carthaginian merchants much territory was explored and even colonized.</History>
     <Icon>units/cart_support_trader.png</Icon>
   </Identity>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml	(copie de travail)
@@ -8,11 +8,12 @@
     <Height>8.0</Height>
   </Footprint>
   <ResourceGatherer disable=""/>
   <Identity>
     <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">Elephant -Cavalry</VisibleClasses>
+    <Classes datatype="tokens">Elephant</Classes>
+    <VisibleClasses datatype="tokens">-Cavalry</VisibleClasses>
     <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <GenericName>Elephant Archer</GenericName>
     <SpecificName>Vachii Gaja</SpecificName>
     <Icon>units/maur_cavalry_archer.png</Icon>
     <Tooltip>Can run amok.</Tooltip>
Index: binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml	(copie de travail)
@@ -24,12 +24,12 @@
   <Health>
     <Max>600</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
-    <Classes datatype="tokens">Human Organic Support</Classes>
-    <VisibleClasses datatype="tokens">Hero Healer</VisibleClasses>
+    <Classes datatype="tokens">Human Organic</Classes>
+    <VisibleClasses datatype="tokens">Healer Hero Support</VisibleClasses>
     <GenericName>Acharya Chanakya</GenericName>
     <SpecificName>Acharya Chāṇakya</SpecificName>
     <Icon>units/maur_hero_chanakya.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(copie de travail)
@@ -6,14 +6,14 @@
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-	<GenericName>Darius The Great</GenericName>
+    <GenericName>Darius The Great</GenericName>
     <SpecificName>Darayavahush I</SpecificName>
     <Icon>units/pers_hero_darius.png</Icon>
-	<Tooltip>Hero Aura: "Merchant of the Empire." Boosts profitablity of trade during his lifetime (TBD).</Tooltip>
+    <Tooltip>Hero Aura: "Merchant of the Empire." Boosts profitablity of trade during his lifetime (TBD).</Tooltip>
     <History>(King, 521 BC - 486 BC) The son of Vishtaspa (Hystaspes), the satrap of Parthia and Hyrcania; a great administrator as well as a decent general, Darius introduced the division of the empire into satrapies and conquered NW India, Thrace and Macedonia. He was called the 'Merchant of the Empire'.</History>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>0</food>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(copie de travail)
@@ -5,12 +5,12 @@
     <Square width="6.0" depth="12.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <Classes datatype="tokens">Chariot</Classes>
-	<GenericName>Xerxes I</GenericName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <GenericName>Xerxes I</GenericName>
     <SpecificName>Xsayarsa I</SpecificName>
     <Icon>units/pers_hero_xerxes.png</Icon>
     <History>(King, 485 BC - 465 BC) The son of Darius the Great and Atoosa, a daughter of Cyrus the Great, Xerxes was an able administrator, who also extended Imperial rule into Chorasmia. Apart from his failed invasion of Greece, he was famous for his extensive building program, especially at Persepolis.</History>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/units/pers_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_support_trader.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/pers_support_trader.xml	(copie de travail)
@@ -4,12 +4,11 @@
     <Circle radius="2.0"/>
     <Height>7.5</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <Classes datatype="tokens">Camel</Classes>
-	<GenericName>Aramaean Merchant</GenericName>
+    <GenericName>Aramaean Merchant</GenericName>
     <SpecificName>Tamkarum Arami</SpecificName>
     <History>Merchants were the working corps of the Persian economy, moving goods from one end of the vast empire to the other. Commodities included linen, carpets, perfume, cotton, salt, fruit, and even pearls. Thanks to the Aramaeans, the main language of Mesopotamia and in all directions from it was Aramaic, making trade simple. The language was eventually taken on as the official language of the Empire.</History>
     <Icon>units/pers_support_trader.png</Icon>
     <Tooltip>Trade resources between your own markets and those of your allies. Persians have a +25% land trading bonus.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml	(copie de travail)
@@ -15,11 +15,11 @@
   <Health>
     <Max>4000</Max>
   </Health>
   <Identity>
     <Civ>ptol</Civ>
-	<GenericName>Juggernaut</GenericName>
+    <GenericName>Juggernaut</GenericName>
     <SpecificName>Tessarakonterēs</SpecificName>
     <Classes datatype="tokens">Juggernaut</Classes>
     <Icon>units/rome_ship_quinquereme.png</Icon>
   </Identity>
   <TrainingRestrictions>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml	(révision 18615)
+++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml	(copie de travail)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
-    <VisibleClasses datatype="tokens">Camel</VisibleClasses>
     <SelectionGroupName>units/sele_cavalry_archer_b</SelectionGroupName>
     <GenericName>Dahae Horse Archer</GenericName>
     <SpecificName>Hippotoxotès Dahae</SpecificName>
     <History>The Dahae or Dahaeans were a confederacy of three Ancient Iranian tribes who lived in the region to the immediate east of the Caspian Sea. They spoke an Eastern Iranian language. Known as the Dāha to the Persians, they were a staple of many Persian armies until the fall of the Achaemenid Empire. Later they freely joined the armies of Alexander as he invaded India and the armies of the Seleucids in their many battles with the other Successor states. The Dahae of the Parni clan, under Arsaces, would later invade the land of Parthia, depose its ruler, and found a dynasty that would eventually grow into the famed Parthian Empire.</History>
     <Icon>units/sele_cavalry_archer.png</Icon>
