Index: binaries/data/mods/public/maps/random/hellas_biomes.json
===================================================================
--- binaries/data/mods/public/maps/random/hellas_biomes.json
+++ binaries/data/mods/public/maps/random/hellas_biomes.json
@@ -97,7 +97,7 @@
 			},
 			"athen": {
 				"columns": "gaia/ruins/column_doric",
-				"stoa": "other/hellenic_stoa"
+				"stoa": "structures/mace_stoa"
 			}
 		},
 		"actors":
Index: binaries/data/mods/public/maps/scenarios/arcadia.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/arcadia.xml
+++ binaries/data/mods/public/maps/scenarios/arcadia.xml
@@ -12529,7 +12529,7 @@
 			<Orientation y="2.29662"/>
 		</Entity>
 		<Entity uid="2718">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="630.23548" z="658.82721"/>
 			<Orientation y="-2.41614"/>
Index: binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
+++ binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
@@ -17936,61 +17936,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3871">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="747.93073" z="682.39307"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3872">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="746.77955" z="680.90223"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3873">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="745.50208" z="679.02662"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3874">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="744.16419" z="677.58667"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3875">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="742.4209" z="675.64173"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3876">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="740.69599" z="677.54206"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3877">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="741.97187" z="679.41694"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3878">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="742.87604" z="681.33252"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3879">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="743.98285" z="682.39307"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3880">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="745.16816" z="684.37494"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/laconia.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/laconia.xml
+++ binaries/data/mods/public/maps/scenarios/laconia.xml
@@ -5391,13 +5391,13 @@
 			<Orientation y="-1.59246"/>
 		</Entity>
 		<Entity uid="911">
-			<Template>structures/spart_royal_stoa</Template>
+			<Template>structures/spart_stoa</Template>
 			<Player>1</Player>
 			<Position x="418.41721" z="178.99701"/>
 			<Orientation y="0.79418"/>
 		</Entity>
 		<Entity uid="913">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="457.23688" z="254.65085"/>
 			<Orientation y="-2.32995"/>
Index: binaries/data/mods/public/maps/scenarios/miletus.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/miletus.xml
+++ binaries/data/mods/public/maps/scenarios/miletus.xml
@@ -93,13 +93,13 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="13">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="249.42031" z="219.11031"/>
 			<Orientation y="-0.79975"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="244.84145" z="270.95362"/>
 			<Orientation y="-2.32988"/>
@@ -1816,25 +1816,25 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="361">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>1</Player>
 			<Position x="305.39911" z="353.96195"/>
 			<Orientation y="0.78559"/>
 		</Entity>
 		<Entity uid="362">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>1</Player>
 			<Position x="327.86326" z="330.16218"/>
 			<Orientation y="0.78383"/>
 		</Entity>
 		<Entity uid="363">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="291.5966" z="384.29517"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="364">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="314.94446" z="406.20496"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/necropolis.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/necropolis.xml
+++ binaries/data/mods/public/maps/scenarios/necropolis.xml
@@ -118,13 +118,13 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="12">
-			<Template>structures/spart_royal_stoa</Template>
+			<Template>structures/spart_stoa</Template>
 			<Player>1</Player>
 			<Position x="514.85865" z="508.24616"/>
 			<Orientation y="-2.33716"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="478.40418" z="520.79078"/>
 			<Orientation y="2.34508"/>
@@ -1048,13 +1048,13 @@
 			<Orientation y="1.4056"/>
 		</Entity>
 		<Entity uid="226">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="470.29954" z="428.86518"/>
 			<Orientation y="0.78428"/>
 		</Entity>
 		<Entity uid="227">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="544.04932" z="461.02265"/>
 			<Orientation y="-0.76082"/>
@@ -5470,25 +5470,25 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1099">
-			<Template>structures/mace_royal_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>3</Player>
 			<Position x="507.13468" z="1542.37989"/>
 			<Orientation y="-0.78142"/>
 		</Entity>
 		<Entity uid="1100">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>3</Player>
 			<Position x="451.36902" z="1553.31641"/>
 			<Orientation y="2.36097"/>
 		</Entity>
 		<Entity uid="1102">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>3</Player>
 			<Position x="484.41083" z="1513.61817"/>
 			<Orientation y="-0.78397"/>
 		</Entity>
 		<Entity uid="1103">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>3</Player>
 			<Position x="459.08002" z="1489.27308"/>
 			<Orientation y="-0.76767"/>
@@ -12700,49 +12700,49 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2398">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>4</Player>
 			<Position x="1534.33118" z="500.67554"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2399">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>4</Player>
 			<Position x="1508.81434" z="429.74201"/>
 			<Orientation y="0.79824"/>
 		</Entity>
 		<Entity uid="2400">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>4</Player>
 			<Position x="1540.98768" z="425.18693"/>
 			<Orientation y="-0.78187"/>
 		</Entity>
 		<Entity uid="2401">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>4</Player>
 			<Position x="1535.94446" z="459.03196"/>
 			<Orientation y="-2.35386"/>
 		</Entity>
 		<Entity uid="2405">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>2</Player>
 			<Position x="1592.44434" z="1541.48572"/>
 			<Orientation y="-0.84705"/>
 		</Entity>
 		<Entity uid="2406">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>2</Player>
 			<Position x="1498.01441" z="1524.70105"/>
 			<Orientation y="0.78443"/>
 		</Entity>
 		<Entity uid="2407">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>2</Player>
 			<Position x="1517.06739" z="1505.91944"/>
 			<Orientation y="0.78875"/>
 		</Entity>
 		<Entity uid="2408">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>2</Player>
 			<Position x="1601.30823" z="1571.34302"/>
 			<Orientation y="-2.42554"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
@@ -283,13 +283,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="69">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="534.10535" z="1400.44654"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="70">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>1</Player>
 			<Position x="641.53815" z="1421.58936"/>
 			<Orientation y="-2.28205"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
@@ -5483,7 +5483,7 @@
 			<Orientation y="-2.16683"/>
 		</Entity>
 		<Entity uid="1051">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>2</Player>
 			<Position x="687.00483" z="408.56122"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -4906,14 +4906,14 @@
 			<Actor seed="60134"/>
 		</Entity>
 		<Entity uid="951">
-			<Template>structures/mace_royal_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="644.79651" z="1427.00306"/>
 			<Orientation y="-2.3141"/>
 			<Actor seed="20852"/>
 		</Entity>
 		<Entity uid="952">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="556.50196" z="1409.85401"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
@@ -121,13 +121,13 @@
 			<Orientation y="-2.32274"/>
 		</Entity>
 		<Entity uid="69">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="534.10535" z="1400.44654"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="70">
-			<Template>structures/spart_royal_stoa</Template>
+			<Template>structures/spart_stoa</Template>
 			<Player>1</Player>
 			<Position x="641.53815" z="1421.58936"/>
 			<Orientation y="-2.28205"/>
Index: binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
+++ binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
@@ -2394,7 +2394,7 @@
 			<Orientation y="-2.05591"/>
 		</Entity>
 		<Entity uid="561">
-			<Template>other/hellenic_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>2</Player>
 			<Position x="545.85541" z="158.94117"/>
 			<Orientation y="0.80655"/>
@@ -15819,7 +15819,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3217">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>2</Player>
 			<Position x="566.02161" z="206.80237"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml
+++ binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml
@@ -1284,121 +1284,121 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="258">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="271.44001" z="366.73215"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="259">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="273.51386" z="365.29743"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="260">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="272.06095" z="362.66993"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="261">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="270.36957" z="364.12067"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="262">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="268.75092" z="362.56824"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="263">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="270.82902" z="360.58689"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="264">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="269.61979" z="358.7923"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="265">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="267.741" z="360.20218"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="266">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="266.33857" z="358.42481"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="267">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>3</Player>
 			<Position x="269.00544" z="356.72593"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="268">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="287.58564" z="380.42072"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="269">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="288.86341" z="381.62418"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="270">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="289.8505" z="383.10331"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="271">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="291.37983" z="384.49692"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="272">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="292.92133" z="385.95386"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="273">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="291.1118" z="387.56537"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="274">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="289.12861" z="386.37043"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="275">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="288.09067" z="385.13639"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="276">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="286.42484" z="383.79245"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="277">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>3</Player>
 			<Position x="285.1778" z="382.57755"/>
 			<Orientation y="2.35621"/>
@@ -1428,121 +1428,121 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="282">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="768.01758" z="295.31275"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="283">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="769.05195" z="296.85492"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="284">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="769.99744" z="298.36017"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="285">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="771.23322" z="299.76825"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="286">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="772.43262" z="301.98697"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="287">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="769.93757" z="294.1937"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="288">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="770.87494" z="295.76273"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="289">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="771.65656" z="297.10026"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="290">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="772.66419" z="298.40848"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="291">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>2</Player>
 			<Position x="774.01221" z="300.20798"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="292">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="765.81513" z="285.94352"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="293">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="766.88538" z="287.54905"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="294">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="768.0746" z="289.21549"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="295">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="768.70899" z="290.52771"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="296">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="769.51197" z="292.06916"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="297">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="767.57172" z="293.12412"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="298">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="766.59711" z="291.83783"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="299">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="765.75904" z="290.44132"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="300">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="765.00849" z="289.06269"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="301">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>2</Player>
 			<Position x="763.80695" z="287.57538"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/walls.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/walls.xml
+++ binaries/data/mods/public/maps/scenarios/walls.xml
@@ -6344,7 +6344,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1126">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>2</Player>
 			<Position x="332.96622" z="236.74888"/>
 			<Orientation y="-0.78367"/>
Index: binaries/data/mods/public/maps/scenarios/we_are_legion.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/we_are_legion.xml
+++ binaries/data/mods/public/maps/scenarios/we_are_legion.xml
@@ -257,433 +257,433 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="194">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="458.28513" z="203.27497"/>
 			<Orientation y="-0.95234"/>
 		</Entity>
 		<Entity uid="195">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="459.79493" z="204.60972"/>
 			<Orientation y="-0.6386"/>
 		</Entity>
 		<Entity uid="196">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="461.19282" z="205.89283"/>
 			<Orientation y="-0.73986"/>
 		</Entity>
 		<Entity uid="197">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="462.53312" z="207.43717"/>
 			<Orientation y="-0.56952"/>
 		</Entity>
 		<Entity uid="198">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="464.07682" z="208.86214"/>
 			<Orientation y="-0.82451"/>
 		</Entity>
 		<Entity uid="199">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="456.85428" z="201.94928"/>
 			<Orientation y="-0.96621"/>
 		</Entity>
 		<Entity uid="200">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="458.43064" z="200.38895"/>
 			<Orientation y="-0.67325"/>
 		</Entity>
 		<Entity uid="201">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="459.76017" z="199.20899"/>
 			<Orientation y="-0.87146"/>
 		</Entity>
 		<Entity uid="202">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="465.64386" z="207.29183"/>
 			<Orientation y="-0.79053"/>
 		</Entity>
 		<Entity uid="203">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="467.07773" z="206.16411"/>
 			<Orientation y="-0.73746"/>
 		</Entity>
 		<Entity uid="204">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="468.3697" z="204.4853"/>
 			<Orientation y="-0.82738"/>
 		</Entity>
 		<Entity uid="205">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="469.63505" z="203.20104"/>
 			<Orientation y="-0.67072"/>
 		</Entity>
 		<Entity uid="206">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="471.2682" z="201.60718"/>
 			<Orientation y="-0.83198"/>
 		</Entity>
 		<Entity uid="207">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="463.98115" z="205.8115"/>
 			<Orientation y="-0.7607"/>
 		</Entity>
 		<Entity uid="208">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="465.27982" z="204.65111"/>
 			<Orientation y="-0.61661"/>
 		</Entity>
 		<Entity uid="209">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="466.94288" z="203.3262"/>
 			<Orientation y="-0.82796"/>
 		</Entity>
 		<Entity uid="210">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="468.24732" z="202.04647"/>
 			<Orientation y="-0.91964"/>
 		</Entity>
 		<Entity uid="211">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="469.71354" z="200.47844"/>
 			<Orientation y="-0.67225"/>
 		</Entity>
 		<Entity uid="212">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="462.69651" z="204.38639"/>
 			<Orientation y="-0.83455"/>
 		</Entity>
 		<Entity uid="213">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="464.0965" z="203.26352"/>
 			<Orientation y="-0.84168"/>
 		</Entity>
 		<Entity uid="214">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="465.44639" z="202.04647"/>
 			<Orientation y="-0.70704"/>
 		</Entity>
 		<Entity uid="215">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="466.93537" z="200.61625"/>
 			<Orientation y="-0.65375"/>
 		</Entity>
 		<Entity uid="216">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="468.27024" z="199.14902"/>
 			<Orientation y="-0.85288"/>
 		</Entity>
 		<Entity uid="217">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="461.24909" z="203.10764"/>
 			<Orientation y="-0.7016"/>
 		</Entity>
 		<Entity uid="218">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="462.5229" z="202.04647"/>
 			<Orientation y="-0.87273"/>
 		</Entity>
 		<Entity uid="219">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="463.86051" z="200.47844"/>
 			<Orientation y="-0.69214"/>
 		</Entity>
 		<Entity uid="220">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="465.28223" z="199.22637"/>
 			<Orientation y="-0.82012"/>
 		</Entity>
 		<Entity uid="221">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="466.72443" z="197.82993"/>
 			<Orientation y="-0.68354"/>
 		</Entity>
 		<Entity uid="222">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="459.93485" z="201.7526"/>
 			<Orientation y="-0.69487"/>
 		</Entity>
 		<Entity uid="223">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="461.27149" z="200.56101"/>
 			<Orientation y="-0.82009"/>
 		</Entity>
 		<Entity uid="224">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="462.77683" z="199.02076"/>
 			<Orientation y="-0.86184"/>
 		</Entity>
 		<Entity uid="225">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="464.12085" z="197.78185"/>
 			<Orientation y="-0.77518"/>
 		</Entity>
 		<Entity uid="226">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="465.37354" z="196.40516"/>
 			<Orientation y="-0.7622"/>
 		</Entity>
 		<Entity uid="227">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="461.1425" z="197.72477"/>
 			<Orientation y="-0.67235"/>
 		</Entity>
 		<Entity uid="228">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="462.56772" z="196.33176"/>
 			<Orientation y="-0.76684"/>
 		</Entity>
 		<Entity uid="229">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/merc_thureophoros</Template>
 			<Player>1</Player>
 			<Position x="463.99482" z="195.14939"/>
 			<Orientation y="-0.68624"/>
 		</Entity>
 		<Entity uid="230">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="497.77186" z="242.63483"/>
 			<Orientation y="-0.71828"/>
 		</Entity>
 		<Entity uid="231">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="499.44397" z="241.21015"/>
 			<Orientation y="-0.57369"/>
 		</Entity>
 		<Entity uid="232">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="500.76752" z="240.11797"/>
 			<Orientation y="-0.76092"/>
 		</Entity>
 		<Entity uid="233">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="502.27762" z="238.65262"/>
 			<Orientation y="-0.59543"/>
 		</Entity>
 		<Entity uid="234">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="503.75345" z="237.25564"/>
 			<Orientation y="-0.79589"/>
 		</Entity>
 		<Entity uid="235">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="496.40522" z="241.449"/>
 			<Orientation y="-0.89475"/>
 		</Entity>
 		<Entity uid="236">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="495.2689" z="240.11797"/>
 			<Orientation y="-0.96447"/>
 		</Entity>
 		<Entity uid="237">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="493.8076" z="238.86451"/>
 			<Orientation y="-0.99656"/>
 		</Entity>
 		<Entity uid="238">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="492.43241" z="237.31197"/>
 			<Orientation y="-0.60605"/>
 		</Entity>
 		<Entity uid="239">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="490.87507" z="235.89693"/>
 			<Orientation y="-0.78646"/>
 		</Entity>
 		<Entity uid="240">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="497.92426" z="239.80846"/>
 			<Orientation y="-0.74273"/>
 		</Entity>
 		<Entity uid="241">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="499.33136" z="238.69471"/>
 			<Orientation y="-0.84737"/>
 		</Entity>
 		<Entity uid="242">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="500.83042" z="237.28977"/>
 			<Orientation y="-0.69228"/>
 		</Entity>
 		<Entity uid="243">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="502.26053" z="236.03301"/>
 			<Orientation y="-0.6809"/>
 		</Entity>
 		<Entity uid="244">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="496.7906" z="238.40661"/>
 			<Orientation y="-0.67606"/>
 		</Entity>
 		<Entity uid="245">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="497.97464" z="237.18789"/>
 			<Orientation y="-0.73378"/>
 		</Entity>
 		<Entity uid="246">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="499.34421" z="235.87295"/>
 			<Orientation y="-0.64982"/>
 		</Entity>
 		<Entity uid="247">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="500.80253" z="234.57412"/>
 			<Orientation y="-0.73957"/>
 		</Entity>
 		<Entity uid="248">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="495.05781" z="236.95197"/>
 			<Orientation y="-0.72434"/>
 		</Entity>
 		<Entity uid="249">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="496.49228" z="235.80925"/>
 			<Orientation y="-0.7195"/>
 		</Entity>
 		<Entity uid="250">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="497.98011" z="234.5741"/>
 			<Orientation y="-0.53003"/>
 		</Entity>
 		<Entity uid="251">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="499.26951" z="233.07136"/>
 			<Orientation y="-0.63877"/>
 		</Entity>
 		<Entity uid="252">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="493.76221" z="235.80925"/>
 			<Orientation y="-0.71755"/>
 		</Entity>
 		<Entity uid="253">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="495.07682" z="234.42472"/>
 			<Orientation y="-0.82045"/>
 		</Entity>
 		<Entity uid="254">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="496.53702" z="233.12714"/>
 			<Orientation y="-0.6079"/>
 		</Entity>
 		<Entity uid="255">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="497.95417" z="231.64779"/>
 			<Orientation y="-0.6076"/>
 		</Entity>
 		<Entity uid="256">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="492.25019" z="234.42472"/>
 			<Orientation y="-0.5077"/>
 		</Entity>
 		<Entity uid="257">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="493.57731" z="232.98798"/>
 			<Orientation y="-0.64225"/>
 		</Entity>
 		<Entity uid="258">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="495.09736" z="231.69965"/>
 			<Orientation y="-0.41665"/>
 		</Entity>
 		<Entity uid="259">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="496.57776" z="230.32212"/>
 			<Orientation y="-0.59893"/>
 		</Entity>
 		<Entity uid="260">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="498.0493" z="228.79319"/>
 			<Orientation y="-0.73491"/>
 		</Entity>
 		<Entity uid="261">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="499.68928" z="229.80164"/>
 			<Orientation y="-0.62381"/>
 		</Entity>
 		<Entity uid="262">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="500.83832" z="231.30158"/>
 			<Orientation y="-0.66208"/>
 		</Entity>
 		<Entity uid="263">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="502.34125" z="232.71076"/>
 			<Orientation y="-0.7395"/>
 		</Entity>
 		<Entity uid="264">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="503.74711" z="233.92833"/>
 			<Orientation y="-0.60355"/>
 		</Entity>
 		<Entity uid="265">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="505.01401" z="235.59617"/>
 			<Orientation y="-0.67551"/>
@@ -1529,181 +1529,181 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="415">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="450.88123" z="196.48415"/>
 			<Orientation y="-0.6593"/>
 		</Entity>
 		<Entity uid="416">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="452.22443" z="194.46711"/>
 			<Orientation y="-0.6275"/>
 		</Entity>
 		<Entity uid="417">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="453.39271" z="192.52318"/>
 			<Orientation y="-0.5171"/>
 		</Entity>
 		<Entity uid="418">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="454.38617" z="190.60662"/>
 			<Orientation y="-0.64559"/>
 		</Entity>
 		<Entity uid="419">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="455.24515" z="188.53315"/>
 			<Orientation y="-0.75457"/>
 		</Entity>
 		<Entity uid="420">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="449.16932" z="195.21796"/>
 			<Orientation y="-0.38596"/>
 		</Entity>
 		<Entity uid="421">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="447.16294" z="194.5018"/>
 			<Orientation y="-0.49175"/>
 		</Entity>
 		<Entity uid="422">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="445.55011" z="193.47995"/>
 			<Orientation y="-0.48934"/>
 		</Entity>
 		<Entity uid="423">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="443.97416" z="192.41663"/>
 			<Orientation y="-0.50716"/>
 		</Entity>
 		<Entity uid="424">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="449.93107" z="193.53489"/>
 			<Orientation y="-0.30036"/>
 		</Entity>
 		<Entity uid="425">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="451.37525" z="191.60294"/>
 			<Orientation y="-0.48234"/>
 		</Entity>
 		<Entity uid="426">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="452.24778" z="189.53975"/>
 			<Orientation y="-0.29357"/>
 		</Entity>
 		<Entity uid="427">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="453.2089" z="187.68322"/>
 			<Orientation y="-0.34061"/>
 		</Entity>
 		<Entity uid="428">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="442.0131" z="191.71515"/>
 			<Orientation y="-0.8064"/>
 		</Entity>
 		<Entity uid="429">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="447.86365" z="192.86869"/>
 			<Orientation y="-0.22713"/>
 		</Entity>
 		<Entity uid="430">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="446.2115" z="191.9572"/>
 			<Orientation y="-0.14876"/>
 		</Entity>
 		<Entity uid="431">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="444.72092" z="191.12934"/>
 			<Orientation y="-0.19945"/>
 		</Entity>
 		<Entity uid="432">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="442.79395" z="190.07615"/>
 			<Orientation y="-0.6714"/>
 		</Entity>
 		<Entity uid="433">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="449.25977" z="191.17536"/>
 			<Orientation y="-0.63512"/>
 		</Entity>
 		<Entity uid="434">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="450.07547" z="189.28385"/>
 			<Orientation y="-0.29363"/>
 		</Entity>
 		<Entity uid="435">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="450.9633" z="187.41352"/>
 			<Orientation y="-0.53144"/>
 		</Entity>
 		<Entity uid="436">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="447.28562" z="190.41684"/>
 			<Orientation y="-0.5656"/>
 		</Entity>
 		<Entity uid="437">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="448.50156" z="188.62485"/>
 			<Orientation y="-0.67788"/>
 		</Entity>
 		<Entity uid="438">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="449.30332" z="186.62067"/>
 			<Orientation y="-0.21531"/>
 		</Entity>
 		<Entity uid="439">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="445.62098" z="189.66225"/>
 			<Orientation y="-0.49056"/>
 		</Entity>
 		<Entity uid="440">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="446.5767" z="188.04287"/>
 			<Orientation y="-0.29719"/>
 		</Entity>
 		<Entity uid="441">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="447.46058" z="185.85254"/>
 			<Orientation y="-0.5674"/>
 		</Entity>
 		<Entity uid="442">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="443.81974" z="188.78452"/>
 			<Orientation y="-0.39396"/>
 		</Entity>
 		<Entity uid="443">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="444.77622" z="186.8273"/>
 			<Orientation y="-0.37218"/>
 		</Entity>
 		<Entity uid="444">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/merc_thorakites</Template>
 			<Player>1</Player>
 			<Position x="445.75712" z="185.22748"/>
 			<Orientation y="-0.36638"/>
Index: binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -31952,7 +31952,7 @@
 			<Actor seed="14846"/>
 		</Entity>
 		<Entity uid="7421">
-			<Template>structures/athen_royal_stoa</Template>
+			<Template>structures/athen_stoa</Template>
 			<Player>6</Player>
 			<Position x="356.43989" z="1319.06214"/>
 			<Orientation y="5.47608"/>
@@ -35300,7 +35300,7 @@
 			<Actor seed="59430"/>
 		</Entity>
 		<Entity uid="8229">
-			<Template>structures/mace_royal_stoa</Template>
+			<Template>structures/mace_stoa</Template>
 			<Player>1</Player>
 			<Position x="773.51978" z="1594.47242"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
+++ binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <BuildRestrictions>
-    <Category>Stoa</Category>
-  </BuildRestrictions>
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>110</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>100</stone>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="28" depth="12.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1100</Max>
-  </Health>
-  <Identity>
-    <GenericName>Stoa</GenericName>
-    <SpecificName>Hellenic Stoa</SpecificName>
-    <Icon>gaia/special_stoa.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="26.0" depth="10.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <RallyPoint disable=""/>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>36</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>special/greek_stoa.xml</Actor>
-    <FoundationActor>structures/fndn_6x4.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_stoa">
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Stoa</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>special/greek_stoa_great.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/athen_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_stoa.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_stoa">
+  <Footprint>
+    <Square width="29" depth="21.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
+  </Health>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Stoa</SpecificName>
   </Identity>
+  <Obstruction>
+    <Static width="28.0" depth="20.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>special/greek_stoa_great.xml</Actor>
+    <FoundationActor>structures/fndn_8x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -14,6 +14,7 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_a
+      units/{civ}_champion_infantry_swordsman
       units/{civ}_champion_cavalry
       units/{civ}_hero_philip
       units/{civ}_hero_alexander
Index: binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_stoa">
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Stoa</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>special/greek_stoa_great.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_stoa.xml
@@ -1,49 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <BuildRestrictions>
-    <Category>Stoa</Category>
-  </BuildRestrictions>
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>110</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>100</stone>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
+<Entity parent="template_structure_civic_stoa">
   <Footprint>
     <Square width="28" depth="12.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Health>
-    <Max>1100</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <GenericName>Stoa</GenericName>
-    <SpecificName>Hellenic Stoa</SpecificName>
-    <Icon>gaia/special_stoa.png</Icon>
+    <Civ>mace</Civ>
+    <SpecificName>Stoa</SpecificName>
   </Identity>
-  <Loot>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
   <Obstruction>
     <Static width="26.0" depth="10.5"/>
   </Obstruction>
-  <ProductionQueue disable=""/>
-  <RallyPoint disable=""/>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>36</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
   <VisualActor>
     <Actor>special/greek_stoa.xml</Actor>
-    <FoundationActor>structures/fndn_6x4.xml</FoundationActor>
+    <FoundationActor>structures/fndn_6x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_stoa">
-  <Footprint>
-    <Square width="27.0" depth="24.5"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>spart</Civ>
-    <SpecificName>Stoa</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="26.0" depth="23.5"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/spartans/stoa.xml</Actor>
-    <FoundationActor>structures/fndn_8x7.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -4,17 +4,12 @@
     <Category>Stoa</Category>
   </BuildRestrictions>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>150</BuildTime>
     <Resources>
       <stone>100</stone>
       <metal>150</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Square width="29" depth="21.0"/>
-    <Height>10.0</Height>
-  </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <EjectHealth>0.1</EjectHealth>
@@ -25,31 +20,18 @@
   </GarrisonHolder>
   <Health>
     <Max>2500</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Stoa</GenericName>
     <SelectionGroupName>template_structure_civic_stoa</SelectionGroupName>
-    <Tooltip>Recruit special units.</Tooltip>
+    <VisibleClasses datatype="tokens">Town</VisibleClasses>
     <Icon>gaia/special_stoa.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Town</VisibleClasses>
   </Identity>
   <Loot>
     <stone>20</stone>
     <metal>30</metal>
   </Loot>
-  <Obstruction>
-    <Static width="28.0" depth="20.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_black_cloak
-      units/{civ}_thureophoros
-      units/{civ}_thorakites
-    </Entities>
-  </ProductionQueue>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
@@ -58,7 +40,4 @@
   <Vision>
     <Range>40</Range>
   </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_8x4.xml</FoundationActor>
-  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -45,7 +45,7 @@
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
       units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_maiden_barracks
+      units/{civ}_champion_infantry_swordsman_barracks
       units/{civ}_champion_cavalry_barracks
       units/{civ}_champion_chariot_barracks
       units/{civ}_war_dog_b
Index: binaries/data/mods/public/simulation/templates/units/athen_black_cloak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_black_cloak.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_black_cloak">
-  <Identity>
-    <Civ>athen</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
@@ -6,7 +6,6 @@
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
-      structures/athen_royal_stoa
     </Entities>
   </Builder>
   <Cost>
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
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
@@ -6,7 +6,6 @@
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
-      structures/athen_royal_stoa
     </Entities>
   </Builder>
   <Cost>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
@@ -6,7 +6,6 @@
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
-      structures/athen_royal_stoa
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
@@ -6,7 +6,6 @@
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
-      structures/athen_royal_stoa
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen_thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_thureophoros.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>athen</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>mace</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Thracian Black Cloak</GenericName>
+    <SpecificName>Rhomphaiaphoros</SpecificName>
+    <Icon>units/sele_infantry_swordsman.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_champion_infantry_swordsman">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thorakites">
-  <Identity>
-    <Civ>mace</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>mace</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/maur_champion_maiden">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -8,12 +8,11 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiaphoros</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -18,12 +18,11 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_thorakites.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thorakites.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -7,12 +7,11 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
-    <SpecificName>Thyreophóros</SpecificName>
+    <SpecificName>Thyreophoros</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_thureophoros.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_c_thureophoros.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/spart_black_cloak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_black_cloak.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_black_cloak">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/spart_syssiton
       structures/spart_theater
-      structures/spart_royal_stoa
       -structures/{civ}_wallset_stone
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/spart_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_infantry_javelinist_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/spart_syssiton
       structures/spart_theater
-      structures/spart_royal_stoa
       -structures/{civ}_wallset_stone
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/spart_syssiton
       structures/spart_theater
-      structures/spart_royal_stoa
       -structures/{civ}_wallset_stone
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/spart_thorakites.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_thorakites.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thorakites">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_thureophoros.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>