diff --git a/binaries/data/mods/public/simulation/templates/other/cart_tophet.xml b/binaries/data/mods/public/simulation/templates/other/cart_tophet.xml
index 8a5931d93e..e8fa62759d 100644
--- a/binaries/data/mods/public/simulation/templates/other/cart_tophet.xml
+++ b/binaries/data/mods/public/simulation/templates/other/cart_tophet.xml
@@ -36,7 +36,7 @@
- units/cart_champion_cavalry
+ units/{civ}_champion_cavalry
diff --git a/binaries/data/mods/public/simulation/templates/other/maur_palace.xml b/binaries/data/mods/public/simulation/templates/other/maur_palace.xml
index c14416c579..2c18e8e93b 100644
--- a/binaries/data/mods/public/simulation/templates/other/maur_palace.xml
+++ b/binaries/data/mods/public/simulation/templates/other/maur_palace.xml
@@ -19,10 +19,10 @@
0.7
units/{civ}_support_female_citizen
- units/maur_champion_maiden_archer
- units/maur_hero_chanakya
- units/maur_hero_maurya
- units/maur_hero_ashoka
+ units/{civ}_champion_maiden_archer
+ units/{civ}_hero_chanakya
+ units/{civ}_hero_maurya
+ units/{civ}_hero_ashoka
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_dock.xml b/binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
index 0fbe4ad349..89fcd2bff7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
@@ -18,8 +18,8 @@
0.7
- units/athen_infantry_marine_archer_b
- units/athen_champion_marine
+ units/{civ}_infantry_marine_archer_b
+ units/{civ}_champion_marine
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
index fd0ae0f511..e6043f8d0f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
@@ -3,9 +3,4 @@
athen
-
-
- -units/mace_thorakites
-
-
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml b/binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
index e462f9c250..c35a1c5b03 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
@@ -34,12 +34,12 @@
- units/brit_infantry_spearman_b
- units/brit_infantry_slinger_b
- units/brit_cavalry_javelinist_b
+ units/{civ}_infantry_spearman_b
+ units/{civ}_infantry_slinger_b
+ units/{civ}_cavalry_javelinist_b
units/{civ}_ship_fishing
units/{civ}_ship_merchant
- units/brit_ship_trireme
+ units/{civ}_ship_trireme
diff --git a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
index b139dc8f72..9d28ed9508 100644
--- a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
@@ -39,10 +39,10 @@
- units/ptol_infantry_spearman_merc_b
- units/ptol_infantry_swordsman_merc_b
- units/ptol_cavalry_spearman_merc_b
- units/ptol_cavalry_javelinist_merc_b
+ units/{civ}_infantry_spearman_merc_b
+ units/{civ}_infantry_swordsman_merc_b
+ units/{civ}_cavalry_spearman_merc_b
+ units/{civ}_cavalry_javelinist_merc_b
upgrade_rank_advanced_infantry
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
index 24edd1fa1a..5c9a9b7f88 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
@@ -41,10 +41,10 @@
- units/ptol_infantry_spearman_merc_b
- units/ptol_infantry_swordsman_merc_b
- units/ptol_cavalry_spearman_merc_b
- units/ptol_cavalry_javelinist_merc_b
+ units/{civ}_infantry_spearman_merc_b
+ units/{civ}_infantry_swordsman_merc_b
+ units/{civ}_cavalry_spearman_merc_b
+ units/{civ}_cavalry_javelinist_merc_b
upgrade_rank_advanced_infantry
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
index 4b9e47ab24..4945710334 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
@@ -47,9 +47,9 @@
0.7
- units/thrace_black_cloak
- units/mace_thureophoros
- units/mace_thorakites
+ units/{civ}_black_cloak
+ units/{civ}_thureophoros
+ units/{civ}_thorakites
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/athen_black_cloak.xml
new file mode 100644
index 0000000000..fb8a37269d
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/athen_black_cloak.xml
@@ -0,0 +1,6 @@
+
+
+
+ athen
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/athen_thureophoros.xml
new file mode 100644
index 0000000000..8e4574a222
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/athen_thureophoros.xml
@@ -0,0 +1,6 @@
+
+
+
+ athen
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
index f5d1bc7c7a..4796fc2013 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
@@ -1,30 +1,6 @@
-
-
- 2
- 2
-
-
-
- -2
-
-
-
-
- 0
- 2
-
-
+
mace
- greek
- Armored Swordsman
- Thōrakitēs
- Thōrakitai were soldiers similar to Thyreophóroi. The literal translation of the term is curassiers, which suggests that they may have worn a short Celtic mail shirt or possibly a thorax. Thorakitai were used in armies of the Hellenistic Period in a variety of tactical situations. They were a type of armored but mobile infantry who did not require a rigid formation to be effective in combat. From their name we can deduce that most wore armor and helmet. They bore a thureos (or thyreos), an oblong shield, and were armed with sword, javelins and spear, which were used according to their tactical use. It seems that the thorakitai were heavily armored thureophoroi, able to bear spears and do battle in a phalanx as well as irregularly attack the enemy in situations when such an action was required for tactical reasons, like to exploit or challenge rough terrain. Thorakitai are mentioned in the army of the Achaian League and in the army of the Seleucids. The Seleucid Thorakitai were used in the storming of the Elburz Range in 210 BC under Antiochus III. They were used with the lighter troops to climb the cliffs and fight hand to hand with the enemy who might have not been dislodged by the lighter troops in the assault. There is a tomb illustration from Sidon showing what could well be a thorakites. The fragmentary inscription indicates that he was an Anatolian.
- units/mace_thorakites.png
- phase_city
-
- units/macedonians/thorakites.xml
-
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
index 12400724df..b54a914f08 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
@@ -1,21 +1,6 @@
-
-
-
- 0
- 2
-
-
+
mace
- greek
- Heavy Skirmisher
- Thyreophóros
- Thyreophóroi were a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a link between the heavier pikemen and the cavalry wings.
- units/mace_thureophoros.png
- phase_city
-
- units/macedonians/thureophoros.xml
-
diff --git a/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml
rename to binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
new file mode 100644
index 0000000000..59255d645f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -0,0 +1,31 @@
+
+
+
+ 2
+ 2
+
+
+
+ -2
+
+
+
+
+ 0
+ 2
+
+
+
+ gaia
+ greek
+ Armored Swordsman
+ Thōrakitēs
+ Thōrakitai were soldiers similar to Thyreophóroi. The literal translation of the term is curassiers, which suggests that they may have worn a short Celtic mail shirt or possibly a thorax. Thorakitai were used in armies of the Hellenistic Period in a variety of tactical situations. They were a type of armored but mobile infantry who did not require a rigid formation to be effective in combat. From their name we can deduce that most wore armor and helmet. They bore a thureos (or thyreos), an oblong shield, and were armed with sword, javelins and spear, which were used according to their tactical use. It seems that the thorakitai were heavily armored thureophoroi, able to bear spears and do battle in a phalanx as well as irregularly attack the enemy in situations when such an action was required for tactical reasons, like to exploit or challenge rough terrain. Thorakitai are mentioned in the army of the Achaian League and in the army of the Seleucids. The Seleucid Thorakitai were used in the storming of the Elburz Range in 210 BC under Antiochus III. They were used with the lighter troops to climb the cliffs and fight hand to hand with the enemy who might have not been dislodged by the lighter troops in the assault. There is a tomb illustration from Sidon showing what could well be a thorakites. The fragmentary inscription indicates that he was an Anatolian.
+ units/mace_thorakites.png
+ phase_city
+ Mercenary
+
+
+ units/macedonians/thorakites.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
new file mode 100644
index 0000000000..dc996a8c72
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -0,0 +1,22 @@
+
+
+
+
+ 0
+ 2
+
+
+
+ gaia
+ greek
+ Heavy Skirmisher
+ Thyreophóros
+ Thyreophóroi were a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a link between the heavier pikemen and the cavalry wings.
+ units/mace_thureophoros.png
+ phase_city
+ Mercenary
+
+
+ units/macedonians/thureophoros.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/spart_black_cloak.xml
new file mode 100644
index 0000000000..9749fe0c53
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/spart_black_cloak.xml
@@ -0,0 +1,6 @@
+
+
+
+ spart
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/spart_thorakites.xml
new file mode 100644
index 0000000000..44a52cf75c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/spart_thorakites.xml
@@ -0,0 +1,6 @@
+
+
+
+ spart
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/spart_thureophoros.xml
new file mode 100644
index 0000000000..5f37836ed7
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/spart_thureophoros.xml
@@ -0,0 +1,6 @@
+
+
+
+ spart
+
+