Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -17,7 +17,15 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Gender' a:help='Unit gender for voices. Choices includes male or female.'>" +
+		"<element name='PossiblePhenotypes' a:help='Optional list of space-separated phenotypes which can be chosen. Choices currently include: male, female.'>" +
+			"<attribute name='datatype'>" +
+				"<value>tokens</value>" +
+			"</attribute>" +
+			"<text/>" +
+		"</element>" +
+	"</optional>" +
+	"<optional>" +
+		"<element name='Phenotype' a:help='Unit phenotype for voices and visual. Choices are male, female or random. Random will choose between the phenotypes specified in PossiblePhenotypes.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
@@ -95,14 +103,21 @@
 {
 	this.classesList = GetIdentityClasses(this.template);
 	this.visibleClassesList = GetVisibleIdentityClasses(this.template);
+	this.SetPhenotype();
 };
 
-Identity.prototype.Deserialize = function ()
+Identity.prototype.Deserialize = function(data)
 {
 	this.Init();
+	this.phenotype = data.phenotype;
 };
 
-Identity.prototype.Serialize = null; // we have no dynamic state to save
+Identity.prototype.Serialize = function()
+{
+	return {
+		"phenotype": this.phenotype
+	};
+};
 
 Identity.prototype.GetCiv = function()
 {
@@ -114,9 +129,25 @@
 	return this.template.Lang || "greek"; // ugly default
 };
 
-Identity.prototype.GetGender = function()
+Identity.prototype.GetPossiblePhenotypes = function()
+{
+	return !!this.template.PossiblePhenotypes ? this.template.PossiblePhenotypes._string.split(/\s+/) : ["none"];
+};
+
+Identity.prototype.SetPhenotype = function(newPhenotype = "none")
+{
+	if (newPhenotype == this.phenotype)
+		return;
+
+	if (!this.template.Phenotype)
+		this.phenotype = "male"; // ugly default
+	else
+		this.phenotype = this.template.Phenotype == "random" ? pickRandom(this.GetPossiblePhenotypes()) : this.template.Phenotype;
+};
+
+Identity.prototype.GetPhenotype = function()
 {
-	return this.template.Gender || "male"; // ugly default
+	return this.phenotype;
 };
 
 Identity.prototype.GetRank = function()
Index: binaries/data/mods/public/simulation/components/Sound.js
===================================================================
--- binaries/data/mods/public/simulation/components/Sound.js
+++ binaries/data/mods/public/simulation/components/Sound.js
@@ -35,16 +35,16 @@
 	if (name in this.template.SoundGroups)
 	{
 		// Replace the "{lang}" codes with this entity's civ ID
-		var cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
+		let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
 		if (!cmpIdentity)
 			return;
-		var lang = cmpIdentity.GetLang();
-		// Replace the "{gender}" codes with this entity's gender ID
-		var gender = cmpIdentity.GetGender();
-
-		var soundName = this.template.SoundGroups[name].replace(/\{lang\}/g, lang)
-				.replace(/\{gender\}/g, gender);
-		var cmpSoundManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_SoundManager);
+		let lang = cmpIdentity.GetLang();
+		// Replace the "{phenotype}" codes with this entity's phenotype ID
+		let phenotype = cmpIdentity.GetPhenotype();
+
+		let soundName = this.template.SoundGroups[name].replace(/\{lang\}/g, lang)
+				.replace(/\{phenotype\}/g, phenotype);
+		let cmpSoundManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_SoundManager);
 		if (cmpSoundManager)
 			cmpSoundManager.PlaySoundGroup(soundName, this.entity);
 	}
Index: binaries/data/mods/public/simulation/components/tests/test_Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Identity.js
+++ binaries/data/mods/public/simulation/components/tests/test_Identity.js
@@ -2,12 +2,13 @@
 
 let cmpIdentity = ConstructComponent(5, "Identity", {
 	"Civ": "iber",
-	"GenericName": "Iberian Skirmisher"
+	"GenericName": "Iberian Skirmisher",
+	"Phenotype": "male",
 });
 
 TS_ASSERT_EQUALS(cmpIdentity.GetCiv(), "iber");
 TS_ASSERT_EQUALS(cmpIdentity.GetLang(), "greek");
-TS_ASSERT_EQUALS(cmpIdentity.GetGender(), "male");
+TS_ASSERT_EQUALS(cmpIdentity.GetPhenotype(), "male");
 TS_ASSERT_EQUALS(cmpIdentity.GetRank(), "");
 TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), []);
 TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), []);
@@ -20,7 +21,7 @@
 cmpIdentity = ConstructComponent(6, "Identity", {
 	"Civ": "iber",
 	"Lang": "iberian",
-	"Gender": "female",
+	"Phenotype": "female",
 	"GenericName": "Iberian Skirmisher",
 	"SpecificName": "Lusitano Ezpatari",
 	"SelectionGroupName": "units/iber_infantry_javelinist_b",
@@ -39,7 +40,7 @@
 
 TS_ASSERT_EQUALS(cmpIdentity.GetCiv(), "iber");
 TS_ASSERT_EQUALS(cmpIdentity.GetLang(), "iberian");
-TS_ASSERT_EQUALS(cmpIdentity.GetGender(), "female");
+TS_ASSERT_EQUALS(cmpIdentity.GetPhenotype(), "female");
 TS_ASSERT_EQUALS(cmpIdentity.GetRank(), "Basic");
 TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), ["CitizenSoldier", "Human", "Organic", "Javelin", "Basic"]);
 TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelin"]);
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -80,11 +80,11 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <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_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -42,11 +42,11 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <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_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -32,16 +32,16 @@
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <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_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
-      <death>actor/human/death/{gender}_death.xml</death>
+      <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -54,20 +54,20 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
+      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <order_heal>voice/{lang}/civ/civ_{gender}_heal.xml</order_heal>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
+      <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_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
-      <death>actor/human/death/{gender}_death.xml</death>
+      <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -100,18 +100,18 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <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_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
-      <death>actor/human/death/{gender}_death.xml</death>
+      <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>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -48,7 +48,7 @@
   </Health>
   <Identity>
     <GenericName>Female Citizen</GenericName>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <Classes datatype="tokens">FemaleCitizen</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
     <Formations disable=""/>
@@ -70,15 +70,15 @@
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_female.xml</trained>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_build>voice/{lang}/civ/civ_{gender}_build.xml</order_build>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <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/{gender}_death.xml</death>
+      <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>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -42,16 +42,16 @@
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
-      <order_heal>voice/{lang}/civ/civ_{gender}_heal.xml</order_heal>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <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/{gender}_death.xml</death>
+      <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -65,14 +65,14 @@
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
+      <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_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/{gender}_death.xml</death>
+      <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>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -19,16 +19,16 @@
   </Identity>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_trade>voice/{lang}/civ/civ_{gender}_trade.xml</order_trade>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
+      <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/{gender}_death.xml</death>
+      <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>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
@@ -12,7 +12,7 @@
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Boudicca (Chariot)</GenericName>
     <SpecificName>Boadicea</SpecificName>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_cavalry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_cavalry_javelinist.xml
@@ -7,7 +7,7 @@
     <Civ>brit</Civ>
     <GenericName>Boudicca (Sword)</GenericName>
     <SpecificName>Boadicea</SpecificName>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
@@ -7,7 +7,7 @@
     <Civ>brit</Civ>
     <GenericName>Boudicca (Sword)</GenericName>
     <SpecificName>Boadicea</SpecificName>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>cart</Civ>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <SelectionGroupName>units/cart_support_healer_b</SelectionGroupName>
     <SpecificName>Kehinit</SpecificName>
     <Icon>units/cart_support_healer.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>iber</Civ>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <SelectionGroupName>units/iber_support_healer_b</SelectionGroupName>
     <GenericName>Priestess of Ataekina</GenericName>
     <SpecificName>Emakumezko Apaiz de Ataekina</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
@@ -7,7 +7,7 @@
     <Civ>kush</Civ>
     <GenericName>Amanirenas</GenericName>
     <SpecificName>Amnirense qore li kdwe li</SpecificName>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <Icon>units/kush_hero_amanirenas.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas_chariot.xml
@@ -7,7 +7,7 @@
     <Civ>kush</Civ>
     <GenericName>Amanirenas</GenericName>
     <SpecificName>Amnirense qore li kdwe li</SpecificName>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <Icon>units/kush_hero_amanirenas.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
     <Civ>maur</Civ>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <GenericName>Maiden Guard</GenericName>
     <SpecificName>Visha Kanya</SpecificName>
     <SelectionGroupName>units/maur_champion_maiden</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_champion_infantry_archer">
   <Identity>
     <Civ>maur</Civ>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <GenericName>Maiden Guard Archer</GenericName>
     <SpecificName>Visha Kanya</SpecificName>
     <Icon>units/maur_champion_maiden_archer.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
@@ -7,7 +7,7 @@
   </Auras>
   <Identity>
     <Civ>ptol</Civ>
-    <Gender>female</Gender>
+    <Phenotype>female</Phenotype>
     <GenericName>Cleopatra VII</GenericName>
     <SpecificName>Kleopatra H' Philopator</SpecificName>
     <Icon>units/ptol_hero_cleopatra.png</Icon>
Index: source/simulation2/components/CCmpVisualActor.cpp
===================================================================
--- source/simulation2/components/CCmpVisualActor.cpp
+++ source/simulation2/components/CCmpVisualActor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include "simulation2/MessageTypes.h"
 
 #include "ICmpFootprint.h"
+#include "ICmpIdentity.h"
 #include "ICmpUnitRenderer.h"
 #include "ICmpOwnership.h"
 #include "ICmpPosition.h"
@@ -35,6 +36,7 @@
 
 #include "simulation2/serialization/SerializeTemplates.h"
 
+#include <boost/algorithm/string.hpp>
 #include "graphics/Decal.h"
 #include "graphics/Frustum.h"
 #include "graphics/Model.h"
@@ -202,7 +204,17 @@
 		if (m_IsFoundationActor)
 			m_BaseActorName = m_ActorName = paramNode.GetChild("FoundationActor").ToString();
 		else
-			m_BaseActorName = m_ActorName = paramNode.GetChild("Actor").ToString();
+		{
+			std::wstring baseActorString = paramNode.GetChild("Actor").ToString();
+
+			CmpPtr<ICmpIdentity> cmpIdentity(GetEntityHandle());
+			const std::wstring pattern = L"{phenotype}";
+			auto patternPos = baseActorString.find(pattern);
+			if (patternPos != std::wstring::npos)
+			    boost::replace_all(baseActorString , pattern, cmpIdentity->GetPhenotype());
+
+			m_BaseActorName = m_ActorName = baseActorString;
+		}
 
 		m_VisibleInAtlasOnly = paramNode.GetChild("VisibleInAtlasOnly").ToBool();
 		m_IsActorOnly = paramNode.GetChild("ActorOnly").IsOk();
Index: source/simulation2/components/ICmpIdentity.h
===================================================================
--- source/simulation2/components/ICmpIdentity.h
+++ source/simulation2/components/ICmpIdentity.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -29,6 +29,8 @@
 public:
 	virtual std::string GetSelectionGroupName() = 0;
 
+	virtual std::wstring GetPhenotype() = 0;
+
 	DECLARE_INTERFACE_TYPE(Identity)
 };
 
Index: source/simulation2/components/ICmpIdentity.cpp
===================================================================
--- source/simulation2/components/ICmpIdentity.cpp
+++ source/simulation2/components/ICmpIdentity.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -35,6 +35,11 @@
 	{
 		return m_Script.Call<std::string>("GetSelectionGroupName");
 	}
+
+	virtual std::wstring GetPhenotype()
+	{
+		return m_Script.Call<std::wstring>("GetPhenotype");
+	}
 };
 
 REGISTER_COMPONENT_SCRIPT_WRAPPER(IdentityScripted)