Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag.xml
===================================================================
--- binaries/data/mods/public/art/actors/props/special/common/waypoint_flag.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant frequency="100">
-      <animations>
-        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
-      </animations>
-      <mesh>props/waypoint_flag.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant name="kush">
-      <textures>
-	    <texture file="props/banner_kushites.png" name="baseTex"/>
-	  </textures>
-    </variant>
-    <variant name="hele">
-      <textures>
-        <texture file="props/banner_greek.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="pers">
-      <textures>
-        <texture file="props/banner_persian.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="celt">
-      <textures>
-        <texture file="props/banner_celt.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="cart">
-      <textures>
-        <texture file="props/banner_carthage.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="iber">
-      <textures>
-        <texture file="props/banner_iberians.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="rome">
-      <textures>
-        <texture file="props/banner_romans.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="spart">
-      <textures>
-        <texture file="props/banner_spartans.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="mace">
-      <textures>
-        <texture file="props/banner_macedonians.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="athen">
-      <textures>
-        <texture file="props/banner_greek.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="brit">
-      <textures>
-        <texture file="props/banner_celt.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="gaul">
-      <textures>
-        <texture file="props/banner_celt.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="maur">
-      <textures>
-        <texture file="props/banner_mauryas.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="ptol">
-      <textures>
-        <texture file="props/banner_ptolemies.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="sele">
-      <textures>
-        <texture file="props/banner_seleucids.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_athen.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_athen.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Athenian Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_greek.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_brit.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_brit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Britonnic Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_celt.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_cart.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_cart.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Carthaginian Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_carthage.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_gaul.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_gaul.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Gaul Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_celt.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_iber.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_iber.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Iberian Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_iberians.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_kush.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_kush.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Kush Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_kushites.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_mace.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_mace.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Macedonians Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_macedonians.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_maur.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_maur.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Mauryan Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_mauryas.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_pers.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_pers.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Pers Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_persian.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_ptol.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_ptol.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Ptolemaic Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_ptolemies.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_rome.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_rome.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Roman Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_romans.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_sele.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_sele.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Seleucid Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_seleucids.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_spart.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/actors/props/special/common/waypoint_flag_spart.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Spartan Waypoint Flag">
+      <animations>
+        <animation file="mechanical/waypoint_flag_idle.dae" name="Idle" speed="30"/>
+      </animations>
+      <mesh>props/waypoint_flag.dae</mesh>
+      <textures>
+        <texture file="props/banner_spartans.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
Index: binaries/data/mods/public/simulation/templates/special/rallypoint.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/rallypoint.xml
+++ binaries/data/mods/public/simulation/templates/special/rallypoint.xml
@@ -4,6 +4,6 @@
     <AlwaysVisible>true</AlwaysVisible>
   </Visibility>
   <VisualActor>
-    <Actor>props/special/common/waypoint_flag.xml</Actor>
+    <Actor>props/special/common/waypoint_flag_{civ}.xml</Actor>
   </VisualActor>
 </Entity>
Index: source/simulation2/components/CCmpVisualActor.cpp
===================================================================
--- source/simulation2/components/CCmpVisualActor.cpp
+++ source/simulation2/components/CCmpVisualActor.cpp
@@ -467,7 +467,7 @@
 		if (!m_Unit || !m_Unit->GetAnimation() || !m_Unit->GetID())
 			return;
 
-		m_Unit->GetAnimation()->SetAnimationState(m_AnimName, m_AnimOnce, m_AnimSpeed.ToFloat(), m_AnimDesync.ToFloat(), m_SoundGroup.c_str());	
+		m_Unit->GetAnimation()->SetAnimationState(m_AnimName, m_AnimOnce, m_AnimSpeed.ToFloat(), m_AnimDesync.ToFloat(), m_SoundGroup.c_str());
 	}
 
 	virtual void SelectMovementAnimation(const std::string& name, fixed speed)
@@ -568,17 +568,26 @@
 void CCmpVisualActor::ParseActorName(std::wstring base)
 {
 	CmpPtr<ICmpIdentity> cmpIdentity(GetEntityHandle());
-	const std::wstring pattern = L"{phenotype}";
+	const std::wstring phenotypePattern = L"{phenotype}";
 	if (cmpIdentity)
 	{
-		size_t pos = base.find(pattern);
+		size_t pos = base.find(phenotypePattern);
 		while (pos != std::string::npos)
 		{
-			base.replace(pos, pattern.size(),  cmpIdentity->GetPhenotype());
-			pos = base.find(pattern, pos + pattern.size());
+			base.replace(pos, phenotypePattern.size(),  cmpIdentity->GetPhenotype());
+			pos = base.find(phenotypePattern, pos + phenotypePattern.size());
+		}
+	}
+	const std::wstring civPattern = L"{civ}";
+	if (cmpIdentity)
+	{
+		size_t pos = base.find(civPattern);
+		while (pos != std::string::npos)
+		{
+			base.replace(pos, civPattern.size(),  cmpIdentity->GetCiv());
+			pos = base.find(civPattern, pos + civPattern.size());
 		}
 	}
-
 	m_ActorName = base;
 }
 
Index: source/simulation2/components/ICmpIdentity.h
===================================================================
--- source/simulation2/components/ICmpIdentity.h
+++ source/simulation2/components/ICmpIdentity.h
@@ -31,6 +31,8 @@
 
 	virtual std::wstring GetPhenotype() = 0;
 
+	virtual std::wstring GetCiv() = 0;
+
 	DECLARE_INTERFACE_TYPE(Identity)
 };
 
Index: source/simulation2/components/ICmpIdentity.cpp
===================================================================
--- source/simulation2/components/ICmpIdentity.cpp
+++ source/simulation2/components/ICmpIdentity.cpp
@@ -40,6 +40,11 @@
 	{
 		return m_Script.Call<std::wstring>("GetPhenotype");
 	}
+
+	virtual std::wstring GetCiv()
+	{
+		return m_Script.Call<std::wstring>("GetCiv");
+	}
 };
 
 REGISTER_COMPONENT_SCRIPT_WRAPPER(IdentityScripted)