Index: ps/trunk/binaries/data/mods/public/maps/scripts/CaptureTheRelic.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scripts/CaptureTheRelic.js
+++ ps/trunk/binaries/data/mods/public/maps/scripts/CaptureTheRelic.js
@@ -2,7 +2,7 @@
 {
 	let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
 	let catafalqueTemplates = shuffleArray(cmpTemplateManager.FindAllTemplates(false).filter(
-			name => name.startsWith("other/catafalque/")));
+		name => GetIdentityClasses(cmpTemplateManager.GetTemplate(name).Identity || {}).indexOf("Relic") != -1));
 
 	let potentialSpawnPoints = TriggerHelper.GetLandSpawnPoints();
 	if (!potentialSpawnPoints.length)
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/athen_catafalque_1
-    units/catafalques/athen_catafalque_2
-  </Auras>
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Solon</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/brit_catafalque_1
-    units/catafalques/brit_catafalque_2
-  </Auras>
-  <Identity>
-    <Civ>brit</Civ>
-    <SpecificName>Cassivellaunus</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/cart_catafalque
-  </Auras>
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Hasdrubal (Quartermaster)</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/gaul_catafalque_1
-    units/catafalques/gaul_catafalque_2
-  </Auras>
-  <Identity>
-    <Civ>gaul</Civ>
-    <SpecificName>Ambiorix</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/iber_catafalque_1
-    units/catafalques/iber_catafalque_2
-  </Auras>
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Mandonius</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/mace_catafalque
-  </Auras>
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Philip V</SpecificName>
-    <Tooltip>Financial Reorganization: Allied with Rome, Philip reorganized the country's internal affairs and finances, leaving as a legacy reopened mines and a new currency. Gain a slow trickle of metal.</Tooltip>
-  </Identity>
-  <ResourceTrickle>
-    <Rates>
-      <metal>1.0</metal>
-    </Rates>
-    <Interval>1250</Interval>
-  </ResourceTrickle>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/maur_catafalque_1
-    units/catafalques/maur_catafalque_2
-  </Auras>
-  <Identity>
-    <Civ>maur</Civ>
-    <SpecificName>Bindusara</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/pers_catafalque
-  </Auras>
-  <Identity>
-    <Civ>pers</Civ>
-    <SpecificName>Artaxerxes II</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/ptol_catafalque
-  </Auras>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Ptolemy III Euergetes (Benefactor)</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/rome_catafalque_1
-    units/catafalques/rome_catafalque_2
-  </Auras>
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Lucius Junius Brutus</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/sele_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/sele_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/sele_catafalque.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/sele_catafalque_1
-    units/catafalques/sele_catafalque_2
-    units/catafalques/sele_catafalque_3
-  </Auras>
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Antiochus I Soter (Savior)</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">
-    units/catafalques/spart_catafalque_1
-    units/catafalques/spart_catafalque_2
-    units/catafalques/spart_catafalque_3
-  </Auras>
-  <Identity>
-    <Civ>spart</Civ>
-    <SpecificName>Lycurgus</SpecificName>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/special_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/special_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/special_catafalque.xml
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
-  <Capturable>
-    <CapturePoints>250</CapturePoints>
-    <GarrisonRegenRate>0</GarrisonRegenRate>
-    <RegenRate>10</RegenRate>
-  </Capturable>
-  <Cost disable=""/>
-  <Footprint replace="">
-    <Height>2.0</Height>
-    <Square width="5.0" depth="12.0"/>
-  </Footprint>
-  <Health>
-    <Undeletable>true</Undeletable>
-  </Health>
-  <Identity>
-    <Civ>gaia</Civ>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
-    <Formations disable=""/>
-    <GenericName>Catafalque</GenericName>
-    <Icon>units/catafalque.png</Icon>
-    <SelectionGroupName>other/special_catafalque</SelectionGroupName>
-    <Tooltip>A catafalque that holds the remains of a great leader.</Tooltip>
-    <VisibleClasses datatype="tokens">Relic</VisibleClasses>
-  </Identity>
-  <Minimap>
-    <Color r="148" g="0" b="211"/>
-  </Minimap>
-  <ResourceGatherer disable=""/>
-  <Sound>
-    <SoundGroups>
-      <order_walk>actor/singlesteps/steps_grass.xml</order_walk>
-      <run>actor/singlesteps/steps_grass.xml</run>
-      <select>attack/siege/siege_select.xml</select>
-      <walk>actor/singlesteps/steps_grass.xml</walk>
-    </SoundGroups>
-  </Sound>
-  <UnitAI>
-    <DefaultStance>standground</DefaultStance>
-    <CanGuard>false</CanGuard>
-  </UnitAI>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.55</WalkSpeed>
-    <Run>
-      <Speed op="mul">0.55</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/global/catafalque.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit">
+  <Capturable>
+    <CapturePoints>250</CapturePoints>
+    <GarrisonRegenRate>0</GarrisonRegenRate>
+    <RegenRate>10</RegenRate>
+  </Capturable>
+  <Cost disable=""/>
+  <Footprint replace="">
+    <Height>2.0</Height>
+    <Square width="5.0" depth="12.0"/>
+  </Footprint>
+  <Health>
+    <Undeletable>true</Undeletable>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <Formations disable=""/>
+    <GenericName>Catafalque</GenericName>
+    <Icon>units/catafalque.png</Icon>
+    <SelectionGroupName>template_unit_catafalque</SelectionGroupName>
+    <Tooltip>A catafalque that holds the remains of a great leader.</Tooltip>
+    <VisibleClasses datatype="tokens">Relic</VisibleClasses>
+  </Identity>
+  <Minimap>
+    <Color r="148" g="0" b="211"/>
+  </Minimap>
+  <ResourceGatherer disable=""/>
+  <Sound>
+    <SoundGroups>
+      <order_walk>actor/singlesteps/steps_grass.xml</order_walk>
+      <run>actor/singlesteps/steps_grass.xml</run>
+      <select>attack/siege/siege_select.xml</select>
+      <walk>actor/singlesteps/steps_grass.xml</walk>
+    </SoundGroups>
+  </Sound>
+  <UnitAI>
+    <DefaultStance>standground</DefaultStance>
+    <CanGuard>false</CanGuard>
+  </UnitAI>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.55</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.55</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/global/catafalque.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_catafalque.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/athen_catafalque_1
+    units/catafalques/athen_catafalque_2
+  </Auras>
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Solon</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_catafalque.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/brit_catafalque_1
+    units/catafalques/brit_catafalque_2
+  </Auras>
+  <Identity>
+    <Civ>brit</Civ>
+    <SpecificName>Cassivellaunus</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_catafalque.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/cart_catafalque
+  </Auras>
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Hasdrubal (Quartermaster)</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_catafalque.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/gaul_catafalque_1
+    units/catafalques/gaul_catafalque_2
+  </Auras>
+  <Identity>
+    <Civ>gaul</Civ>
+    <SpecificName>Ambiorix</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_catafalque.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/iber_catafalque_1
+    units/catafalques/iber_catafalque_2
+  </Auras>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Mandonius</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_catafalque.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/mace_catafalque
+  </Auras>
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Philip V</SpecificName>
+    <Tooltip>Financial Reorganization: Allied with Rome, Philip reorganized the country's internal affairs and finances, leaving as a legacy reopened mines and a new currency. Gain a slow trickle of metal.</Tooltip>
+  </Identity>
+  <ResourceTrickle>
+    <Rates>
+      <metal>1.0</metal>
+    </Rates>
+    <Interval>1250</Interval>
+  </ResourceTrickle>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_catafalque.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/maur_catafalque_1
+    units/catafalques/maur_catafalque_2
+  </Auras>
+  <Identity>
+    <Civ>maur</Civ>
+    <SpecificName>Bindusara</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_catafalque.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/pers_catafalque
+  </Auras>
+  <Identity>
+    <Civ>pers</Civ>
+    <SpecificName>Artaxerxes II</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_catafalque.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/ptol_catafalque
+  </Auras>
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Ptolemy III Euergetes (Benefactor)</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_catafalque.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/rome_catafalque_1
+    units/catafalques/rome_catafalque_2
+  </Auras>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Lucius Junius Brutus</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_catafalque.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/sele_catafalque_1
+    units/catafalques/sele_catafalque_2
+    units/catafalques/sele_catafalque_3
+  </Auras>
+  <Identity>
+    <Civ>sele</Civ>
+    <SpecificName>Antiochus I Soter (Savior)</SpecificName>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_catafalque.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_catafalque">
+  <Auras datatype="tokens">
+    units/catafalques/spart_catafalque_1
+    units/catafalques/spart_catafalque_2
+    units/catafalques/spart_catafalque_3
+  </Auras>
+  <Identity>
+    <Civ>spart</Civ>
+    <SpecificName>Lycurgus</SpecificName>
+  </Identity>
+</Entity>