Index: binaries/data/mods/public/maps/random/caledonian_meadows.js
===================================================================
--- binaries/data/mods/public/maps/random/caledonian_meadows.js
+++ binaries/data/mods/public/maps/random/caledonian_meadows.js
@@ -121,7 +121,7 @@
 function placeCamp(point,
 	centerEntity = "actor|props/special/eyecandy/campfire.xml",
 	otherEntities = ["gaia/special_treasure_metal", "gaia/special_treasure_standing_stone",
-		"units/brit_infantry_slinger_b", "units/brit_infantry_javelinist_b", "units/gaul_infantry_slinger_b", "units/gaul_infantry_javelinist_b", "units/gaul_champion_fanatic",
+		"units/brit_infantry_slinger_b", "units/brit_infantry_javelinist_b", "units/gaul_infantry_slinger_b", "units/gaul_infantry_javelinist_b", "units/gaul_champion_spear_infantry",
 		"actor|props/special/common/waypoint_flag.xml", "actor|props/special/eyecandy/barrel_a.xml", "actor|props/special/eyecandy/basket_celt_a.xml", "actor|props/special/eyecandy/crate_a.xml", "actor|props/special/eyecandy/dummy_a.xml", "actor|props/special/eyecandy/handcart_1.xml", "actor|props/special/eyecandy/handcart_1_broken.xml", "actor|props/special/eyecandy/sack_1.xml", "actor|props/special/eyecandy/sack_1_rough.xml"
 	]
 )
Index: binaries/data/mods/public/maps/random/danubius.js
===================================================================
--- binaries/data/mods/public/maps/random/danubius.js
+++ binaries/data/mods/public/maps/random/danubius.js
@@ -69,7 +69,7 @@
 const oFemale = "units/gaul_support_female_citizen";
 const oHealer = "units/gaul_support_healer_b";
 const oSkirmisher = "units/gaul_infantry_javelinist_b";
-const oNakedFanatic = "units/gaul_champion_fanatic";
+const oNakedFanatic = "units/gaul_champion_spear_infantry";
 
 // Decorative props
 const aBush1 = "actor|props/flora/bush_tempe_sm.xml";
Index: binaries/data/mods/public/maps/random/danubius_triggers.js
===================================================================
--- binaries/data/mods/public/maps/random/danubius_triggers.js
+++ binaries/data/mods/public/maps/random/danubius_triggers.js
@@ -38,12 +38,12 @@
 var citizenTemplates = [...citizenInfantryTemplates, ...citizenCavalryTemplates];
 
 var championInfantryTemplates = [
-	"gaul_champion_fanatic",
-	"gaul_champion_infantry"
+	"gaul_champion_spear_infantry",
+	"gaul_champion_sword_infantry"
 ];
 
 var championCavalryTemplates = [
-	"gaul_champion_cavalry"
+	"gaul_champion_spear_cavalry"
 ];
 
 var championTemplates = [...championInfantryTemplates, ...championCavalryTemplates];
Index: binaries/data/mods/public/maps/random/wild_lake.js
===================================================================
--- binaries/data/mods/public/maps/random/wild_lake.js
+++ binaries/data/mods/public/maps/random/wild_lake.js
@@ -148,56 +148,56 @@
 		{ "Template" : "units/mace_infantry_javelinist_b", "Count" : 4 },
 		{ "Template" : "units/mace_cavalry_spearman_e", "Count" : 3 },
 		{ "Template" : "units/mace_infantry_archer_a", "Count" : 4 },
-		{ "Template" : "units/mace_champion_infantry_a", "Count" : 3 }
+		{ "Template" : "units/mace_champion_hoplite_infantry", "Count" : 3 }
 	],
 	"snowy": [
 		{ "Template" : "structures/ptol_mercenary_camp" },
 		{ "Template" : "units/brit_infantry_javelinist_b", "Count" : 4 },
 		{ "Template" : "units/brit_cavalry_swordsman_e", "Count" : 3 },
 		{ "Template" : "units/brit_infantry_slinger_a", "Count" : 4 },
-		{ "Template" : "units/brit_champion_infantry", "Count" : 3 }
+		{ "Template" : "units/brit_champion_sword_infantry", "Count" : 3 }
 	],
 	"desert": [
 		{ "Template" : "structures/ptol_mercenary_camp" },
 		{ "Template" : "units/pers_infantry_javelinist_b", "Count" : 4 },
 		{ "Template" : "units/pers_cavalry_swordsman_e", "Count" : 3 },
 		{ "Template" : "units/pers_infantry_archer_a", "Count" : 4 },
-		{ "Template" : "units/pers_champion_infantry", "Count" : 3 }
+		{ "Template" : "units/pers_champion_spear_infantry", "Count" : 3 }
 	],
 	"alpine": [
 		{ "Template" : "structures/ptol_mercenary_camp" },
 		{ "Template" : "units/rome_infantry_swordsman_b", "Count" : 4 },
 		{ "Template" : "units/rome_cavalry_spearman_e", "Count" : 3 },
 		{ "Template" : "units/rome_infantry_javelinist_a", "Count" : 4 },
-		{ "Template" : "units/rome_champion_infantry", "Count" : 3 }
+		{ "Template" : "units/rome_champion_sword_infantry", "Count" : 3 }
 	],
 	"mediterranean": [
 		{ "Template" : "structures/merc_camp_egyptian" },
 		{ "Template" : "units/iber_infantry_javelinist_b", "Count" : 4 },
 		{ "Template" : "units/iber_cavalry_spearman_e", "Count" : 3 },
 		{ "Template" : "units/iber_infantry_slinger_a", "Count" : 4 },
-		{ "Template" : "units/iber_champion_infantry", "Count" : 3 }
+		{ "Template" : "units/iber_champion_sword_infantry", "Count" : 3 }
 	],
 	"savanna": [
 		{ "Template" : "structures/merc_camp_egyptian" },
 		{ "Template" : "units/sele_infantry_javelinist_b", "Count" : 4 },
 		{ "Template" : "units/sele_cavalry_spearman_merc_e", "Count" : 3 },
 		{ "Template" : "units/sele_infantry_spearman_a", "Count" : 4 },
-		{ "Template" : "units/sele_champion_infantry_swordsman", "Count" : 3 }
+		{ "Template" : "units/sele_champion_sword_infantry", "Count" : 3 }
 	],
 	"tropic": [
 		{ "Template" : "structures/merc_camp_egyptian" },
 		{ "Template" : "units/ptol_infantry_javelinist_b", "Count" : 4 },
 		{ "Template" : "units/ptol_cavalry_archer_e", "Count" : 3 },
 		{ "Template" : "units/ptol_infantry_slinger_a", "Count" : 4 },
-		{ "Template" : "units/ptol_champion_infantry_pikeman", "Count" : 3 }
+		{ "Template" : "units/ptol_champion_pike_infantry", "Count" : 3 }
 	],
 	"autumn": [
 		{ "Template" : "structures/ptol_mercenary_camp" },
 		{ "Template" : "units/gaul_infantry_javelinist_b", "Count" : 4 },
 		{ "Template" : "units/gaul_cavalry_swordsman_e", "Count" : 3 },
 		{ "Template" : "units/gaul_infantry_slinger_a", "Count" : 4 },
-		{ "Template" : "units/gaul_champion_infantry", "Count" : 3 }
+		{ "Template" : "units/gaul_champion_sword_infantry", "Count" : 3 }
 	]
 };
 
@@ -299,7 +299,7 @@
 function placeCamp(point,
 	centerEntity = "actor|props/special/eyecandy/campfire.xml",
 	otherEntities = ["gaia/special_treasure_metal", "gaia/special_treasure_standing_stone",
-		"units/brit_infantry_slinger_b", "units/brit_infantry_javelinist_b", "units/gaul_infantry_slinger_b", "units/gaul_infantry_javelinist_b", "units/gaul_champion_fanatic",
+		"units/brit_infantry_slinger_b", "units/brit_infantry_javelinist_b", "units/gaul_infantry_slinger_b", "units/gaul_infantry_javelinist_b", "units/gaul_champion_spear_infantry",
 		"actor|props/special/common/waypoint_flag.xml", "actor|props/special/eyecandy/barrel_a.xml", "actor|props/special/eyecandy/basket_celt_a.xml", "actor|props/special/eyecandy/crate_a.xml", "actor|props/special/eyecandy/dummy_a.xml", "actor|props/special/eyecandy/handcart_1.xml", "actor|props/special/eyecandy/handcart_1_broken.xml", "actor|props/special/eyecandy/sack_1.xml", "actor|props/special/eyecandy/sack_1_rough.xml"
 	]
 )
Index: binaries/data/mods/public/maps/scenarios/Battle for the Tiber.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Battle for the Tiber.xml
+++ binaries/data/mods/public/maps/scenarios/Battle for the Tiber.xml
@@ -39079,145 +39079,145 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8814">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1542.75" z="1518.28382"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8815">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1544.6355" z="1521.31104"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8816">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1546.41395" z="1522.87696"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8817">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1548.27576" z="1526.12391"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8818">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1549.75977" z="1528.56995"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8819">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1551.49952" z="1530.90748"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8820">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1546.19361" z="1516.349"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8821">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1547.58765" z="1517.14966"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8822">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1548.8639" z="1519.44678"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8823">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1550.0011" z="1521.82886"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8824">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1551.09095" z="1523.9419"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8825">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="1552.59925" z="1527.24207"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8838">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="473.83564" z="460.54914"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8839">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="474.73554" z="461.83701"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8840">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="476.2417" z="464.38431"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8841">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="477.46988" z="466.32837"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8842">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="479.08143" z="468.59907"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8843">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="481.12748" z="471.0218"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8844">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="477.55283" z="459.22773"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8845">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="478.4987" z="460.54914"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8846">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="479.71564" z="462.3667"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8847">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="481.06464" z="464.47895"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8848">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="482.49662" z="466.52891"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="8849">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="484.07517" z="468.59907"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml
+++ binaries/data/mods/public/maps/scenarios/Belgian_Bog_night.xml
@@ -4809,121 +4809,121 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="943">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="891.3512" z="477.25403"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="944">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="893.75513" z="478.57288"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="945">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="895.9358" z="480.31891"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="946">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="898.0572" z="482.52918"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="947">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="900.37171" z="484.93088"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="948">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="902.54163" z="480.78547"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="949">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="899.55042" z="478.83494"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="950">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="897.45002" z="476.47916"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="951">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="894.88471" z="474.66694"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="952">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="891.7876" z="472.05222"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="953">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="166.96209" z="506.05958"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="954">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="164.77549" z="503.8675"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="955">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="162.24985" z="501.12165"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="956">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="159.1703" z="498.899"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="957">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="157.67849" z="497.15488"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="958">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="160.72825" z="492.76835"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="959">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="162.58904" z="494.56727"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="960">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="164.87456" z="496.9769"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="961">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="167.07685" z="499.8993"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="962">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="169.49947" z="502.60981"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Bridge_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Bridge_demo.xml
+++ binaries/data/mods/public/maps/scenarios/Bridge_demo.xml
@@ -22257,7 +22257,7 @@
 			<Orientation y="-1.82261"/>
 		</Entity>
 		<Entity uid="4765">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>1</Player>
 			<Position x="532.72901" z="466.09537"/>
 			<Orientation y="-1.57486"/>
Index: binaries/data/mods/public/maps/scenarios/Cinema_Demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Cinema_Demo.xml
+++ binaries/data/mods/public/maps/scenarios/Cinema_Demo.xml
@@ -10965,266 +10965,266 @@
 			<Actor seed="47806"/>
 		</Entity>
 		<Entity uid="2144">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="619.4756" z="178.36216"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16760"/>
 		</Entity>
 		<Entity uid="2145">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="623.0138" z="181.45899"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38442"/>
 		</Entity>
 		<Entity uid="2146">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="627.22645" z="184.91184"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="50498"/>
 		</Entity>
 		<Entity uid="2147">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="631.68122" z="188.2186"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40784"/>
 		</Entity>
 		<Entity uid="2148">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="635.94233" z="190.46393"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36482"/>
 		</Entity>
 		<Entity uid="2149">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="639.11335" z="193.15391"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="44716"/>
 		</Entity>
 		<Entity uid="2150">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="542.16651" z="307.9141"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="54098"/>
 		</Entity>
 		<Entity uid="2151">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="540.13337" z="306.4579"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="27360"/>
 		</Entity>
 		<Entity uid="2152">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="538.15241" z="305.16272"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="21776"/>
 		</Entity>
 		<Entity uid="2153">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="536.32044" z="303.96888"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="49094"/>
 		</Entity>
 		<Entity uid="2154">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="534.58039" z="302.48954"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="53296"/>
 		</Entity>
 		<Entity uid="2155">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="532.48597" z="301.03385"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="51256"/>
 		</Entity>
 		<Entity uid="2156">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="530.60853" z="299.60871"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="37808"/>
 		</Entity>
 		<Entity uid="2157">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="528.56336" z="298.03183"/>
 			<Orientation y="-0.97587"/>
 			<Actor seed="2160"/>
 		</Entity>
 		<Entity uid="2158">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="530.09888" z="295.81794"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="2160"/>
 		</Entity>
 		<Entity uid="2159">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="532.14405" z="297.39481"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="37808"/>
 		</Entity>
 		<Entity uid="2160">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="534.02149" z="298.81995"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="51256"/>
 		</Entity>
 		<Entity uid="2161">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="536.11591" z="300.27564"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="53296"/>
 		</Entity>
 		<Entity uid="2162">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="537.85596" z="301.75498"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="49094"/>
 		</Entity>
 		<Entity uid="2163">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="539.68793" z="302.94883"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="21776"/>
 		</Entity>
 		<Entity uid="2164">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="541.66889" z="304.244"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="27360"/>
 		</Entity>
 		<Entity uid="2165">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="543.70203" z="305.7002"/>
 			<Orientation y="-0.97585"/>
 			<Actor seed="54098"/>
 		</Entity>
 		<Entity uid="2166">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="503.71647" z="250.84787"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="54098"/>
 		</Entity>
 		<Entity uid="2167">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="502.96641" z="248.46216"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="27360"/>
 		</Entity>
 		<Entity uid="2168">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="502.16126" z="246.23655"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="21776"/>
 		</Entity>
 		<Entity uid="2169">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="501.41431" z="244.18143"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="49094"/>
 		</Entity>
 		<Entity uid="2170">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="500.91242" z="241.95337"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="53296"/>
 		</Entity>
 		<Entity uid="2171">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="500.11304" z="239.53125"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="51256"/>
 		</Entity>
 		<Entity uid="2172">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="499.46875" z="237.26395"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="37808"/>
 		</Entity>
 		<Entity uid="2173">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="498.78156" z="234.77457"/>
 			<Orientation y="-1.62049"/>
 			<Actor seed="2160"/>
 		</Entity>
 		<Entity uid="2174">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="496.22385" z="235.62146"/>
 			<Orientation y="-1.62052"/>
 			<Actor seed="2160"/>
 		</Entity>
 		<Entity uid="2175">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="496.91102" z="238.11084"/>
 			<Orientation y="-1.62052"/>
 			<Actor seed="37808"/>
 		</Entity>
 		<Entity uid="2176">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="497.5553" z="240.37815"/>
 			<Orientation y="-1.62052"/>
 			<Actor seed="51256"/>
 		</Entity>
 		<Entity uid="2177">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="498.35468" z="242.80027"/>
 			<Orientation y="-1.62052"/>
 			<Actor seed="53296"/>
 		</Entity>
 		<Entity uid="2178">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="498.8566" z="245.02836"/>
 			<Orientation y="-1.62052"/>
 			<Actor seed="49094"/>
 		</Entity>
 		<Entity uid="2179">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="499.60355" z="247.08347"/>
 			<Orientation y="-1.62052"/>
 			<Actor seed="21776"/>
 		</Entity>
 		<Entity uid="2180">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="500.40867" z="249.30909"/>
 			<Orientation y="-1.62052"/>
 			<Actor seed="27360"/>
 		</Entity>
 		<Entity uid="2181">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>2</Player>
 			<Position x="501.15876" z="251.6948"/>
 			<Orientation y="-1.62052"/>
@@ -14012,14 +14012,14 @@
 			<Actor seed="51932"/>
 		</Entity>
 		<Entity uid="2694">
-			<Template>units/pers_kardakes_hoplite</Template>
+			<Template>units/pers_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="528.41364" z="737.05048"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33478"/>
 		</Entity>
 		<Entity uid="2695">
-			<Template>units/pers_kardakes_hoplite</Template>
+			<Template>units/pers_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="524.6067" z="733.45917"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Combat_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Combat_demo.xml
+++ binaries/data/mods/public/maps/scenarios/Combat_demo.xml
@@ -44,37 +44,37 @@
 ]]></ScriptSettings>
 	<Entities>
 		<Entity uid="11">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="85.15519" z="140.54519"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="12">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="85.08178" z="136.46955"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="84.68078" z="132.29049"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="14">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="84.58814" z="128.5625"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="15">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="84.54111" z="119.59098"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="16">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="84.61438" z="123.77323"/>
 			<Orientation y="2.35621"/>
@@ -140,31 +140,31 @@
 			<Orientation y="1.74827"/>
 		</Entity>
 		<Entity uid="49">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>2</Player>
 			<Position x="163.9004" z="125.90111"/>
 			<Orientation y="-1.4233"/>
 		</Entity>
 		<Entity uid="50">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>2</Player>
 			<Position x="164.3852" z="123.3568"/>
 			<Orientation y="-0.9854"/>
 		</Entity>
 		<Entity uid="51">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>2</Player>
 			<Position x="163.96814" z="119.58962"/>
 			<Orientation y="-1.14623"/>
 		</Entity>
 		<Entity uid="52">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>2</Player>
 			<Position x="163.79677" z="115.81934"/>
 			<Orientation y="-1.68952"/>
 		</Entity>
 		<Entity uid="53">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>2</Player>
 			<Position x="164.07688" z="111.72794"/>
 			<Orientation y="-1.62508"/>
@@ -284,79 +284,79 @@
 			<Orientation y="-1.36196"/>
 		</Entity>
 		<Entity uid="87">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>1</Player>
 			<Position x="85.35996" z="115.0928"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="88">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>1</Player>
 			<Position x="85.40084" z="109.64284"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="89">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>1</Player>
 			<Position x="85.4768" z="104.69619"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="90">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>1</Player>
 			<Position x="85.74891" z="100.50165"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="91">
-			<Template>units/athen_champion_infantry</Template>
+			<Template>units/athen_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="85.69983" z="158.74531"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="92">
-			<Template>units/athen_champion_infantry</Template>
+			<Template>units/athen_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="85.65835" z="162.1988"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="93">
-			<Template>units/athen_champion_infantry</Template>
+			<Template>units/athen_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="86.43186" z="166.41028"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="94">
-			<Template>units/athen_champion_infantry</Template>
+			<Template>units/athen_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="86.41076" z="169.14298"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="100">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>2</Player>
 			<Position x="168.93398" z="103.77627"/>
 			<Orientation y="-2.2371"/>
 		</Entity>
 		<Entity uid="101">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>2</Player>
 			<Position x="165.84691" z="98.34908"/>
 			<Orientation y="-2.04358"/>
 		</Entity>
 		<Entity uid="102">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>2</Player>
 			<Position x="168.86768" z="98.66317"/>
 			<Orientation y="-2.3224"/>
 		</Entity>
 		<Entity uid="103">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>2</Player>
 			<Position x="163.70981" z="101.77434"/>
 			<Orientation y="-2.35347"/>
 		</Entity>
 		<Entity uid="104">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>2</Player>
 			<Position x="166.12447" z="103.64206"/>
 			<Orientation y="-2.23449"/>
@@ -392,37 +392,37 @@
 			<Orientation y="-1.36821"/>
 		</Entity>
 		<Entity uid="133">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="82.00031" z="119.69343"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="134">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="81.79651" z="123.9323"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="135">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="81.89438" z="129.08104"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="136">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="82.47654" z="132.5271"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="137">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="82.42194" z="137.56394"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="138">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="82.26951" z="141.66085"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Combat_demo_(huge).xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Combat_demo_(huge).xml
+++ binaries/data/mods/public/maps/scenarios/Combat_demo_(huge).xml
@@ -39,10 +39,10 @@
 	{
 		createBlock("units/athen_infantry_spearman_e", 1, Math.PI/2, mx - sep - 6, mz, 16, 4, 2.1, 3.0);
 		createBlock("units/athen_infantry_spearman_e", 2, 3*Math.PI/2, mx + sep + 6, mz, 16, 4, 2.1, 3.0);
-		createBlock("units/athen_infantry_marine_archer_b", 1, Math.PI/2, mx - sep, mz, 8, 1, 5.0, 3.0);
-		createBlock("units/athen_infantry_marine_archer_b", 1, Math.PI/2, mx - sep - 2, mz, 7, 1, 5.0, 3.0);
-		createBlock("units/athen_infantry_marine_archer_b", 2, 3*Math.PI/2, mx + sep, mz, 8, 1, 5.0, 3.0);
-		createBlock("units/athen_infantry_marine_archer_b", 2, 3*Math.PI/2, mx + sep + 2, mz, 7, 1, 5.0, 3.0);
+		createBlock("units/athen_infantry_archer_b", 1, Math.PI/2, mx - sep, mz, 8, 1, 5.0, 3.0);
+		createBlock("units/athen_infantry_archer_b", 1, Math.PI/2, mx - sep - 2, mz, 7, 1, 5.0, 3.0);
+		createBlock("units/athen_infantry_archer_b", 2, 3*Math.PI/2, mx + sep, mz, 8, 1, 5.0, 3.0);
+		createBlock("units/athen_infantry_archer_b", 2, 3*Math.PI/2, mx + sep + 2, mz, 7, 1, 5.0, 3.0);
 
 		mz += 42;
 	}
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
@@ -17166,169 +17166,169 @@
 			<Orientation y="-2.08648"/>
 		</Entity>
 		<Entity uid="3723">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="463.92878" z="99.32865"/>
 			<Orientation y="-1.97376"/>
 		</Entity>
 		<Entity uid="3724">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="465.37137" z="97.26954"/>
 			<Orientation y="-2.05436"/>
 		</Entity>
 		<Entity uid="3725">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="467.36066" z="95.35491"/>
 			<Orientation y="-2.129"/>
 		</Entity>
 		<Entity uid="3726">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="462.49363" z="102.2365"/>
 			<Orientation y="-2.06707"/>
 		</Entity>
 		<Entity uid="3727">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="465.52326" z="103.15163"/>
 			<Orientation y="-2.21465"/>
 		</Entity>
 		<Entity uid="3728">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="467.38938" z="101.0216"/>
 			<Orientation y="-1.88836"/>
 		</Entity>
 		<Entity uid="3729">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="469.05063" z="98.88675"/>
 			<Orientation y="-1.90038"/>
 		</Entity>
 		<Entity uid="3730">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="469.84571" z="96.93088"/>
 			<Orientation y="-1.9601"/>
 		</Entity>
 		<Entity uid="3731">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="443.43763" z="121.54992"/>
 			<Orientation y="-2.22004"/>
 		</Entity>
 		<Entity uid="3732">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="445.2574" z="119.08573"/>
 			<Orientation y="-2.19765"/>
 		</Entity>
 		<Entity uid="3733">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="446.83417" z="116.65687"/>
 			<Orientation y="-2.33127"/>
 		</Entity>
 		<Entity uid="3734">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="448.60184" z="114.87836"/>
 			<Orientation y="-2.03138"/>
 		</Entity>
 		<Entity uid="3735">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="450.2725" z="112.88729"/>
 			<Orientation y="-2.0925"/>
 		</Entity>
 		<Entity uid="3736">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="451.5727" z="111.36794"/>
 			<Orientation y="-2.21531"/>
 		</Entity>
 		<Entity uid="3737">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="453.07541" z="109.37777"/>
 			<Orientation y="-1.9436"/>
 		</Entity>
 		<Entity uid="3738">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="455.00849" z="108.16717"/>
 			<Orientation y="-2.11965"/>
 		</Entity>
 		<Entity uid="3739">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="456.61118" z="107.57731"/>
 			<Orientation y="-2.1597"/>
 		</Entity>
 		<Entity uid="3740">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="457.7905" z="105.47152"/>
 			<Orientation y="-1.92734"/>
 		</Entity>
 		<Entity uid="3741">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="441.55253" z="120.2406"/>
 			<Orientation y="-2.26381"/>
 		</Entity>
 		<Entity uid="3742">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="443.07621" z="117.19588"/>
 			<Orientation y="-2.15285"/>
 		</Entity>
 		<Entity uid="3743">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="444.34018" z="115.39295"/>
 			<Orientation y="-2.0824"/>
 		</Entity>
 		<Entity uid="3744">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="446.33295" z="113.77022"/>
 			<Orientation y="-2.3193"/>
 		</Entity>
 		<Entity uid="3745">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="447.65311" z="111.7419"/>
 			<Orientation y="-2.42305"/>
 		</Entity>
 		<Entity uid="3746">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="448.96164" z="109.73147"/>
 			<Orientation y="-1.95867"/>
 		</Entity>
 		<Entity uid="3747">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="450.05646" z="108.42307"/>
 			<Orientation y="-2.39057"/>
 		</Entity>
 		<Entity uid="3748">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="451.3505" z="107.16208"/>
 			<Orientation y="-2.1925"/>
 		</Entity>
 		<Entity uid="3749">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="452.70743" z="105.8664"/>
 			<Orientation y="-2.38154"/>
 		</Entity>
 		<Entity uid="3750">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>4</Player>
 			<Position x="453.97529" z="104.31428"/>
 			<Orientation y="-2.03617"/>
@@ -17580,31 +17580,31 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3812">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="431.63453" z="98.91222"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3813">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="433.14792" z="100.07955"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3814">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="434.37867" z="101.8273"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3815">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="435.49646" z="102.82311"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3816">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>4</Player>
 			<Position x="436.66498" z="103.86411"/>
 			<Orientation y="2.35621"/>
@@ -17934,61 +17934,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3871">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</Template>
 			<Player>2</Player>
 			<Position x="745.16816" z="684.37494"/>
 			<Orientation y="2.35621"/>
@@ -18270,61 +18270,61 @@
 			<Orientation y="2.64898"/>
 		</Entity>
 		<Entity uid="3953">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="413.71863" z="109.3151"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3954">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="411.89661" z="107.28145"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3955">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="409.95527" z="105.53811"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3956">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="408.14951" z="103.32255"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3957">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="406.49024" z="101.132"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3958">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="410.33936" z="96.26948"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3959">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="412.29084" z="98.50759"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3960">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="413.68235" z="100.177"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3961">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="415.14124" z="101.5856"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3962">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>4</Player>
 			<Position x="417.09046" z="103.56884"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Laconia 01.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Laconia 01.xml
+++ binaries/data/mods/public/maps/scenarios/Laconia 01.xml
@@ -6225,49 +6225,49 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1072">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="604.64631" z="624.01783"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1073">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="602.34595" z="626.71387"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1074">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="600.81373" z="624.37781"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1075">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="602.87873" z="621.75831"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1076">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="601.82569" z="620.10163"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1077">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="598.26142" z="623.02955"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1078">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="597.42042" z="621.31458"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1079">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="599.22388" z="619.07258"/>
 			<Orientation y="2.35621"/>
@@ -6375,49 +6375,49 @@
 			<Orientation y="-0.891"/>
 		</Entity>
 		<Entity uid="1097">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="614.6996" z="615.71833"/>
 			<Orientation y="-2.06991"/>
 		</Entity>
 		<Entity uid="1098">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="612.38703" z="613.95685"/>
 			<Orientation y="-2.01365"/>
 		</Entity>
 		<Entity uid="1099">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="610.32612" z="612.58826"/>
 			<Orientation y="-2.37006"/>
 		</Entity>
 		<Entity uid="1100">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="606.89502" z="610.58423"/>
 			<Orientation y="-1.23961"/>
 		</Entity>
 		<Entity uid="1101">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="610.39124" z="608.16736"/>
 			<Orientation y="-0.63187"/>
 		</Entity>
 		<Entity uid="1102">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="612.59131" z="610.7494"/>
 			<Orientation y="-0.1759"/>
 		</Entity>
 		<Entity uid="1103">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="615.1211" z="613.1521"/>
 			<Orientation y="-0.41114"/>
 		</Entity>
 		<Entity uid="1104">
-			<Template>units/spart_champion_infantry_pike</Template>
+			<Template>units/spart_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="618.32105" z="614.49488"/>
 			<Orientation y="-0.84484"/>
@@ -6447,61 +6447,61 @@
 			<Orientation y="-1.45977"/>
 		</Entity>
 		<Entity uid="1109">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="634.00965" z="658.0246"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1110">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="637.4209" z="661.48328"/>
 			<Orientation y="-2.82384"/>
 		</Entity>
 		<Entity uid="1111">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="640.07813" z="663.01941"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1112">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="651.00715" z="650.86835"/>
 			<Orientation y="-2.03212"/>
 		</Entity>
 		<Entity uid="1113">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="653.6313" z="646.82898"/>
 			<Orientation y="-1.62832"/>
 		</Entity>
 		<Entity uid="1114">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="657.57679" z="642.35303"/>
 			<Orientation y="-0.93886"/>
 		</Entity>
 		<Entity uid="1115">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="658.0788" z="610.68738"/>
 			<Orientation y="-0.38855"/>
 		</Entity>
 		<Entity uid="1116">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="651.9272" z="605.29914"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1117">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="648.41187" z="603.35877"/>
 			<Orientation y="-1.05025"/>
 		</Entity>
 		<Entity uid="1118">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="643.32227" z="598.37415"/>
 			<Orientation y="-0.58846"/>
@@ -6543,37 +6543,37 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1125">
-			<Template>units/spart_champion_infantry_sword</Template>
+			<Template>units/spart_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="641.09504" z="636.53144"/>
 			<Orientation y="0.59348"/>
 		</Entity>
 		<Entity uid="1126">
-			<Template>units/spart_champion_infantry_sword</Template>
+			<Template>units/spart_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="643.78168" z="635.32331"/>
 			<Orientation y="0.95231"/>
 		</Entity>
 		<Entity uid="1127">
-			<Template>units/spart_champion_infantry_sword</Template>
+			<Template>units/spart_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="645.3" z="632.62446"/>
 			<Orientation y="1.07848"/>
 		</Entity>
 		<Entity uid="1128">
-			<Template>units/spart_champion_infantry_sword</Template>
+			<Template>units/spart_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="644.65857" z="620.51587"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1129">
-			<Template>units/spart_champion_infantry_sword</Template>
+			<Template>units/spart_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="641.82978" z="616.97651"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1130">
-			<Template>units/spart_champion_infantry_sword</Template>
+			<Template>units/spart_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="636.82966" z="612.48719"/>
 			<Orientation y="2.35621"/>
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
@@ -2089,31 +2089,31 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="461">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="205.77401" z="225.15702"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="462">
-			<Template>units/athen_infantry_marine_archer_a</Template>
+			<Template>units/athen_infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="199.74018" z="220.3263"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="465">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="207.90168" z="226.22664"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="466">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="209.29848" z="227.46726"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="467">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="211.02697" z="229.19568"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
+++ binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
@@ -408,13 +408,13 @@
 			<Orientation y="2.23438"/>
 		</Entity>
 		<Entity uid="76">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="293.941" z="235.59"/>
 			<Orientation y="3.16405"/>
 		</Entity>
 		<Entity uid="77">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="338.055" z="210.789"/>
 			<Orientation y="3.16405"/>
@@ -426,97 +426,97 @@
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="83">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="390.965" z="252.871"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="84">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="392.242" z="262.113"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="85">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="396.023" z="268.004"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="86">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="399.91" z="271.18"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="87">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="403.887" z="272.137"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="88">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="410.883" z="265.461"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="89">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="413.297" z="260.395"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="90">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="414.941" z="253.188"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="91">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="414.363" z="245.191"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="92">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="411.258" z="240.418"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="93">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="407.438" z="238.125"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="94">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="402.996" z="236.023"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="95">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="398.781" z="236.805"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="96">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="394.957" z="240.418"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="97">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="391.453" z="244.617"/>
 			<Orientation y="2.67188"/>
 		</Entity>
 		<Entity uid="98">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="407.746" z="268.559"/>
 			<Orientation y="2.67188"/>
Index: binaries/data/mods/public/maps/scenarios/Peloponnese.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Peloponnese.xml
+++ binaries/data/mods/public/maps/scenarios/Peloponnese.xml
@@ -32439,61 +32439,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6046">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>5</Player>
 			<Position x="990.73603" z="994.52741"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6047">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>5</Player>
 			<Position x="993.1222" z="997.4593"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6048">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>5</Player>
 			<Position x="994.77814" z="1000.31214"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6049">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>5</Player>
 			<Position x="996.45081" z="1003.2912"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6050">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>5</Player>
 			<Position x="998.07544" z="1006.1847"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6051">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>3</Player>
 			<Position x="408.62665" z="1002.93763"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6052">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>3</Player>
 			<Position x="410.66425" z="1004.93476"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6053">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>3</Player>
 			<Position x="412.21631" z="1007.67084"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6054">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>3</Player>
 			<Position x="414.61258" z="1011.3938"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6055">
-			<Template>units/athen_champion_ranged</Template>
+			<Template>units/athen_champion_archer_infantry</Template>
 			<Player>3</Player>
 			<Position x="416.36374" z="1014.0069"/>
 			<Orientation y="2.35621"/>
@@ -33429,31 +33429,31 @@
 			<Orientation y="1.94863"/>
 		</Entity>
 		<Entity uid="6213">
-			<Template>units/athen_champion_marine</Template>
+			<Template>units/athen_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="1387.7516" z="1115.52857"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6214">
-			<Template>units/athen_champion_marine</Template>
+			<Template>units/athen_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="1390.96497" z="1118.62989"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6215">
-			<Template>units/athen_champion_marine</Template>
+			<Template>units/athen_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="1393.54517" z="1122.3805"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6216">
-			<Template>units/athen_champion_marine</Template>
+			<Template>units/athen_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="1396.27186" z="1126.25562"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6217">
-			<Template>units/athen_champion_marine</Template>
+			<Template>units/athen_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="1385.9021" z="1113.21045"/>
 			<Orientation y="2.35621"/>
@@ -33513,31 +33513,31 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6227">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="804.1753" z="594.75623"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6228">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="806.4745" z="596.53046"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6229">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="808.55433" z="598.64655"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6230">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="810.89972" z="600.86341"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="6231">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="813.04438" z="603.48694"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
@@ -1415,37 +1415,37 @@
 			<Orientation y="0.71708"/>
 		</Entity>
 		<Entity uid="252">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="696.31885" z="328.88071"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="253">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="693.66932" z="331.20334"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="254">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="689.78418" z="328.41871"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="255">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="689.88367" z="323.73774"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="256">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="694.67048" z="324.71052"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="257">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="685.81977" z="322.15647"/>
 			<Orientation y="2.35621"/>
@@ -7084,37 +7084,37 @@
 			<Orientation y="0.76757"/>
 		</Entity>
 		<Entity uid="1244">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="523.10114" z="740.86481"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1245">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="524.70405" z="745.23554"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1246">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="526.62421" z="742.04847"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1247">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="528.98212" z="746.74231"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1248">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="528.33259" z="749.65027"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1249">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="532.32331" z="749.10157"/>
 			<Orientation y="2.35621"/>
@@ -21907,98 +21907,98 @@
 			<Actor seed="19846"/>
 		</Entity>
 		<Entity uid="3855">
-			<Template>units/brit_champion_cavalry</Template>
+			<Template>units/brit_champion_javelin_chariot</Template>
 			<Player>1</Player>
 			<Position x="544.03486" z="481.8744"/>
 			<Orientation y="-2.09916"/>
 			<Actor seed="58198"/>
 		</Entity>
 		<Entity uid="3856">
-			<Template>units/brit_champion_cavalry</Template>
+			<Template>units/brit_champion_javelin_chariot</Template>
 			<Player>1</Player>
 			<Position x="538.69642" z="487.14191"/>
 			<Orientation y="-2.11428"/>
 			<Actor seed="19440"/>
 		</Entity>
 		<Entity uid="3857">
-			<Template>units/brit_champion_cavalry</Template>
+			<Template>units/brit_champion_javelin_chariot</Template>
 			<Player>1</Player>
 			<Position x="546.09424" z="474.80298"/>
 			<Orientation y="-2.18503"/>
 			<Actor seed="20916"/>
 		</Entity>
 		<Entity uid="3858">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="533.13166" z="500.30692"/>
 			<Orientation y="-3.13271"/>
 			<Actor seed="13060"/>
 		</Entity>
 		<Entity uid="3859">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="530.38746" z="498.8347"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63370"/>
 		</Entity>
 		<Entity uid="3860">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="531.74347" z="494.44672"/>
 			<Orientation y="1.09035"/>
 			<Actor seed="52072"/>
 		</Entity>
 		<Entity uid="3861">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="535.5301" z="492.17551"/>
 			<Orientation y="-0.53303"/>
 			<Actor seed="10464"/>
 		</Entity>
 		<Entity uid="3862">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="536.40766" z="495.13923"/>
 			<Orientation y="-1.51746"/>
 			<Actor seed="19750"/>
 		</Entity>
 		<Entity uid="3863">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="535.82081" z="498.8347"/>
 			<Orientation y="-2.09527"/>
 			<Actor seed="21162"/>
 		</Entity>
 		<Entity uid="3864">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="532.72254" z="497.25062"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61952"/>
 		</Entity>
 		<Entity uid="3865">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="533.83991" z="494.53217"/>
 			<Orientation y="0.43418"/>
 			<Actor seed="28594"/>
 		</Entity>
 		<Entity uid="3866">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="529.22773" z="496.30979"/>
 			<Orientation y="2.98131"/>
 			<Actor seed="8540"/>
 		</Entity>
 		<Entity uid="3867">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="531.05121" z="500.85361"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21126"/>
 		</Entity>
 		<Entity uid="3868">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="537.6316" z="496.30979"/>
 			<Orientation y="-2.08127"/>
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
@@ -321,13 +321,13 @@
 			<Orientation y="-2.18821"/>
 		</Entity>
 		<Entity uid="54">
-			<Template>units/cart_champion_cavalry</Template>
+			<Template>units/cart_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="357.42023" z="341.12296"/>
 			<Orientation y="2.60969"/>
 		</Entity>
 		<Entity uid="55">
-			<Template>units/cart_champion_cavalry</Template>
+			<Template>units/cart_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="368.90186" z="349.93375"/>
 			<Orientation y="2.5448"/>
@@ -1323,79 +1323,79 @@
 			<Orientation y="0.79787"/>
 		</Entity>
 		<Entity uid="264">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="585.09205" z="294.44172"/>
 			<Orientation y="-2.5559"/>
 		</Entity>
 		<Entity uid="265">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="580.51606" z="294.71726"/>
 			<Orientation y="-2.50855"/>
 		</Entity>
 		<Entity uid="266">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="576.73066" z="296.58393"/>
 			<Orientation y="-2.55755"/>
 		</Entity>
 		<Entity uid="267">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="574.72999" z="303.13392"/>
 			<Orientation y="-2.72352"/>
 		</Entity>
 		<Entity uid="268">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="577.15271" z="303.76105"/>
 			<Orientation y="-2.8909"/>
 		</Entity>
 		<Entity uid="269">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="579.17469" z="300.88099"/>
 			<Orientation y="-2.76958"/>
 		</Entity>
 		<Entity uid="270">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="581.11658" z="298.21232"/>
 			<Orientation y="-2.89113"/>
 		</Entity>
 		<Entity uid="271">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>2</Player>
 			<Position x="583.425" z="298.69874"/>
 			<Orientation y="-2.87711"/>
 		</Entity>
 		<Entity uid="285">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>2</Player>
 			<Position x="644.1316" z="466.40235"/>
 			<Orientation y="-2.17167"/>
 		</Entity>
 		<Entity uid="286">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>2</Player>
 			<Position x="630.41773" z="485.40418"/>
 			<Orientation y="-2.28068"/>
 		</Entity>
 		<Entity uid="287">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>2</Player>
 			<Position x="640.14563" z="472.33365"/>
 			<Orientation y="-2.25867"/>
 		</Entity>
 		<Entity uid="288">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>2</Player>
 			<Position x="636.60694" z="476.21637"/>
 			<Orientation y="-2.37955"/>
 		</Entity>
 		<Entity uid="289">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>2</Player>
 			<Position x="633.54847" z="480.69922"/>
 			<Orientation y="-2.3435"/>
@@ -4548,151 +4548,151 @@
 			<Orientation y="-2.17698"/>
 		</Entity>
 		<Entity uid="874">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="349.79096" z="354.0152"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="875">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="351.65052" z="355.59968"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="876">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="353.61207" z="357.54896"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="877">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="355.3158" z="359.25037"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="878">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="356.8921" z="360.99427"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="879">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="351.83011" z="351.6804"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="880">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="353.43122" z="353.33207"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="881">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="355.1537" z="355.16169"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="882">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="356.89014" z="356.96781"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="883">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="358.56135" z="358.71647"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="884">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="353.70813" z="349.59116"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="885">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="355.00632" z="351.29389"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="886">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="356.90546" z="352.87662"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="887">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="358.76725" z="354.2725"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="888">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="360.27771" z="356.40925"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="889">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="355.43046" z="347.44681"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="890">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="356.79792" z="349.24708"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="891">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="358.71119" z="350.6749"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="892">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="360.51761" z="352.22208"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="893">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="362.15268" z="353.68805"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="894">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="363.92844" z="352.20331"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="895">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="362.40403" z="350.65256"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="896">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="360.69153" z="349.25486"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="897">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="359.13361" z="347.61564"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="898">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="357.54773" z="346.08176"/>
 			<Orientation y="2.35621"/>
@@ -4876,61 +4876,61 @@
 			<Orientation y="2.53765"/>
 		</Entity>
 		<Entity uid="932">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="194.46671" z="768.73273"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="933">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="196.18078" z="770.87678"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="934">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="197.65035" z="772.4903"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="935">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="199.28507" z="775.05475"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="936">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="200.92371" z="777.08851"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="937">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="197.40012" z="764.95447"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="938">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="199.2456" z="767.06611"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="939">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="201.03905" z="770.08027"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="940">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="202.16541" z="772.13257"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="941">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="204.06685" z="774.08844"/>
 			<Orientation y="2.35621"/>
@@ -5676,14 +5676,14 @@
 			<Actor seed="55270"/>
 		</Entity>
 		<Entity uid="1084">
-			<Template>units/cart_champion_elephant</Template>
+			<Template>units/cart_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="397.4178" z="165.43642"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37534"/>
 		</Entity>
 		<Entity uid="1085">
-			<Template>units/cart_champion_elephant</Template>
+			<Template>units/cart_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="383.48523" z="152.23986"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
@@ -1421,37 +1421,37 @@
 			<Orientation y="0.71708"/>
 		</Entity>
 		<Entity uid="252">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="696.31885" z="328.88071"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="253">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="693.66932" z="331.20334"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="254">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="689.78418" z="328.41871"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="255">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="689.88367" z="323.73774"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="256">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="694.67048" z="324.71052"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="257">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="685.81977" z="322.15647"/>
 			<Orientation y="2.35621"/>
@@ -7090,37 +7090,37 @@
 			<Orientation y="0.76757"/>
 		</Entity>
 		<Entity uid="1244">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="523.10114" z="740.86481"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1245">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="524.70405" z="745.23554"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1246">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="526.62421" z="742.04847"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1247">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="528.98212" z="746.74231"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1248">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="528.33259" z="749.65027"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1249">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>3</Player>
 			<Position x="532.32331" z="749.10157"/>
 			<Orientation y="2.35621"/>
@@ -21938,98 +21938,98 @@
 			<Actor seed="19846"/>
 		</Entity>
 		<Entity uid="3855">
-			<Template>units/gaul_champion_cavalry</Template>
+			<Template>units/gaul_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="553.97907" z="494.75876"/>
 			<Orientation y="-2.09916"/>
 			<Actor seed="58198"/>
 		</Entity>
 		<Entity uid="3856">
-			<Template>units/gaul_champion_cavalry</Template>
+			<Template>units/gaul_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="556.43311" z="493.80201"/>
 			<Orientation y="-2.11428"/>
 			<Actor seed="19440"/>
 		</Entity>
 		<Entity uid="3857">
-			<Template>units/gaul_champion_cavalry</Template>
+			<Template>units/gaul_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="558.82563" z="493.74573"/>
 			<Orientation y="-2.18503"/>
 			<Actor seed="20916"/>
 		</Entity>
 		<Entity uid="3858">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="547.30604" z="459.64957"/>
 			<Orientation y="-3.13271"/>
 			<Actor seed="13060"/>
 		</Entity>
 		<Entity uid="3859">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="544.56183" z="458.17734"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63370"/>
 		</Entity>
 		<Entity uid="3860">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="545.91785" z="453.78937"/>
 			<Orientation y="1.09035"/>
 			<Actor seed="52072"/>
 		</Entity>
 		<Entity uid="3861">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="549.70447" z="451.51816"/>
 			<Orientation y="-0.53303"/>
 			<Actor seed="10464"/>
 		</Entity>
 		<Entity uid="3862">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="550.58204" z="454.48188"/>
 			<Orientation y="-1.51746"/>
 			<Actor seed="19750"/>
 		</Entity>
 		<Entity uid="3863">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="549.99518" z="458.17734"/>
 			<Orientation y="-2.09527"/>
 			<Actor seed="21162"/>
 		</Entity>
 		<Entity uid="3864">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="546.89692" z="456.59327"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61952"/>
 		</Entity>
 		<Entity uid="3865">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="548.01429" z="453.87482"/>
 			<Orientation y="0.43418"/>
 			<Actor seed="28594"/>
 		</Entity>
 		<Entity uid="3866">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="543.4021" z="455.65244"/>
 			<Orientation y="2.98131"/>
 			<Actor seed="8540"/>
 		</Entity>
 		<Entity uid="3867">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="545.2256" z="460.19626"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21126"/>
 		</Entity>
 		<Entity uid="3868">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="551.80597" z="455.65244"/>
 			<Orientation y="-2.08127"/>
@@ -22533,70 +22533,70 @@
 			<Actor seed="57224"/>
 		</Entity>
 		<Entity uid="3941">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="524.57752" z="504.01511"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1692"/>
 		</Entity>
 		<Entity uid="3942">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="533.65601" z="511.2956"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41300"/>
 		</Entity>
 		<Entity uid="3943">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="526.57355" z="505.98923"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26334"/>
 		</Entity>
 		<Entity uid="3944">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="531.44666" z="509.54014"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="30856"/>
 		</Entity>
 		<Entity uid="3945">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="528.7917" z="507.65558"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12936"/>
 		</Entity>
 		<Entity uid="3946">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="531.45429" z="505.08976"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="7240"/>
 		</Entity>
 		<Entity uid="3947">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="528.96338" z="503.3953"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2266"/>
 		</Entity>
 		<Entity uid="3948">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="533.56354" z="507.24766"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36968"/>
 		</Entity>
 		<Entity uid="3949">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="535.46369" z="509.01114"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52818"/>
 		</Entity>
 		<Entity uid="3950">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="526.85407" z="501.39164"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Iberians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Iberians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Iberians.xml
@@ -559,55 +559,55 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="90">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>1</Player>
 			<Position x="390.14917" z="230.8614"/>
 			<Orientation y="-2.21941"/>
 		</Entity>
 		<Entity uid="91">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>1</Player>
 			<Position x="386.64652" z="235.48673"/>
 			<Orientation y="-2.12435"/>
 		</Entity>
 		<Entity uid="92">
-			<Template>units/iber_champion_cavalry</Template>
+			<Template>units/iber_champion_javelin_cavalry</Template>
 			<Player>1</Player>
 			<Position x="383.22696" z="239.76294"/>
 			<Orientation y="-2.29711"/>
 		</Entity>
 		<Entity uid="93">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="394.85737" z="217.73746"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="94">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="391.71393" z="215.42203"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="95">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="388.45798" z="212.30677"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="96">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="383.38788" z="216.03916"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="97">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="387.70328" z="218.49207"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="98">
-			<Template>units/iber_champion_infantry</Template>
+			<Template>units/iber_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="391.31684" z="221.64954"/>
 			<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
@@ -4519,126 +4519,126 @@
 			<Actor seed="11004"/>
 		</Entity>
 		<Entity uid="896">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="610.4051" z="1386.9823"/>
 			<Orientation y="2.52132"/>
 			<Actor seed="25944"/>
 		</Entity>
 		<Entity uid="897">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="612.17884" z="1389.22999"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25362"/>
 		</Entity>
 		<Entity uid="898">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="614.02912" z="1390.95752"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53226"/>
 		</Entity>
 		<Entity uid="899">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="615.20142" z="1392.47754"/>
 			<Orientation y="2.54194"/>
 			<Actor seed="55860"/>
 		</Entity>
 		<Entity uid="900">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="617.15345" z="1395.04041"/>
 			<Orientation y="2.62427"/>
 			<Actor seed="49206"/>
 		</Entity>
 		<Entity uid="901">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>1</Player>
 			<Position x="613.85938" z="1385.03724"/>
 			<Orientation y="2.53823"/>
 			<Actor seed="7734"/>
 		</Entity>
 		<Entity uid="902">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>1</Player>
 			<Position x="615.86731" z="1387.2732"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51022"/>
 		</Entity>
 		<Entity uid="903">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>1</Player>
 			<Position x="617.26905" z="1388.77613"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27506"/>
 		</Entity>
 		<Entity uid="904">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>1</Player>
 			<Position x="618.64698" z="1390.09314"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="20644"/>
 		</Entity>
 		<Entity uid="905">
-			<Template>units/mace_champion_infantry_e</Template>
+			<Template>units/mace_champion_hoplite_infantry_e</Template>
 			<Player>1</Player>
 			<Position x="620.61792" z="1391.82203"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40078"/>
 		</Entity>
 		<Entity uid="906">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="624.23035" z="1397.6117"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10604"/>
 		</Entity>
 		<Entity uid="907">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="626.68366" z="1399.50684"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="30750"/>
 		</Entity>
 		<Entity uid="908">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="628.69214" z="1401.14722"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22646"/>
 		</Entity>
 		<Entity uid="909">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="631.02674" z="1403.1897"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9980"/>
 		</Entity>
 		<Entity uid="910">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="628.54767" z="1393.03162"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28186"/>
 		</Entity>
 		<Entity uid="911">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="630.99115" z="1395.03772"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64664"/>
 		</Entity>
 		<Entity uid="912">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="633.48676" z="1397.5448"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12792"/>
 		</Entity>
 		<Entity uid="913">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="636.51282" z="1399.33045"/>
 			<Orientation y="2.35621"/>
@@ -9877,336 +9877,336 @@
 			<Actor seed="60330"/>
 		</Entity>
 		<Entity uid="1740">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="222.74456" z="1246.43213"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61834"/>
 		</Entity>
 		<Entity uid="1741">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="225.29415" z="1246.65931"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25300"/>
 		</Entity>
 		<Entity uid="1742">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="226.83657" z="1248.07496"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18592"/>
 		</Entity>
 		<Entity uid="1743">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="229.00657" z="1249.85877"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="55570"/>
 		</Entity>
 		<Entity uid="1744">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="230.83478" z="1250.70228"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5534"/>
 		</Entity>
 		<Entity uid="1745">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="232.32117" z="1252.74244"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64570"/>
 		</Entity>
 		<Entity uid="1746">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="234.24674" z="1253.86902"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49670"/>
 		</Entity>
 		<Entity uid="1747">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="236.89533" z="1256.10633"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39074"/>
 		</Entity>
 		<Entity uid="1748">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="238.84076" z="1258.12122"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24110"/>
 		</Entity>
 		<Entity uid="1749">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="240.7179" z="1259.42371"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27984"/>
 		</Entity>
 		<Entity uid="1750">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="243.43827" z="1260.52833"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60658"/>
 		</Entity>
 		<Entity uid="1751">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="244.8503" z="1262.70411"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33234"/>
 		</Entity>
 		<Entity uid="1752">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="246.87087" z="1258.77906"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46918"/>
 		</Entity>
 		<Entity uid="1753">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="242.96912" z="1256.22803"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11406"/>
 		</Entity>
 		<Entity uid="1754">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="241.5983" z="1254.2837"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13858"/>
 		</Entity>
 		<Entity uid="1755">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="240.0435" z="1253.20545"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24068"/>
 		</Entity>
 		<Entity uid="1756">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="236.4801" z="1248.9845"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5602"/>
 		</Entity>
 		<Entity uid="1757">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="235.87081" z="1248.34583"/>
 			<Orientation y="-2.37282"/>
 			<Actor seed="59298"/>
 		</Entity>
 		<Entity uid="1758">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="233.67136" z="1246.48206"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28328"/>
 		</Entity>
 		<Entity uid="1759">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="232.11623" z="1245.88062"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="43944"/>
 		</Entity>
 		<Entity uid="1760">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="229.43802" z="1244.15357"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="43474"/>
 		</Entity>
 		<Entity uid="1761">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="225.76883" z="1241.90381"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36288"/>
 		</Entity>
 		<Entity uid="1762">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="224.98072" z="1240.3324"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52492"/>
 		</Entity>
 		<Entity uid="1763">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="221.4157" z="1237.7306"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15044"/>
 		</Entity>
 		<Entity uid="1764">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="226.27125" z="1236.63819"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10272"/>
 		</Entity>
 		<Entity uid="1765">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="229.45838" z="1238.29102"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4196"/>
 		</Entity>
 		<Entity uid="1766">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="230.58155" z="1239.43738"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51958"/>
 		</Entity>
 		<Entity uid="1767">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="232.2655" z="1240.7063"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13312"/>
 		</Entity>
 		<Entity uid="1768">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="234.14383" z="1242.20667"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54780"/>
 		</Entity>
 		<Entity uid="1769">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="236.90461" z="1243.51429"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58014"/>
 		</Entity>
 		<Entity uid="1770">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="239.04194" z="1246.33558"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51034"/>
 		</Entity>
 		<Entity uid="1771">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="240.87121" z="1248.39002"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53798"/>
 		</Entity>
 		<Entity uid="1772">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="242.94327" z="1250.60108"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="31780"/>
 		</Entity>
 		<Entity uid="1773">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="243.96061" z="1251.58423"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48856"/>
 		</Entity>
 		<Entity uid="1774">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="244.95128" z="1253.4015"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54550"/>
 		</Entity>
 		<Entity uid="1775">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="246.61973" z="1255.94324"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38450"/>
 		</Entity>
 		<Entity uid="1776">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="249.96927" z="1254.61756"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60104"/>
 		</Entity>
 		<Entity uid="1777">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="247.04386" z="1250.30176"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="47904"/>
 		</Entity>
 		<Entity uid="1778">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="246.6507" z="1249.68482"/>
 			<Orientation y="-2.4257"/>
 			<Actor seed="40486"/>
 		</Entity>
 		<Entity uid="1779">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="243.04677" z="1246.10071"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15826"/>
 		</Entity>
 		<Entity uid="1780">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="241.35358" z="1244.16504"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13814"/>
 		</Entity>
 		<Entity uid="1781">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="238.93985" z="1241.61963"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13290"/>
 		</Entity>
 		<Entity uid="1782">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="236.64005" z="1239.86744"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49988"/>
 		</Entity>
 		<Entity uid="1783">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="234.4494" z="1238.51966"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17526"/>
 		</Entity>
 		<Entity uid="1784">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="232.77715" z="1237.54761"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21122"/>
 		</Entity>
 		<Entity uid="1785">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="232.14618" z="1236.92054"/>
 			<Orientation y="-2.1728"/>
 			<Actor seed="38242"/>
 		</Entity>
 		<Entity uid="1786">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="229.05169" z="1234.61915"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40982"/>
 		</Entity>
 		<Entity uid="1787">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="226.78057" z="1233.36329"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml
@@ -29525,13 +29525,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5427">
-			<Template>units/maur_champion_infantry</Template>
+			<Template>units/maur_champion_mace_infantry</Template>
 			<Player>1</Player>
 			<Position x="195.25178" z="606.53669"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5428">
-			<Template>units/maur_champion_elephant</Template>
+			<Template>units/maur_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="269.4886" z="668.2284"/>
 			<Orientation y="2.22233"/>
@@ -29609,7 +29609,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5442">
-			<Template>units/maur_champion_chariot</Template>
+			<Template>units/maur_champion_archer_chariot</Template>
 			<Player>1</Player>
 			<Position x="193.46952" z="592.84675"/>
 			<Orientation y="2.35621"/>
@@ -30040,37 +30040,37 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5530">
-			<Template>units/maur_champion_maiden</Template>
+			<Template>units/maur_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="184.20565" z="610.10474"/>
 			<Orientation y="2.74079"/>
 		</Entity>
 		<Entity uid="5531">
-			<Template>units/maur_champion_maiden</Template>
+			<Template>units/maur_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="180.01711" z="611.91791"/>
 			<Orientation y="2.92121"/>
 		</Entity>
 		<Entity uid="5532">
-			<Template>units/maur_champion_maiden</Template>
+			<Template>units/maur_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="181.49878" z="613.2085"/>
 			<Orientation y="3.08054"/>
 		</Entity>
 		<Entity uid="5533">
-			<Template>units/maur_champion_maiden</Template>
+			<Template>units/maur_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="177.3977" z="610.9784"/>
 			<Orientation y="-3.12195"/>
 		</Entity>
 		<Entity uid="5534">
-			<Template>units/maur_champion_maiden</Template>
+			<Template>units/maur_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="175.28737" z="610.06238"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5535">
-			<Template>units/maur_champion_infantry</Template>
+			<Template>units/maur_champion_mace_infantry</Template>
 			<Player>1</Player>
 			<Position x="192.31084" z="604.3379"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
@@ -6770,31 +6770,31 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1270">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="691.5724" z="493.22489"/>
 			<Orientation y="-1.96476"/>
 		</Entity>
 		<Entity uid="1271">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="682.92078" z="483.91382"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1272">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="694.27411" z="484.50327"/>
 			<Orientation y="-0.96761"/>
 		</Entity>
 		<Entity uid="1273">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="680.85389" z="470.31443"/>
 			<Orientation y="1.13697"/>
 		</Entity>
 		<Entity uid="1274">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="702.44605" z="488.38642"/>
 			<Orientation y="-2.93792"/>
@@ -6812,109 +6812,109 @@
 			<Orientation y="-2.83396"/>
 		</Entity>
 		<Entity uid="1280">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="700.45722" z="508.43702"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1281">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="702.80005" z="509.78534"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1282">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="704.63526" z="511.66681"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1283">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="706.69324" z="514.10877"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1284">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="708.38855" z="516.24537"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1285">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="704.76557" z="502.09504"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1286">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="707.39759" z="504.00666"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1287">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="708.93616" z="507.1052"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1288">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="709.85975" z="509.27778"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1289">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="711.50428" z="510.97889"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1290">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="733.58191" z="811.59498"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1291">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="731.29224" z="809.96747"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1292">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="733.84064" z="807.64155"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1293">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="735.95765" z="809.45514"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1294">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="736.11066" z="804.05872"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1295">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="738.69813" z="805.77796"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1296">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="737.97126" z="801.5605"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1297">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="740.28199" z="802.93671"/>
 			<Orientation y="2.35621"/>
@@ -7430,37 +7430,37 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1395">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="656.61652" z="678.40589"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1396">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="658.29188" z="680.03614"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1397">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="661.15217" z="683.41059"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1398">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="657.73328" z="684.27887"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1399">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="655.8954" z="681.38837"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1400">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="653.11548" z="678.70875"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
@@ -13507,7 +13507,7 @@
 			<Actor seed="12238"/>
 		</Entity>
 		<Entity uid="5493">
-			<Template>units/ptol_champion_juggernaut</Template>
+			<Template>units/ptol_champion_juggernaut_wargalley</Template>
 			<Player>1</Player>
 			<Position x="631.37598" z="721.02466"/>
 			<Orientation y="0.9169"/>
@@ -13931,77 +13931,77 @@
 			<Actor seed="22314"/>
 		</Entity>
 		<Entity uid="5604">
-			<Template>units/ptol_champion_cavalry</Template>
+			<Template>units/ptol_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="237.89493" z="565.53901"/>
 			<Orientation y="-0.91015"/>
 			<Actor seed="30144"/>
 		</Entity>
 		<Entity uid="5605">
-			<Template>units/ptol_champion_cavalry</Template>
+			<Template>units/ptol_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="229.04334" z="554.58515"/>
 			<Orientation y="-0.67331"/>
 			<Actor seed="10076"/>
 		</Entity>
 		<Entity uid="5606">
-			<Template>units/ptol_champion_cavalry</Template>
+			<Template>units/ptol_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="231.71026" z="558.15662"/>
 			<Orientation y="-0.69527"/>
 			<Actor seed="13544"/>
 		</Entity>
 		<Entity uid="5607">
-			<Template>units/ptol_champion_cavalry</Template>
+			<Template>units/ptol_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="233.745" z="561.58002"/>
 			<Orientation y="-0.60936"/>
 			<Actor seed="24200"/>
 		</Entity>
 		<Entity uid="5608">
-			<Template>units/ptol_champion_cavalry</Template>
+			<Template>units/ptol_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="227.5751" z="551.97553"/>
 			<Orientation y="-0.69957"/>
 			<Actor seed="2872"/>
 		</Entity>
 		<Entity uid="5609">
-			<Template>units/ptol_champion_elephant</Template>
+			<Template>units/ptol_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="180.5895" z="547.74317"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9182"/>
 		</Entity>
 		<Entity uid="5610">
-			<Template>units/ptol_champion_elephant</Template>
+			<Template>units/ptol_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="184.25489" z="554.16663"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18312"/>
 		</Entity>
 		<Entity uid="5611">
-			<Template>units/ptol_champion_elephant</Template>
+			<Template>units/ptol_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="188.984" z="538.66688"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60654"/>
 		</Entity>
 		<Entity uid="5612">
-			<Template>units/ptol_champion_elephant</Template>
+			<Template>units/ptol_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="192.80765" z="544.34998"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42102"/>
 		</Entity>
 		<Entity uid="5613">
-			<Template>units/ptol_champion_elephant</Template>
+			<Template>units/ptol_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="176.1145" z="538.25379"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="31750"/>
 		</Entity>
 		<Entity uid="5614">
-			<Template>units/ptol_champion_elephant</Template>
+			<Template>units/ptol_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="185.0379" z="530.77363"/>
 			<Orientation y="2.35621"/>
@@ -14078,168 +14078,168 @@
 			<Actor seed="5412"/>
 		</Entity>
 		<Entity uid="5625">
-			<Template>units/ptol_cavalry_javelinist_merc_b</Template>
+			<Template>units/ptol_cavalry_javelinist_b</Template>
 			<Player>1</Player>
 			<Position x="281.32508" z="598.8017"/>
 			<Orientation y="-2.0104"/>
 			<Actor seed="4030"/>
 		</Entity>
 		<Entity uid="5626">
-			<Template>units/ptol_cavalry_javelinist_merc_a</Template>
+			<Template>units/ptol_cavalry_javelinist_a</Template>
 			<Player>1</Player>
 			<Position x="278.80365" z="601.96747"/>
 			<Orientation y="-2.16691"/>
 			<Actor seed="38112"/>
 		</Entity>
 		<Entity uid="5627">
-			<Template>units/ptol_cavalry_javelinist_merc_e</Template>
+			<Template>units/ptol_cavalry_javelinist_e</Template>
 			<Player>1</Player>
 			<Position x="275.43928" z="605.84418"/>
 			<Orientation y="-2.24321"/>
 			<Actor seed="36764"/>
 		</Entity>
 		<Entity uid="5628">
-			<Template>units/ptol_cavalry_spearman_merc_e</Template>
+			<Template>units/ptol_cavalry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="277.56006" z="583.20649"/>
 			<Orientation y="-0.87314"/>
 			<Actor seed="16884"/>
 		</Entity>
 		<Entity uid="5629">
-			<Template>units/ptol_cavalry_spearman_merc_a</Template>
+			<Template>units/ptol_cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="280.10712" z="585.77131"/>
 			<Orientation y="-0.84008"/>
 			<Actor seed="12208"/>
 		</Entity>
 		<Entity uid="5630">
-			<Template>units/ptol_cavalry_spearman_merc_b</Template>
+			<Template>units/ptol_cavalry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="282.9347" z="588.95508"/>
 			<Orientation y="-1.13611"/>
 			<Actor seed="63914"/>
 		</Entity>
 		<Entity uid="5631">
-			<Template>units/ptol_infantry_spearman_merc_b</Template>
+			<Template>units/ptol_infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="258.6356" z="585.40455"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2520"/>
 		</Entity>
 		<Entity uid="5632">
-			<Template>units/ptol_infantry_spearman_merc_b</Template>
+			<Template>units/ptol_infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="259.95276" z="586.93067"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="44956"/>
 		</Entity>
 		<Entity uid="5633">
-			<Template>units/ptol_infantry_spearman_merc_b</Template>
+			<Template>units/ptol_infantry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="261.26014" z="588.42896"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54412"/>
 		</Entity>
 		<Entity uid="5634">
-			<Template>units/ptol_infantry_spearman_merc_a</Template>
+			<Template>units/ptol_infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="261.46744" z="583.85828"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29828"/>
 		</Entity>
 		<Entity uid="5635">
-			<Template>units/ptol_infantry_spearman_merc_a</Template>
+			<Template>units/ptol_infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="263.20893" z="585.01502"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37226"/>
 		</Entity>
 		<Entity uid="5636">
-			<Template>units/ptol_infantry_spearman_merc_a</Template>
+			<Template>units/ptol_infantry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="264.25248" z="586.03022"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11828"/>
 		</Entity>
 		<Entity uid="5637">
-			<Template>units/ptol_infantry_spearman_merc_e</Template>
+			<Template>units/ptol_infantry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="264.57935" z="580.5005"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9270"/>
 		</Entity>
 		<Entity uid="5638">
-			<Template>units/ptol_infantry_spearman_merc_e</Template>
+			<Template>units/ptol_infantry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="266.34986" z="581.98755"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52956"/>
 		</Entity>
 		<Entity uid="5639">
-			<Template>units/ptol_infantry_spearman_merc_e</Template>
+			<Template>units/ptol_infantry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="267.86445" z="583.30353"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23746"/>
 		</Entity>
 		<Entity uid="5640">
-			<Template>units/ptol_infantry_swordsman_merc_b</Template>
+			<Template>units/ptol_infantry_swordsman_b</Template>
 			<Player>1</Player>
 			<Position x="266.7194" z="593.36567"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24078"/>
 		</Entity>
 		<Entity uid="5641">
-			<Template>units/ptol_infantry_swordsman_merc_b</Template>
+			<Template>units/ptol_infantry_swordsman_b</Template>
 			<Player>1</Player>
 			<Position x="268.23908" z="596.5099"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9342"/>
 		</Entity>
 		<Entity uid="5642">
-			<Template>units/ptol_infantry_swordsman_merc_b</Template>
+			<Template>units/ptol_infantry_swordsman_b</Template>
 			<Player>1</Player>
 			<Position x="270.04346" z="598.79877"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28692"/>
 		</Entity>
 		<Entity uid="5643">
-			<Template>units/ptol_infantry_swordsman_merc_a</Template>
+			<Template>units/ptol_infantry_swordsman_a</Template>
 			<Player>1</Player>
 			<Position x="269.23578" z="590.5417"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53768"/>
 		</Entity>
 		<Entity uid="5644">
-			<Template>units/ptol_infantry_swordsman_merc_a</Template>
+			<Template>units/ptol_infantry_swordsman_a</Template>
 			<Player>1</Player>
 			<Position x="270.4871" z="592.66272"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10966"/>
 		</Entity>
 		<Entity uid="5645">
-			<Template>units/ptol_infantry_swordsman_merc_a</Template>
+			<Template>units/ptol_infantry_swordsman_a</Template>
 			<Player>1</Player>
 			<Position x="272.18705" z="594.84162"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14014"/>
 		</Entity>
 		<Entity uid="5646">
-			<Template>units/ptol_infantry_swordsman_merc_e</Template>
+			<Template>units/ptol_infantry_swordsman_e</Template>
 			<Player>1</Player>
 			<Position x="272.29334" z="587.4496"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10686"/>
 		</Entity>
 		<Entity uid="5647">
-			<Template>units/ptol_infantry_swordsman_merc_e</Template>
+			<Template>units/ptol_infantry_swordsman_e</Template>
 			<Player>1</Player>
 			<Position x="273.88151" z="589.58967"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1508"/>
 		</Entity>
 		<Entity uid="5648">
-			<Template>units/ptol_infantry_swordsman_merc_e</Template>
+			<Template>units/ptol_infantry_swordsman_e</Template>
 			<Player>1</Player>
 			<Position x="275.45463" z="591.90735"/>
 			<Orientation y="2.35621"/>
@@ -14491,238 +14491,238 @@
 			<Actor seed="39750"/>
 		</Entity>
 		<Entity uid="5684">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>3</Player>
 			<Position x="1077.73133" z="417.86912"/>
 			<Orientation y="-2.38944"/>
 			<Actor seed="4996"/>
 		</Entity>
 		<Entity uid="5685">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>3</Player>
 			<Position x="1084.71155" z="411.96033"/>
 			<Orientation y="-2.18406"/>
 			<Actor seed="6388"/>
 		</Entity>
 		<Entity uid="5686">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>3</Player>
 			<Position x="1092.1919" z="405.54395"/>
 			<Orientation y="-2.22654"/>
 			<Actor seed="47466"/>
 		</Entity>
 		<Entity uid="5687">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>3</Player>
 			<Position x="1098.48804" z="398.80216"/>
 			<Orientation y="-2.43534"/>
 			<Actor seed="38684"/>
 		</Entity>
 		<Entity uid="5688">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>3</Player>
 			<Position x="1104.52747" z="391.9911"/>
 			<Orientation y="-1.82468"/>
 			<Actor seed="52400"/>
 		</Entity>
 		<Entity uid="5689">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>3</Player>
 			<Position x="1110.90491" z="386.47504"/>
 			<Orientation y="-2.0188"/>
 			<Actor seed="7250"/>
 		</Entity>
 		<Entity uid="5690">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1079.62732" z="440.25095"/>
 			<Orientation y="-2.55692"/>
 			<Actor seed="14494"/>
 		</Entity>
 		<Entity uid="5691">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1082.84192" z="436.2798"/>
 			<Orientation y="-2.6235"/>
 			<Actor seed="20516"/>
 		</Entity>
 		<Entity uid="5692">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1085.14112" z="432.68671"/>
 			<Orientation y="-2.5701"/>
 			<Actor seed="146"/>
 		</Entity>
 		<Entity uid="5693">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1087.80054" z="430.41529"/>
 			<Orientation y="-2.61413"/>
 			<Actor seed="56106"/>
 		</Entity>
 		<Entity uid="5694">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1089.59351" z="433.47373"/>
 			<Orientation y="-2.72483"/>
 			<Actor seed="38164"/>
 		</Entity>
 		<Entity uid="5695">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1087.521" z="434.73725"/>
 			<Orientation y="-2.81611"/>
 			<Actor seed="57884"/>
 		</Entity>
 		<Entity uid="5696">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1084.80823" z="437.48774"/>
 			<Orientation y="-2.7168"/>
 			<Actor seed="796"/>
 		</Entity>
 		<Entity uid="5697">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1081.86878" z="441.735"/>
 			<Orientation y="-2.65319"/>
 			<Actor seed="40626"/>
 		</Entity>
 		<Entity uid="5698">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1085.19459" z="442.2924"/>
 			<Orientation y="-2.72873"/>
 			<Actor seed="2952"/>
 		</Entity>
 		<Entity uid="5699">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1087.43555" z="440.37235"/>
 			<Orientation y="-2.79438"/>
 			<Actor seed="54294"/>
 		</Entity>
 		<Entity uid="5700">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1089.417" z="438.57105"/>
 			<Orientation y="-2.74321"/>
 			<Actor seed="25494"/>
 		</Entity>
 		<Entity uid="5701">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1092.12745" z="436.43778"/>
 			<Orientation y="-2.41227"/>
 			<Actor seed="13946"/>
 		</Entity>
 		<Entity uid="5702">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1087.8805" z="444.83115"/>
 			<Orientation y="-2.50953"/>
 			<Actor seed="774"/>
 		</Entity>
 		<Entity uid="5703">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1090.3855" z="443.01044"/>
 			<Orientation y="-2.42258"/>
 			<Actor seed="61854"/>
 		</Entity>
 		<Entity uid="5704">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1092.61878" z="441.15531"/>
 			<Orientation y="-2.67408"/>
 			<Actor seed="15750"/>
 		</Entity>
 		<Entity uid="5705">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>3</Player>
 			<Position x="1094.9928" z="438.44767"/>
 			<Orientation y="-2.24512"/>
 			<Actor seed="21910"/>
 		</Entity>
 		<Entity uid="5706">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1124.11121" z="395.58817"/>
 			<Orientation y="-2.42309"/>
 			<Actor seed="27534"/>
 		</Entity>
 		<Entity uid="5707">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1125.74158" z="393.64533"/>
 			<Orientation y="-2.41761"/>
 			<Actor seed="59002"/>
 		</Entity>
 		<Entity uid="5708">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1126.64026" z="391.0233"/>
 			<Orientation y="-2.37966"/>
 			<Actor seed="49914"/>
 		</Entity>
 		<Entity uid="5709">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1128.02149" z="388.8967"/>
 			<Orientation y="-2.09385"/>
 			<Actor seed="19218"/>
 		</Entity>
 		<Entity uid="5710">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1126.32105" z="397.37537"/>
 			<Orientation y="-2.2002"/>
 			<Actor seed="51676"/>
 		</Entity>
 		<Entity uid="5711">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1128.11194" z="395.83835"/>
 			<Orientation y="-2.67414"/>
 			<Actor seed="14508"/>
 		</Entity>
 		<Entity uid="5712">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1129.19446" z="393.04954"/>
 			<Orientation y="-2.63028"/>
 			<Actor seed="6542"/>
 		</Entity>
 		<Entity uid="5713">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1130.51661" z="390.60642"/>
 			<Orientation y="-2.13613"/>
 			<Actor seed="41542"/>
 		</Entity>
 		<Entity uid="5714">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1128.36463" z="398.97681"/>
 			<Orientation y="-2.59281"/>
 			<Actor seed="60382"/>
 		</Entity>
 		<Entity uid="5715">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1130.03162" z="396.72736"/>
 			<Orientation y="-2.61858"/>
 			<Actor seed="45622"/>
 		</Entity>
 		<Entity uid="5716">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1131.1902" z="394.69263"/>
 			<Orientation y="-2.42865"/>
 			<Actor seed="2736"/>
 		</Entity>
 		<Entity uid="5717">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="1132.35206" z="391.75455"/>
 			<Orientation y="-2.24843"/>
@@ -14736,70 +14736,70 @@
 			<Actor seed="53422"/>
 		</Entity>
 		<Entity uid="5719">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="1067.65027" z="450.65284"/>
 			<Orientation y="-2.38425"/>
 			<Actor seed="48424"/>
 		</Entity>
 		<Entity uid="5720">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="1070.2024" z="448.92759"/>
 			<Orientation y="-2.35334"/>
 			<Actor seed="54408"/>
 		</Entity>
 		<Entity uid="5721">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="1073.64393" z="446.34375"/>
 			<Orientation y="-2.2391"/>
 			<Actor seed="37204"/>
 		</Entity>
 		<Entity uid="5722">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="1071.98084" z="454.60001"/>
 			<Orientation y="-2.50562"/>
 			<Actor seed="54032"/>
 		</Entity>
 		<Entity uid="5723">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="1074.15687" z="451.0506"/>
 			<Orientation y="-2.57117"/>
 			<Actor seed="41694"/>
 		</Entity>
 		<Entity uid="5724">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="1077.18653" z="448.44819"/>
 			<Orientation y="-2.15787"/>
 			<Actor seed="64594"/>
 		</Entity>
 		<Entity uid="5725">
-			<Template>units/sele_cavalry_spearman_merc_e</Template>
+			<Template>units/sele_cavalry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="1062.69776" z="453.95386"/>
 			<Orientation y="-2.38312"/>
 			<Actor seed="5918"/>
 		</Entity>
 		<Entity uid="5726">
-			<Template>units/sele_cavalry_spearman_merc_e</Template>
+			<Template>units/sele_cavalry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="1059.27857" z="456.34147"/>
 			<Orientation y="-2.58765"/>
 			<Actor seed="7566"/>
 		</Entity>
 		<Entity uid="5727">
-			<Template>units/sele_cavalry_spearman_merc_e</Template>
+			<Template>units/sele_cavalry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="1062.76136" z="458.60776"/>
 			<Orientation y="-2.31714"/>
 			<Actor seed="36912"/>
 		</Entity>
 		<Entity uid="5728">
-			<Template>units/sele_cavalry_spearman_merc_e</Template>
+			<Template>units/sele_cavalry_spearman_e</Template>
 			<Player>3</Player>
 			<Position x="1065.84485" z="457.18204"/>
 			<Orientation y="-2.45392"/>
@@ -14953,63 +14953,63 @@
 			<Actor seed="53530"/>
 		</Entity>
 		<Entity uid="5750">
-			<Template>units/sele_infantry_swordsman_merc_a</Template>
+			<Template>units/sele_infantry_swordsman_a</Template>
 			<Player>3</Player>
 			<Position x="1121.46253" z="398.89673"/>
 			<Orientation y="-2.41265"/>
 			<Actor seed="61830"/>
 		</Entity>
 		<Entity uid="5751">
-			<Template>units/sele_infantry_swordsman_merc_a</Template>
+			<Template>units/sele_infantry_swordsman_a</Template>
 			<Player>3</Player>
 			<Position x="1123.57154" z="400.45908"/>
 			<Orientation y="-2.45034"/>
 			<Actor seed="4244"/>
 		</Entity>
 		<Entity uid="5752">
-			<Template>units/sele_infantry_swordsman_merc_a</Template>
+			<Template>units/sele_infantry_swordsman_a</Template>
 			<Player>3</Player>
 			<Position x="1125.99463" z="401.27634"/>
 			<Orientation y="-2.14634"/>
 			<Actor seed="21726"/>
 		</Entity>
 		<Entity uid="5753">
-			<Template>units/sele_infantry_swordsman_merc_e</Template>
+			<Template>units/sele_infantry_swordsman_e</Template>
 			<Player>3</Player>
 			<Position x="1119.71448" z="401.77887"/>
 			<Orientation y="-2.48272"/>
 			<Actor seed="16714"/>
 		</Entity>
 		<Entity uid="5754">
-			<Template>units/sele_infantry_swordsman_merc_e</Template>
+			<Template>units/sele_infantry_swordsman_e</Template>
 			<Player>3</Player>
 			<Position x="1122.14283" z="403.25498"/>
 			<Orientation y="-2.60358"/>
 			<Actor seed="33960"/>
 		</Entity>
 		<Entity uid="5755">
-			<Template>units/sele_infantry_swordsman_merc_e</Template>
+			<Template>units/sele_infantry_swordsman_e</Template>
 			<Player>3</Player>
 			<Position x="1123.70545" z="404.25355"/>
 			<Orientation y="-2.08074"/>
 			<Actor seed="46850"/>
 		</Entity>
 		<Entity uid="5756">
-			<Template>units/sele_infantry_swordsman_merc_e</Template>
+			<Template>units/sele_infantry_swordsman_e</Template>
 			<Player>3</Player>
 			<Position x="1117.40772" z="404.43894"/>
 			<Orientation y="-2.26676"/>
 			<Actor seed="31996"/>
 		</Entity>
 		<Entity uid="5757">
-			<Template>units/sele_infantry_swordsman_merc_e</Template>
+			<Template>units/sele_infantry_swordsman_e</Template>
 			<Player>3</Player>
 			<Position x="1120.17005" z="405.67414"/>
 			<Orientation y="-2.16396"/>
 			<Actor seed="40138"/>
 		</Entity>
 		<Entity uid="5758">
-			<Template>units/sele_infantry_swordsman_merc_e</Template>
+			<Template>units/sele_infantry_swordsman_e</Template>
 			<Player>3</Player>
 			<Position x="1121.90882" z="409.28183"/>
 			<Orientation y="-2.31318"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
@@ -11171,7 +11171,7 @@
 			<Actor seed="19502"/>
 		</Entity>
 		<Entity uid="1896">
-			<Template>units/ptol_champion_juggernaut</Template>
+			<Template>units/ptol_champion_juggernaut_wargalley</Template>
 			<Player>1</Player>
 			<Position x="708.85682" z="658.38196"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Romans.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Romans.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Romans.xml
@@ -11140,140 +11140,140 @@
 			<Actor seed="14224"/>
 		</Entity>
 		<Entity uid="2452">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="697.94465" z="278.5384"/>
 			<Orientation y="-2.26844"/>
 			<Actor seed="48952"/>
 		</Entity>
 		<Entity uid="2453">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="694.47535" z="279.77384"/>
 			<Orientation y="-2.32308"/>
 			<Actor seed="57702"/>
 		</Entity>
 		<Entity uid="2454">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="690.32264" z="282.41266"/>
 			<Orientation y="-2.40851"/>
 			<Actor seed="57104"/>
 		</Entity>
 		<Entity uid="2455">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="687.39924" z="284.15885"/>
 			<Orientation y="-2.5154"/>
 			<Actor seed="33874"/>
 		</Entity>
 		<Entity uid="2456">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="683.26966" z="285.07007"/>
 			<Orientation y="-2.37853"/>
 			<Actor seed="55596"/>
 		</Entity>
 		<Entity uid="2457">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="678.91388" z="279.96866"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19604"/>
 		</Entity>
 		<Entity uid="2458">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="677.3791" z="277.80384"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51358"/>
 		</Entity>
 		<Entity uid="2459">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="675.84021" z="276.56293"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49226"/>
 		</Entity>
 		<Entity uid="2460">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="679.41926" z="273.60987"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19906"/>
 		</Entity>
 		<Entity uid="2461">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="680.52515" z="275.79371"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41036"/>
 		</Entity>
 		<Entity uid="2462">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="682.13685" z="277.71335"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11960"/>
 		</Entity>
 		<Entity uid="2463">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="682.82105" z="271.11585"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3238"/>
 		</Entity>
 		<Entity uid="2464">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="684.27674" z="273.4944"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1318"/>
 		</Entity>
 		<Entity uid="2465">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="685.57355" z="275.1922"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23338"/>
 		</Entity>
 		<Entity uid="2466">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="681.32941" z="269.18403"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14204"/>
 		</Entity>
 		<Entity uid="2467">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="677.41077" z="271.30683"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45266"/>
 		</Entity>
 		<Entity uid="2468">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="673.52417" z="273.59775"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40390"/>
 		</Entity>
 		<Entity uid="2469">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="672.55604" z="270.36432"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49270"/>
 		</Entity>
 		<Entity uid="2470">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="675.55665" z="268.83063"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16036"/>
 		</Entity>
 		<Entity uid="2471">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="678.40546" z="266.88263"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
@@ -10387,63 +10387,63 @@
 			<Actor seed="52308"/>
 		</Entity>
 		<Entity uid="2541">
-			<Template>units/sele_infantry_archer_merc_b</Template>
+			<Template>units/sele_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="514.80457" z="196.2299"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48770"/>
 		</Entity>
 		<Entity uid="2542">
-			<Template>units/sele_infantry_archer_merc_b</Template>
+			<Template>units/sele_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="517.51063" z="197.8482"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51664"/>
 		</Entity>
 		<Entity uid="2543">
-			<Template>units/sele_infantry_archer_merc_b</Template>
+			<Template>units/sele_infantry_archer_b</Template>
 			<Player>1</Player>
 			<Position x="519.89386" z="199.94105"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22856"/>
 		</Entity>
 		<Entity uid="2544">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="518.44178" z="192.6743"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3044"/>
 		</Entity>
 		<Entity uid="2545">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="520.28235" z="194.23798"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="20266"/>
 		</Entity>
 		<Entity uid="2546">
-			<Template>units/sele_infantry_archer_merc_a</Template>
+			<Template>units/sele_infantry_archer_a</Template>
 			<Player>1</Player>
 			<Position x="522.08832" z="196.56276"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39722"/>
 		</Entity>
 		<Entity uid="2547">
-			<Template>units/sele_infantry_archer_merc_e</Template>
+			<Template>units/sele_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="521.88593" z="188.98096"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60256"/>
 		</Entity>
 		<Entity uid="2548">
-			<Template>units/sele_infantry_archer_merc_e</Template>
+			<Template>units/sele_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="523.79334" z="191.92801"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10670"/>
 		</Entity>
 		<Entity uid="2549">
-			<Template>units/sele_infantry_archer_merc_e</Template>
+			<Template>units/sele_infantry_archer_e</Template>
 			<Player>1</Player>
 			<Position x="525.48438" z="194.37983"/>
 			<Orientation y="2.35621"/>
@@ -10639,63 +10639,63 @@
 			<Actor seed="8056"/>
 		</Entity>
 		<Entity uid="2577">
-			<Template>units/sele_cavalry_spearman_merc_b</Template>
+			<Template>units/sele_cavalry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="555.02918" z="246.14907"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26958"/>
 		</Entity>
 		<Entity uid="2578">
-			<Template>units/sele_cavalry_spearman_merc_b</Template>
+			<Template>units/sele_cavalry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="557.75336" z="249.12607"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32380"/>
 		</Entity>
 		<Entity uid="2579">
-			<Template>units/sele_cavalry_spearman_merc_b</Template>
+			<Template>units/sele_cavalry_spearman_b</Template>
 			<Player>1</Player>
 			<Position x="562.3849" z="252.4245"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="30286"/>
 		</Entity>
 		<Entity uid="2580">
-			<Template>units/sele_cavalry_spearman_merc_a</Template>
+			<Template>units/sele_cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="560.2693" z="241.46251"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48302"/>
 		</Entity>
 		<Entity uid="2581">
-			<Template>units/sele_cavalry_spearman_merc_a</Template>
+			<Template>units/sele_cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="562.94129" z="244.05607"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29790"/>
 		</Entity>
 		<Entity uid="2582">
-			<Template>units/sele_cavalry_spearman_merc_a</Template>
+			<Template>units/sele_cavalry_spearman_a</Template>
 			<Player>1</Player>
 			<Position x="566.22114" z="246.91419"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4900"/>
 		</Entity>
 		<Entity uid="2583">
-			<Template>units/sele_cavalry_spearman_merc_e</Template>
+			<Template>units/sele_cavalry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="564.4245" z="235.41486"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27728"/>
 		</Entity>
 		<Entity uid="2584">
-			<Template>units/sele_cavalry_spearman_merc_e</Template>
+			<Template>units/sele_cavalry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="566.3412" z="237.73276"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14330"/>
 		</Entity>
 		<Entity uid="2585">
-			<Template>units/sele_cavalry_spearman_merc_e</Template>
+			<Template>units/sele_cavalry_spearman_e</Template>
 			<Player>1</Player>
 			<Position x="569.70618" z="240.97005"/>
 			<Orientation y="2.35621"/>
@@ -10758,77 +10758,77 @@
 			<Actor seed="22986"/>
 		</Entity>
 		<Entity uid="2595">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="446.637" z="182.60904"/>
 			<Orientation y="-2.54589"/>
 			<Actor seed="27974"/>
 		</Entity>
 		<Entity uid="2596">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="452.75553" z="187.34266"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23338"/>
 		</Entity>
 		<Entity uid="2597">
-			<Template>units/sele_champion_elephant</Template>
+			<Template>units/sele_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="460.00998" z="194.69658"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62464"/>
 		</Entity>
 		<Entity uid="2601">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="435.95667" z="158.67568"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56576"/>
 		</Entity>
 		<Entity uid="2602">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="438.04722" z="160.58298"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="7738"/>
 		</Entity>
 		<Entity uid="2603">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="439.94141" z="162.59337"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35086"/>
 		</Entity>
 		<Entity uid="2604">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="442.51008" z="163.79409"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64494"/>
 		</Entity>
 		<Entity uid="2605">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="445.76221" z="160.30477"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19614"/>
 		</Entity>
 		<Entity uid="2606">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="442.74802" z="158.94582"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38004"/>
 		</Entity>
 		<Entity uid="2607">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="440.61762" z="157.2553"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60836"/>
 		</Entity>
 		<Entity uid="2608">
-			<Template>units/sele_champion_infantry_swordsman</Template>
+			<Template>units/sele_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="439.1962" z="154.9276"/>
 			<Orientation y="2.35621"/>
@@ -11350,98 +11350,98 @@
 			<Actor seed="34984"/>
 		</Entity>
 		<Entity uid="2684">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="456.47831" z="179.53028"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="30888"/>
 		</Entity>
 		<Entity uid="2685">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="458.1201" z="181.32413"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4088"/>
 		</Entity>
 		<Entity uid="2686">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="459.48441" z="183.39869"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21760"/>
 		</Entity>
 		<Entity uid="2687">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="461.04697" z="184.55674"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59106"/>
 		</Entity>
 		<Entity uid="2688">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="464.46357" z="179.90174"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2216"/>
 		</Entity>
 		<Entity uid="2689">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="462.5546" z="178.3364"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="44522"/>
 		</Entity>
 		<Entity uid="2690">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="461.21451" z="177.01825"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27594"/>
 		</Entity>
 		<Entity uid="2691">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>1</Player>
 			<Position x="459.25358" z="175.64475"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16668"/>
 		</Entity>
 		<Entity uid="2692">
-			<Template>units/sele_champion_chariot</Template>
+			<Template>units/sele_champion_scythed_chariot</Template>
 			<Player>1</Player>
 			<Position x="415.46854" z="161.95554"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56896"/>
 		</Entity>
 		<Entity uid="2693">
-			<Template>units/sele_champion_chariot</Template>
+			<Template>units/sele_champion_scythed_chariot</Template>
 			<Player>1</Player>
 			<Position x="407.41611" z="154.04928"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34838"/>
 		</Entity>
 		<Entity uid="2694">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="432.70316" z="163.19355"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40492"/>
 		</Entity>
 		<Entity uid="2695">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="435.92402" z="166.5554"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14394"/>
 		</Entity>
 		<Entity uid="2696">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="430.58671" z="172.46564"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63800"/>
 		</Entity>
 		<Entity uid="2697">
-			<Template>units/sele_champion_cavalry</Template>
+			<Template>units/sele_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="427.27588" z="168.59752"/>
 			<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
@@ -4313,28 +4313,28 @@
 			<Actor seed="28818"/>
 		</Entity>
 		<Entity uid="863">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="649.09424" z="1382.45093"/>
 			<Orientation y="-2.39368"/>
 			<Actor seed="39026"/>
 		</Entity>
 		<Entity uid="864">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="651.99018" z="1380.40015"/>
 			<Orientation y="-2.38286"/>
 			<Actor seed="24508"/>
 		</Entity>
 		<Entity uid="865">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="654.69318" z="1378.8252"/>
 			<Orientation y="-2.44008"/>
 			<Actor seed="43400"/>
 		</Entity>
 		<Entity uid="866">
-			<Template>units/spart_champion_infantry_spear</Template>
+			<Template>units/spart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="657.62531" z="1377.14893"/>
 			<Orientation y="-2.10586"/>
Index: binaries/data/mods/public/maps/scenarios/Territory Demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Territory Demo.xml
+++ binaries/data/mods/public/maps/scenarios/Territory Demo.xml
@@ -293,13 +293,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="49">
-			<Template>units/cart_champion_cavalry</Template>
+			<Template>units/cart_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="547.78626" z="339.26069"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="50">
-			<Template>units/cart_champion_infantry</Template>
+			<Template>units/cart_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="553.37232" z="350.95719"/>
 			<Orientation y="2.35621"/>
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
@@ -491,7 +491,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="162">
-			<Template>units/athen_infantry_marine_archer_b</Template>
+			<Template>units/athen_infantry_archer_b</Template>
 			<Player>2</Player>
 			<Position x="608.51893" z="160.90159"/>
 			<Orientation y="2.20643"/>
@@ -16468,61 +16468,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3377">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="137.2194" z="583.54969"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3378">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="136.1622" z="581.76038"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3379">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="134.71973" z="580.3125"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3380">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="133.25222" z="578.27088"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3381">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="131.77521" z="576.57837"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3382">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="129.5359" z="578.61963"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3383">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="131.35792" z="580.4178"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3384">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="132.81705" z="582.42298"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3385">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="133.95095" z="584.01716"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3386">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="135.39594" z="585.9264"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/The Persian Gates.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/The Persian Gates.xml
+++ binaries/data/mods/public/maps/scenarios/The Persian Gates.xml
@@ -112,103 +112,103 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="175">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="368.84815" z="999.83875"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="176">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="369.90635" z="1002.00086"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="177">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="371.50129" z="1003.425"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="178">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="372.3318" z="1005.44239"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="179">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="373.44321" z="1007.19355"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="180">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="374.09223" z="1009.44324"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="181">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="371.30857" z="997.93628"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="182">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="372.43955" z="999.87598"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="183">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="373.30127" z="1001.67078"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="184">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="374.24976" z="1003.85163"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="185">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="375.25187" z="1005.79859"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="186">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>1</Player>
 			<Position x="376.3625" z="1008.18165"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="197">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="367.6359" z="976.15101"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="198">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="368.93833" z="977.9823"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="199">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="369.94904" z="979.70435"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="200">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="371.97571" z="982.17438"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="201">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="373.95676" z="983.83851"/>
 			<Orientation y="2.35621"/>
@@ -6316,73 +6316,73 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1249">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1230.90857" z="599.86304"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1250">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1234.33436" z="602.97925"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1251">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1236.98694" z="606.4109"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1252">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1239.9253" z="608.49836"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1253">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1242.91871" z="610.83869"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1254">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1245.88135" z="613.74244"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1255">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1235.72889" z="595.65455"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1256">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1239.22876" z="598.47205"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1257">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1240.96473" z="600.53644"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1258">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1243.36182" z="602.55549"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1259">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1246.14905" z="604.80433"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1260">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>4</Player>
 			<Position x="1249.03077" z="607.91645"/>
 			<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
@@ -706,91 +706,91 @@
 			<Orientation y="-2.41251"/>
 		</Entity>
 		<Entity uid="157">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="748.40143" z="320.85935"/>
 			<Orientation y="-1.45676"/>
 		</Entity>
 		<Entity uid="158">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="749.81946" z="323.38004"/>
 			<Orientation y="-0.64757"/>
 		</Entity>
 		<Entity uid="159">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="749.02704" z="322.13352"/>
 			<Orientation y="-0.6842"/>
 		</Entity>
 		<Entity uid="160">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="750.83027" z="324.94101"/>
 			<Orientation y="-0.91021"/>
 		</Entity>
 		<Entity uid="161">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="749.26874" z="318.9329"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="162">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="750.3722" z="320.36518"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="163">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="751.3166" z="321.82981"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="164">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="752.14954" z="322.97065"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="165">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="750.6858" z="317.78827"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="166">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="751.79554" z="318.88907"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="167">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="752.74683" z="320.7836"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="168">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="753.66028" z="322.29087"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="169">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="752.53577" z="324.73829"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="170">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="754.0799" z="323.94416"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="171">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="747.43287" z="319.61271"/>
 			<Orientation y="-0.87256"/>
@@ -886,151 +886,151 @@
 			<Orientation y="1.54017"/>
 		</Entity>
 		<Entity uid="190">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="239.13569" z="429.45075"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="191">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="240.30942" z="431.59308"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="192">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="242.08483" z="432.95603"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="193">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="243.57212" z="435.55542"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="194">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="244.83097" z="436.5511"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="195">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="246.13878" z="438.26578"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="196">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="247.95464" z="440.16813"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="197">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="249.60674" z="442.0232"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="198">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="250.90391" z="443.90265"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="199">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="237.93676" z="427.94282"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="200">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="240.48899" z="426.03583"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="201">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="241.6846" z="427.78663"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="202">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="242.67103" z="428.90159"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="203">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="244.34163" z="430.99622"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="204">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="246.01688" z="432.8292"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="205">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="247.6679" z="434.72913"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="206">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="249.04462" z="435.97785"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="207">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="250.1075" z="437.65784"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="208">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="251.71326" z="438.96506"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="209">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="252.63048" z="440.6631"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="210">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="247.61861" z="446.56507"/>
 			<Orientation y="-2.1504"/>
 		</Entity>
 		<Entity uid="211">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="245.24283" z="448.69813"/>
 			<Orientation y="-2.08204"/>
 		</Entity>
 		<Entity uid="212">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="244.00771" z="451.59095"/>
 			<Orientation y="-2.03594"/>
 		</Entity>
 		<Entity uid="213">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="241.0919" z="453.58735"/>
 			<Orientation y="-2.23031"/>
 		</Entity>
 		<Entity uid="214">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="238.91353" z="455.67756"/>
 			<Orientation y="-2.08822"/>
@@ -1162,61 +1162,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="238">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="774.64765" z="280.30564"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="239">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="777.67402" z="282.66361"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="240">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="780.49244" z="285.17847"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="241">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="782.78382" z="287.74027"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="242">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="785.19098" z="290.20731"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="243">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="771.45344" z="283.44605"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="244">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="773.80762" z="285.17847"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="245">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="775.5896" z="287.48908"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="246">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="777.81855" z="289.54358"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="247">
-			<Template>units/mace_champion_cavalry</Template>
+			<Template>units/mace_champion_spear_cavalry</Template>
 			<Player>2</Player>
 			<Position x="780.1377" z="292.2642"/>
 			<Orientation y="2.35621"/>
@@ -1282,361 +1282,361 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="258">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</Template>
 			<Player>3</Player>
 			<Position x="285.1778" z="382.57755"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="278">
-			<Template>units/cart_champion_cavalry</Template>
+			<Template>units/cart_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="248.74459" z="340.59177"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="279">
-			<Template>units/cart_champion_cavalry</Template>
+			<Template>units/cart_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="252.63833" z="344.081"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="280">
-			<Template>units/cart_champion_cavalry</Template>
+			<Template>units/cart_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="255.24369" z="348.42963"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="281">
-			<Template>units/cart_champion_cavalry</Template>
+			<Template>units/cart_champion_spear_cavalry</Template>
 			<Player>3</Player>
 			<Position x="258.58851" z="352.35737"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="282">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</Template>
 			<Player>2</Player>
 			<Position x="763.80695" z="287.57538"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="302">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="760.21357" z="297.43174"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="303">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="761.36615" z="299.04764"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="304">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="762.35084" z="300.6067"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="305">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="763.34473" z="301.92954"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="306">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="764.4546" z="303.59507"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="307">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="766.37623" z="302.52588"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="308">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="764.90668" z="300.05063"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="309">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="763.76435" z="298.88538"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="310">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="762.83454" z="297.52143"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="311">
-			<Template>units/mace_champion_infantry_a</Template>
+			<Template>units/mace_champion_hoplite_infantry</Template>
 			<Player>2</Player>
 			<Position x="761.80823" z="296.35279"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="312">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="746.97608" z="318.31733"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="313">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="748.72071" z="317.12906"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="314">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="750.11695" z="316.23774"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="315">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="749.78199" z="314.82508"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="316">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="747.964" z="316.03605"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="317">
-			<Template>units/sele_champion_infantry_pikeman</Template>
+			<Template>units/sele_champion_pike_infantry</Template>
 			<Player>2</Player>
 			<Position x="746.55402" z="316.61634"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Tropical Island.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Tropical Island.xml
+++ binaries/data/mods/public/maps/scenarios/Tropical Island.xml
@@ -1807,19 +1807,19 @@
 			<Orientation y="3.06269"/>
 		</Entity>
 		<Entity uid="504">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="610.40888" z="352.73621"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="505">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="614.99683" z="344.09598"/>
 			<Orientation y="-2.7891"/>
 		</Entity>
 		<Entity uid="506">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>2</Player>
 			<Position x="609.98493" z="343.63776"/>
 			<Orientation y="0.53388"/>
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
@@ -254,433 +254,433 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="194">
-			<Template>units/mace_thureophoros</Template>
+			<Template>units/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_javelin_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="505.01401" z="235.59617"/>
 			<Orientation y="-0.67551"/>
@@ -1526,181 +1526,181 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="415">
-			<Template>units/mace_thorakites</Template>
+			<Template>units/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</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/mace_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="445.75712" z="185.22748"/>
 			<Orientation y="-0.36638"/>
Index: binaries/data/mods/public/maps/scenarios/road demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/road demo.xml
+++ binaries/data/mods/public/maps/scenarios/road demo.xml
@@ -455,7 +455,7 @@
 			<Orientation y="0.51355"/>
 		</Entity>
 		<Entity uid="116">
-			<Template>units/pers_champion_cavalry</Template>
+			<Template>units/pers_champion_spear_cavalry</Template>
 			<Player>1</Player>
 			<Position x="339.81162" z="395.43107"/>
 			<Orientation y="-2.06785"/>
@@ -515,19 +515,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="127">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="282.82361" z="337.56321"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="130">
-			<Template>units/pers_champion_elephant</Template>
+			<Template>units/pers_champion_war_elephant</Template>
 			<Player>1</Player>
 			<Position x="235.01026" z="313.00052"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="131">
-			<Template>units/pers_champion_infantry</Template>
+			<Template>units/pers_champion_spear_infantry</Template>
 			<Player>1</Player>
 			<Position x="261.49714" z="287.48682"/>
 			<Orientation y="0.67197"/>
@@ -539,7 +539,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="133">
-			<Template>units/rome_champion_cavalry</Template>
+			<Template>units/rome_champion_sword_cavalry</Template>
 			<Player>1</Player>
 			<Position x="253.3309" z="333.6291"/>
 			<Orientation y="-2.39867"/>
@@ -557,7 +557,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="136">
-			<Template>units/rome_champion_infantry</Template>
+			<Template>units/rome_champion_sword_infantry</Template>
 			<Player>1</Player>
 			<Position x="305.20514" z="373.64271"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml
+++ binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml
@@ -2953,21 +2953,21 @@
 			<Actor seed="43932"/>
 		</Entity>
 		<Entity uid="3400">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_infantry</Template>
 			<Player>0</Player>
 			<Position x="776.43134" z="231.45167"/>
 			<Orientation y="-1.44887"/>
 			<Actor seed="41296"/>
 		</Entity>
 		<Entity uid="3401">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_infantry</Template>
 			<Player>0</Player>
 			<Position x="775.92957" z="226.9015"/>
 			<Orientation y="-1.31069"/>
 			<Actor seed="27960"/>
 		</Entity>
 		<Entity uid="3402">
-			<Template>units/gaul_champion_infantry</Template>
+			<Template>units/gaul_champion_sword_infantry</Template>
 			<Player>0</Player>
 			<Position x="777.64295" z="234.8532"/>
 			<Orientation y="-1.20908"/>
Index: binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml
+++ binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml
@@ -7884,13 +7884,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3106">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>0</Player>
 			<Position x="2471.75806" z="1794.8473"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3107">
-			<Template>units/athen_infantry_marine_archer_e</Template>
+			<Template>units/athen_infantry_archer_e</Template>
 			<Player>0</Player>
 			<Position x="2467.57154" z="1796.04798"/>
 			<Orientation y="2.93371"/>
Index: binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml
+++ binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml
@@ -2257,14 +2257,14 @@
 			<Actor seed="64856"/>
 		</Entity>
 		<Entity uid="620">
-			<Template>units/brit_champion_infantry</Template>
+			<Template>units/brit_champion_sword_infantry</Template>
 			<Player>0</Player>
 			<Position x="378.47928" z="308.23377"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3898"/>
 		</Entity>
 		<Entity uid="621">
-			<Template>units/gaul_champion_fanatic</Template>
+			<Template>units/gaul_champion_spear_infantry</Template>
 			<Player>0</Player>
 			<Position x="372.90488" z="291.26511"/>
 			<Orientation y="2.35621"/>
@@ -2292,7 +2292,7 @@
 			<Actor seed="56538"/>
 		</Entity>
 		<Entity uid="625">
-			<Template>units/gaul_champion_cavalry</Template>
+			<Template>units/gaul_champion_spear_cavalry</Template>
 			<Player>0</Player>
 			<Position x="390.09305" z="336.75705"/>
 			<Orientation y="-3.08585"/>
Index: binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.xml
===================================================================
--- binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.xml
+++ binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <Scenario version="6">
-	<Environment>
-		<SkySet>default</SkySet>
-		<SunColor r="0.74902" g="0.74902" b="0.74902"/>
-		<SunElevation angle="0.785398"/>
-		<SunRotation angle="-0.785396"/>
-		<TerrainAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
-		<UnitsAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
-		<Fog>
-			<FogFactor>0.00136719</FogFactor>
-			<FogThickness>0.205078</FogThickness>
-			<FogColor r="0.8" g="0.8" b="0.894118"/>
-		</Fog>
-		<Water>
-			<WaterBody>
-				<Type>lake</Type>
-				<Color r="0.286275" g="0.27451" b="0.0901961"/>
-				<Height>19.2</Height>
-				<Waviness>4.0</Waviness>
-				<Murkiness>0.916016</Murkiness>
-				<Tint r="0.192157" g="0.247059" b="0.137255"/>
-			</WaterBody>
-		</Water>
-		<Postproc>
-			<Brightness>0</Brightness>
-			<Contrast>0.995117</Contrast>
-			<Saturation>0.99</Saturation>
-			<Bloom>0.2</Bloom>
-			<PostEffect>default</PostEffect>
-		</Postproc>
-	</Environment>
-	<Camera>
-		<Position x="273.979" y="91.5398" z="14.4478"/>
-		<Rotation angle="0"/>
-		<Declination angle="0.610865"/>
-	</Camera>
-	<ScriptSettings><![CDATA[
+  <Environment>
+    <SkySet>default</SkySet>
+    <SunColor r="0.74902" g="0.74902" b="0.74902"/>
+    <SunElevation angle="0.785398"/>
+    <SunRotation angle="-0.785396"/>
+    <TerrainAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
+    <UnitsAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
+    <Fog>
+      <FogFactor>0.00136719</FogFactor>
+      <FogThickness>0.205078</FogThickness>
+      <FogColor r="0.8" g="0.8" b="0.894118"/>
+    </Fog>
+    <Water>
+      <WaterBody>
+        <Type>lake</Type>
+        <Color r="0.286275" g="0.27451" b="0.0901961"/>
+        <Height>19.2</Height>
+        <Waviness>4.0</Waviness>
+        <Murkiness>0.916016</Murkiness>
+        <Tint r="0.192157" g="0.247059" b="0.137255"/>
+      </WaterBody>
+    </Water>
+    <Postproc>
+      <Brightness>0</Brightness>
+      <Contrast>0.995117</Contrast>
+      <Saturation>0.99</Saturation>
+      <Bloom>0.2</Bloom>
+      <PostEffect>default</PostEffect>
+    </Postproc>
+  </Environment>
+  <Camera>
+    <Position x="273.979" y="91.5398" z="14.4478"/>
+    <Rotation angle="0"/>
+    <Declination angle="0.610865"/>
+  </Camera>
+  <ScriptSettings><![CDATA[
 {
   "CircularMap": true,
   "Description": "This is a basic tutorial to get you started playing 0 A.D.",
@@ -89,4788 +89,4788 @@
   ]
 }
 ]]></ScriptSettings>
-	<Entities>
-		<Entity uid="11">
-			<Template>structures/spart_civil_centre</Template>
-			<Player>1</Player>
-			<Position x="273.9791" z="112.74604"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="12">
-			<Template>structures/athen_civil_centre</Template>
-			<Player>2</Player>
-			<Position x="206.77826" z="573.94031"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="28">
-			<Template>units/spart_support_female_citizen</Template>
-			<Player>1</Player>
-			<Position x="295.27" z="117.63486"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="29">
-			<Template>units/spart_support_female_citizen</Template>
-			<Player>1</Player>
-			<Position x="294.702" z="108.062"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="30">
-			<Template>units/spart_support_female_citizen</Template>
-			<Player>1</Player>
-			<Position x="298.45057" z="112.34449"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="31">
-			<Template>actor|props/flora/bush.xml</Template>
-			<Position x="311.87916" z="40.33628"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="32">
-			<Template>actor|props/flora/bush.xml</Template>
-			<Position x="336.331" z="37.07163"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="33">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="316.32712" z="39.04838"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="34">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="315.12186" z="36.18021"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="35">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="332.34989" z="40.98403"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="36">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="328.94983" z="36.1786"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="37">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="331.00867" z="26.1484"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="38">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="308.4409" z="29.40123"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="39">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="309.6757" z="44.43873"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="40">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="314.14502" z="55.05442"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="41">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="338.24317" z="52.09615"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="45">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="332.3046" z="21.46665"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="46">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="333.19233" z="23.8357"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="47">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="331.48215" z="23.20743"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="48">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="330.5528" z="22.21087"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="49">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="330.87052" z="19.96854"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="50">
-			<Template>actor|props/flora/bush_medit_underbrush.xml</Template>
-			<Position x="304.12043" z="23.89312"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="51">
-			<Template>actor|props/flora/bush_medit_underbrush.xml</Template>
-			<Position x="302.01688" z="14.60314"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="52">
-			<Template>actor|props/flora/bush_medit_underbrush.xml</Template>
-			<Position x="311.28263" z="18.11367"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="53">
-			<Template>actor|props/flora/bush_tempe_a.xml</Template>
-			<Position x="334.68326" z="43.28914"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="54">
-			<Template>actor|props/flora/bush_tempe_a.xml</Template>
-			<Position x="333.25794" z="46.73554"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="55">
-			<Template>actor|props/flora/bush_tempe_a.xml</Template>
-			<Position x="333.60325" z="31.57432"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="56">
-			<Template>actor|props/flora/bush_tempe_a.xml</Template>
-			<Position x="314.75351" z="30.6906"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="57">
-			<Template>actor|props/flora/bush_tempe_a.xml</Template>
-			<Position x="311.83741" z="29.94072"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="58">
-			<Template>actor|props/flora/bush_tempe_b.xml</Template>
-			<Position x="332.42573" z="34.95893"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="59">
-			<Template>actor|props/flora/bush_tempe_b.xml</Template>
-			<Position x="339.87766" z="41.4277"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="60">
-			<Template>actor|props/flora/bush_tempe_b.xml</Template>
-			<Position x="321.1826" z="40.10346"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="61">
-			<Template>actor|props/flora/bush_tempe_b.xml</Template>
-			<Position x="317.46207" z="41.88428"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="62">
-			<Template>actor|props/flora/bush_tempe_b.xml</Template>
-			<Position x="314.14264" z="45.12787"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="63">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="352.23047" z="110.73655"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="64">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="342.6389" z="125.23243"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="65">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="355.7504" z="125.30983"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="66">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="368.89283" z="117.95693"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="67">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="361.53272" z="109.70215"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="68">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="348.25791" z="131.26566"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="69">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="343.88404" z="114.54667"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="70">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="333.96525" z="130.08533"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="71">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="349.21842" z="105.67501"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="72">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="356.37183" z="103.86101"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="73">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="344.58646" z="99.90734"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="74">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="343.64243" z="108.88508"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="75">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="338.73667" z="115.786"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="76">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="339.69248" z="106.92482"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="77">
-			<Template>actor|props/flora/bush_medit_me_lush.xml</Template>
-			<Position x="341.50355" z="105.46235"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="78">
-			<Template>actor|props/flora/bush_medit_me_lush.xml</Template>
-			<Position x="335.80094" z="109.60636"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="79">
-			<Template>actor|props/flora/bush_medit_me_lush.xml</Template>
-			<Position x="331.42676" z="13.79944"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="80">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="329.0695" z="17.64138"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="81">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="338.01383" z="38.49915"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="82">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="337.65522" z="37.25264"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="83">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="338.03315" z="34.70882"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="84">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="334.96073" z="32.61797"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="85">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="334.27326" z="34.46485"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="86">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="333.71763" z="37.42101"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="87">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="336.20194" z="34.38773"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="88">
-			<Template>actor|props/flora/bush_tempe_me_dry.xml</Template>
-			<Position x="335.23304" z="30.20907"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="89">
-			<Template>actor|props/flora/bush_tempe_me_lush.xml</Template>
-			<Position x="313.23563" z="28.3107"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="90">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="313.1486" z="24.4542"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="91">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="306.82251" z="23.33655"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="92">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="302.2389" z="14.03611"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="93">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="333.20566" z="17.19762"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="94">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="333.21177" z="18.03217"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="95">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="328.55057" z="18.15554"/>
-			<Orientation y="-2.52764"/>
-		</Entity>
-		<Entity uid="101">
-			<Template>structures/spart_gerousia</Template>
-			<Player>1</Player>
-			<Position x="219.715" z="155.47907"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="102">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="254.47297" z="28.77331"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="103">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="248.95542" z="30.60622"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="104">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="256.2472" z="31.99848"/>
-			<Orientation y="-1.52941"/>
-		</Entity>
-		<Entity uid="105">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="249.86835" z="31.41152"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="106">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="260.41697" z="35.74132"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="107">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="250.29233" z="34.07108"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="108">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="259.45917" z="28.83437"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="109">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="252.98179" z="36.87697"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="110">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="196.78718" z="54.34076"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="111">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="199.62363" z="57.70708"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="112">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="194.16996" z="60.04773"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="113">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="199.09037" z="62.7639"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="114">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="198.93891" z="56.99227"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="115">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="194.05283" z="57.22164"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="116">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="194.92334" z="59.8069"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="117">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="196.19568" z="62.01072"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="118">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="247.84925" z="35.21077"/>
-			<Orientation y="-1.25675"/>
-		</Entity>
-		<Entity uid="119">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="245.8508" z="35.89704"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="120">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="247.88974" z="38.46592"/>
-			<Orientation y="1.19042"/>
-		</Entity>
-		<Entity uid="121">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="253.18064" z="40.8498"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="122">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="259.60834" z="43.0568"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="123">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="254.81455" z="43.21915"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="124">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="255.90491" z="39.49312"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="125">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="268.30671" z="33.10135"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="126">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="263.16016" z="26.73383"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="127">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="257.45038" z="38.75931"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="128">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="245.50385" z="30.68905"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="129">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="243.87381" z="33.73101"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="130">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="286.45432" z="24.27747"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="131">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="277.41062" z="20.53335"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="132">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="294.05207" z="24.07998"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="133">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="279.73218" z="29.4666"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="135">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="272.43778" z="22.91803"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="136">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="279.61442" z="25.17363"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="137">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="270.08732" z="29.79163"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="139">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="295.28623" z="20.55785"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="140">
-			<Template>actor|props/flora/bush_medit_la_lush.xml</Template>
-			<Position x="302.40604" z="20.71213"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="141">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="275.2146" z="33.2954"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="142">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="280.11286" z="32.06983"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="143">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="296.05774" z="33.3466"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="144">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="289.84754" z="30.01304"/>
-			<Orientation y="2.12012"/>
-		</Entity>
-		<Entity uid="145">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="273.2317" z="24.63198"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="146">
-			<Template>actor|props/flora/bush_highlands.xml</Template>
-			<Position x="282.9629" z="33.10106"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="147">
-			<Template>actor|props/flora/bush_highlands.xml</Template>
-			<Position x="292.38144" z="36.50915"/>
-			<Orientation y="1.64647"/>
-		</Entity>
-		<Entity uid="148">
-			<Template>actor|props/flora/bush_highlands.xml</Template>
-			<Position x="296.66977" z="37.06144"/>
-			<Orientation y="-1.45406"/>
-		</Entity>
-		<Entity uid="149">
-			<Template>actor|props/flora/bush_highlands.xml</Template>
-			<Position x="282.21488" z="37.72843"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="150">
-			<Template>actor|props/flora/bush_highlands.xml</Template>
-			<Position x="273.27198" z="38.61175"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="151">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="287.32526" z="37.03464"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="152">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="275.23084" z="40.24912"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="153">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="271.48734" z="38.07955"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="154">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="280.71897" z="42.14367"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="155">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="302.77823" z="49.75844"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="156">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="289.98371" z="39.0684"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="157">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="296.17835" z="34.54712"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="158">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="276.7002" z="28.12082"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="159">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="274.14444" z="27.84714"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="164">
-			<Template>actor|props/flora/bush_tempe_sm.xml</Template>
-			<Position x="265.43494" z="24.83764"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="165">
-			<Template>actor|props/flora/bush_tempe_sm.xml</Template>
-			<Position x="278.37522" z="23.72504"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="166">
-			<Template>actor|props/flora/bush_tempe_sm.xml</Template>
-			<Position x="286.23588" z="26.59415"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="167">
-			<Template>actor|props/flora/bush_tempe_sm.xml</Template>
-			<Position x="296.72794" z="28.60911"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="168">
-			<Template>actor|props/flora/bush_tempe_sm.xml</Template>
-			<Position x="302.17454" z="27.59171"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="169">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="284.89451" z="30.18696"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="170">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="267.06147" z="37.38021"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="171">
-			<Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
-			<Position x="301.72526" z="34.76001"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="172">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="280.2256" z="39.3318"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="173">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="276.40638" z="36.52205"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="174">
-			<Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
-			<Position x="266.54911" z="36.35251"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="175">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="271.20255" z="36.35253"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="176">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="287.83832" z="36.08974"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="177">
-			<Template>actor|props/flora/bush_medit_me.xml</Template>
-			<Position x="285.43769" z="31.42228"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="178">
-			<Template>actor|props/flora/bush_medit_me_lush.xml</Template>
-			<Position x="280.3252" z="32.02233"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="179">
-			<Template>actor|props/flora/bush_medit_me_lush.xml</Template>
-			<Position x="297.93104" z="31.54233"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="180">
-			<Template>actor|props/flora/bush_tempe_me_lush.xml</Template>
-			<Position x="282.82288" z="26.90476"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="181">
-			<Template>actor|props/flora/bush_tempe_me_lush.xml</Template>
-			<Position x="274.00992" z="30.23928"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="182">
-			<Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
-			<Position x="270.38248" z="24.49682"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="183">
-			<Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
-			<Position x="274.86835" z="22.44986"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="184">
-			<Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
-			<Position x="264.16999" z="24.94616"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="185">
-			<Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
-			<Position x="266.38672" z="24.94616"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="186">
-			<Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
-			<Position x="267.03528" z="26.09928"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="187">
-			<Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
-			<Position x="291.87266" z="19.58149"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="188">
-			<Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
-			<Position x="285.40857" z="20.9524"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="189">
-			<Template>actor|props/flora/foliagebush.xml</Template>
-			<Position x="288.24842" z="21.29178"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="190">
-			<Template>actor|props/flora/foliagebush.xml</Template>
-			<Position x="283.04896" z="20.83062"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="191">
-			<Template>actor|props/flora/foliagebush.xml</Template>
-			<Position x="281.66346" z="21.93403"/>
-			<Orientation y="0.86461"/>
-		</Entity>
-		<Entity uid="192">
-			<Template>actor|props/flora/foliagebush.xml</Template>
-			<Position x="284.37168" z="22.277"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="193">
-			<Template>actor|props/flora/foliagebush.xml</Template>
-			<Position x="282.35499" z="23.18769"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="194">
-			<Template>actor|props/flora/foliagebush.xml</Template>
-			<Position x="298.45963" z="21.47562"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="195">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="287.00412" z="20.45141"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="196">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="289.10392" z="21.10778"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="197">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="293.02747" z="17.37601"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="198">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="297.34318" z="17.01391"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="199">
-			<Template>actor|props/flora/bush_tempe_la.xml</Template>
-			<Position x="299.50019" z="16.07941"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="200">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="275.71418" z="26.56916"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="201">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="282.79346" z="22.06981"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="202">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="292.2797" z="21.64238"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="203">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="288.7516" z="20.5013"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="204">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="298.6811" z="19.14942"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="205">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="298.50953" z="25.24166"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="206">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="283.00156" z="23.50725"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="207">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="287.77054" z="21.09528"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="208">
-			<Template>actor|props/flora/bush_medit_la.xml</Template>
-			<Position x="287.95173" z="24.86187"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="209">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="288.82581" z="35.0086"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="210">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="289.8884" z="35.81725"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="211">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="290.4268" z="37.23607"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="212">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="290.07209" z="35.57451"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="213">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="296.79011" z="32.76421"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="214">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="294.97129" z="31.81437"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="215">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="295.21015" z="30.77144"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="216">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="276.96131" z="35.10988"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="217">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="278.78965" z="36.35962"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="218">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="277.34113" z="36.54398"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="219">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="275.2725" z="36.45162"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="220">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="260.52085" z="35.72602"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="221">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="267.6615" z="35.81543"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="222">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="268.74088" z="34.42621"/>
-			<Orientation y="1.8438"/>
-		</Entity>
-		<Entity uid="223">
-			<Template>actor|props/flora/bush_medit_sm.xml</Template>
-			<Position x="268.1172" z="37.58532"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="225">
-			<Template>actor|props/flora/bush_desert_dry_a.xml</Template>
-			<Position x="269.47815" z="61.69985"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="226">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="287.69126" z="55.1538"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="227">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="304.5748" z="78.98967"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="228">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="309.99076" z="80.02712"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="229">
-			<Template>actor|props/flora/bush_tempe_sm_dry.xml</Template>
-			<Position x="182.83262" z="106.45444"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="230">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="260.82682" z="53.32554"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="231">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="223.59562" z="83.53635"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="232">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="200.2223" z="62.42489"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="233">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="194.06037" z="57.30793"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="234">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="276.77" z="54.62615"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="235">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="272.66929" z="44.23176"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="236">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="309.15726" z="58.50882"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="237">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="136.49097" z="145.34888"/>
-			<Orientation y="-0.75988"/>
-		</Entity>
-		<Entity uid="238">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="154.89536" z="167.10907"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="239">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="136.32291" z="171.36371"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="245">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="201.90397" z="171.44248"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="246">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="183.31312" z="166.71232"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="247">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="171.49274" z="164.2505"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="256">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="176.0121" z="141.4928"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="257">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="166.80262" z="150.9994"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="258">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="123.25811" z="134.4115"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="260">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="270.38392" z="214.72745"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="261">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="178.31711" z="153.13578"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="262">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="192.14722" z="164.54468"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="263">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="218.26578" z="179.06016"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="266">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="151.05924" z="144.40867"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="267">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="141.50644" z="137.68918"/>
-			<Orientation y="-2.1806"/>
-		</Entity>
-		<Entity uid="268">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="131.63785" z="131.93677"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="269">
-			<Template>gaia/flora_tree_dead</Template>
-			<Player>0</Player>
-			<Position x="163.55393" z="136.7511"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="272">
-			<Template>gaia/flora_tree_aleppo_pine</Template>
-			<Player>0</Player>
-			<Position x="184.30573" z="159.62476"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="273">
-			<Template>gaia/flora_tree_aleppo_pine</Template>
-			<Player>0</Player>
-			<Position x="204.26023" z="180.19291"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="276">
-			<Template>gaia/flora_tree_aleppo_pine</Template>
-			<Player>0</Player>
-			<Position x="260.73942" z="219.076"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="277">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="153.91056" z="128.00287"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="278">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="138.84675" z="131.49656"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="279">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="117.54499" z="125.24613"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="280">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="129.1868" z="148.71134"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="281">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="124.96007" z="127.30735"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="282">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="180.77411" z="154.55854"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="283">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="207.24662" z="177.26194"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="284">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="213.41617" z="189.35013"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="285">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="265.60907" z="207.18122"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="287">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="271.37467" z="228.47855"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="288">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="286.9535" z="225.28986"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="289">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="300.08478" z="215.84726"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="290">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="321.23053" z="216.67615"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="291">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="342.39954" z="212.63984"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="292">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="338.97663" z="241.1106"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="293">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="315.52485" z="242.88175"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="294">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="305.94599" z="233.95151"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="297">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="163.85712" z="145.09705"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="298">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="157.24369" z="137.70725"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="299">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="130.41483" z="120.81693"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="301">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="286.80616" z="200.07569"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="302">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="277.38938" z="186.03571"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="303">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="358.23948" z="210.82163"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="304">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="346.91962" z="231.55964"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="305">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="327.01813" z="204.20688"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="306">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="318.1319" z="228.53132"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="307">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="150.30365" z="156.19263"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="308">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="126.75513" z="159.46436"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="309">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="143.521" z="174.71476"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="310">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="167.99921" z="125.69198"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="311">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="172.56763" z="133.99674"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="314">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="332.69266" z="223.3107"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="315">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="356.65717" z="226.4657"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="316">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="311.57334" z="212.9318"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="317">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="297.85627" z="227.05314"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="318">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="280.31357" z="209.95374"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="319">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="335.67624" z="250.19459"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="320">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="325.00742" z="257.45377"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="321">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="139.79816" z="155.13456"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="322">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="157.80436" z="159.32563"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="323">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="272.25943" z="193.99772"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="324">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="301.81354" z="205.40989"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="325">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="291.92786" z="212.45865"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="327">
-			<Template>gaia/flora_tree_aleppo_pine</Template>
-			<Player>0</Player>
-			<Position x="316.68903" z="206.21564"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="328">
-			<Template>gaia/flora_tree_aleppo_pine</Template>
-			<Player>0</Player>
-			<Position x="335.66312" z="219.7027"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="329">
-			<Template>gaia/flora_tree_aleppo_pine</Template>
-			<Player>0</Player>
-			<Position x="355.28876" z="219.80805"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="330">
-			<Template>gaia/flora_tree_aleppo_pine</Template>
-			<Player>0</Player>
-			<Position x="330.15882" z="231.18406"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="331">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="85.51034" z="152.94758"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="332">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="100.33367" z="155.5142"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="333">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="113.73923" z="157.74915"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="334">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="94.47974" z="170.21973"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="335">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="105.43018" z="177.04825"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="336">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="143.10096" z="193.82447"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="337">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="169.805" z="203.8407"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="338">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="211.5305" z="214.95362"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="339">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="182.77295" z="191.89506"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="340">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="167.93131" z="192.93125"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="341">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="137.45923" z="190.10242"/>
-			<Orientation y="-1.14083"/>
-		</Entity>
-		<Entity uid="342">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="122.43638" z="188.1002"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="343">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="123.4878" z="212.22303"/>
-			<Orientation y="0.06952"/>
-		</Entity>
-		<Entity uid="344">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="217.92277" z="227.26853"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="345">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="250.83463" z="239.7291"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="346">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="235.56061" z="226.58008"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="347">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="264.23151" z="248.3441"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="348">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="278.07526" z="250.8602"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="349">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="297.05137" z="254.04575"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="350">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="308.03116" z="269.86326"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="351">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="274.71772" z="261.21576"/>
-			<Orientation y="-0.93134"/>
-		</Entity>
-		<Entity uid="352">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="263.9422" z="278.72028"/>
-			<Orientation y="-0.13407"/>
-		</Entity>
-		<Entity uid="353">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="246.84516" z="267.6601"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="354">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="226.07441" z="241.30646"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="355">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="301.37812" z="300.77118"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="356">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="329.43256" z="291.52833"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="357">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="329.27973" z="279.87507"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="358">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="344.28019" z="298.52375"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="359">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="338.35734" z="308.78193"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="360">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="326.93696" z="327.50501"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="361">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="310.5276" z="333.599"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="362">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="299.83027" z="335.12775"/>
-			<Orientation y="-1.93113"/>
-		</Entity>
-		<Entity uid="363">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="281.54715" z="315.20417"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="364">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="226.12446" z="275.59546"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="365">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="191.50956" z="293.85944"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="366">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="192.31678" z="289.20197"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="367">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="212.36121" z="266.34849"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="368">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="205.28553" z="307.31217"/>
-			<Orientation y="-0.7143"/>
-		</Entity>
-		<Entity uid="369">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="189.8877" z="312.02417"/>
-			<Orientation y="-1.03068"/>
-		</Entity>
-		<Entity uid="370">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="176.88715" z="293.6703"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="372">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="194.60785" z="335.90006"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="373">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="180.2386" z="320.8396"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="374">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="178.60361" z="366.97101"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="375">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="186.41456" z="399.02744"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="376">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="186.20914" z="414.8585"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="377">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="161.92142" z="422.33341"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="378">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="146.25513" z="417.79511"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="379">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="116.50344" z="437.68241"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="380">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="99.35412" z="453.03736"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="381">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="53.22292" z="496.63685"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="382">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="56.55631" z="525.9773"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="383">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="101.01702" z="482.95014"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="384">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="134.79654" z="459.62818"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="385">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="135.37186" z="438.92917"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="386">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="149.02771" z="460.91788"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="387">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="184.59562" z="423.83283"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="388">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="176.19895" z="451.56724"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="389">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="189.41547" z="236.5424"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="390">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="197.55188" z="227.37851"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="391">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="198.839" z="191.26844"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="392">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="234.09989" z="217.7143"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="393">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="175.35608" z="178.21738"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="394">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="282.37168" z="243.14002"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="395">
-			<Template>actor|flora/trees/aleppo_pine.xml</Template>
-			<Position x="301.62708" z="249.27222"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="396">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="112.5968" z="144.9202"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="397">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="119.75585" z="150.50199"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="398">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="122.89795" z="167.45304"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="399">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="110.14748" z="172.30594"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="400">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="152.60746" z="186.28919"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="401">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="154.00303" z="176.46415"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="402">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="182.17353" z="176.24738"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="403">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="190.9534" z="187.7092"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="404">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="196.3744" z="210.98938"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="405">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="171.61457" z="209.33152"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="406">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="205.72181" z="206.0316"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="407">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="220.41568" z="213.4943"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="408">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="243.25687" z="224.34803"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="409">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="220.21482" z="205.81025"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="410">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="203.09238" z="185.37989"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="411">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="198.02106" z="177.94465"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="412">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="187.71543" z="175.0116"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="413">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="239.39621" z="212.83011"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="414">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="249.31016" z="226.44309"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="415">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="274.38642" z="235.8711"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="416">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="283.599" z="235.98401"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="417">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="291.4416" z="242.48813"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="418">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="308.84858" z="246.33997"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="419">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="317.44556" z="265.21763"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="420">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="313.12311" z="274.51752"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="421">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="304.82645" z="282.6301"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="422">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="286.76453" z="258.30756"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="423">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="284.40452" z="309.72742"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="424">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="267.00458" z="326.0593"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="425">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="187.81434" z="329.93693"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="426">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="186.69706" z="303.13126"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="427">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="333.37558" z="276.2793"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="428">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="346.49286" z="297.75358"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="429">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="339.27561" z="292.10468"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="430">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="306.24158" z="294.52924"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="431">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="318.59217" z="274.24595"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="432">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="314.77985" z="311.31171"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="433">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="325.2776" z="335.57093"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="434">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="319.56464" z="349.83457"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="435">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="305.64252" z="323.95997"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="436">
-			<Template>actor|flora/trees/european_beech_top.xml</Template>
-			<Position x="337.05878" z="284.02845"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="437">
-			<Template>actor|flora/trees/european_beech_top.xml</Template>
-			<Position x="161.8891" z="186.94706"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="438">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="117.25695" z="146.34684"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="439">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="161.04407" z="175.13971"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="440">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="169.92701" z="183.61893"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="441">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="119.43598" z="178.36933"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="442">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="151.65961" z="197.00397"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="443">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="183.99058" z="220.21592"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="444">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="233.97501" z="225.17527"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="445">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="287.20453" z="244.19587"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="446">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="284.77503" z="255.66968"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="447">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="245.6904" z="265.57078"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="448">
-			<Template>actor|flora/trees/lumbardypoplar.xml</Template>
-			<Position x="225.24534" z="236.95548"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="449">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="130.13678" z="140.50306"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="450">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="163.3682" z="166.12305"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="451">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="168.60807" z="177.21201"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="452">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="123.89872" z="179.67035"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="453">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="125.44326" z="171.59473"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="454">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="113.58481" z="156.09607"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="455">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="119.26896" z="153.46204"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="456">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="106.47886" z="168.99656"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="457">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="102.89548" z="165.47947"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="458">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="110.43932" z="166.89332"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="459">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="114.42458" z="174.77564"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="460">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="176.5864" z="193.39078"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="461">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="185.06678" z="208.21216"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="462">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="207.33216" z="202.73258"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="463">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="225.68046" z="214.13044"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="464">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="222.11097" z="221.72562"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="465">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="211.39396" z="223.26346"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="466">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="229.25812" z="230.82547"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="467">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="258.32895" z="228.71067"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="468">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="264.54801" z="238.53812"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="469">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="247.9618" z="241.20038"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="470">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="132.0774" z="165.12055"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="471">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="134.53748" z="185.1497"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="472">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="209.48783" z="197.45301"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="473">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="185.82227" z="203.42869"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="474">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="240.71918" z="243.9885"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="475">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="258.86286" z="242.73353"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="476">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="253.70377" z="252.38645"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="477">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="290.0001" z="255.96103"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="478">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="170.69791" z="172.24479"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="479">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="195.30781" z="199.21772"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="480">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="178.91749" z="190.02964"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="481">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="201.8125" z="224.04264"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="482">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="233.9698" z="234.25492"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="483">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="245.29307" z="237.7309"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="484">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="250.63648" z="222.8573"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="485">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="229.55546" z="224.17707"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="486">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="275.03418" z="250.98545"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="487">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="261.43873" z="270.6511"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="488">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="312.8993" z="257.58964"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="489">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="300.18693" z="264.1764"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="490">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="282.44687" z="289.39002"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="491">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="312.81803" z="307.35865"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="492">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="323.10361" z="323.67243"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="493">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="304.33048" z="322.85798"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="494">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="104.61954" z="140.25709"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="495">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="112.26095" z="135.09223"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="496">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="104.76392" z="130.57685"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="497">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="87.95913" z="150.53507"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="498">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="94.09791" z="144.749"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="499">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="91.24474" z="153.52302"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="500">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="109.05925" z="127.21428"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="501">
-			<Template>actor|flora/trees/tree_dead.xml</Template>
-			<Position x="125.45754" z="160.59546"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="502">
-			<Template>actor|flora/trees/tree_dead.xml</Template>
-			<Position x="157.81678" z="195.78504"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="503">
-			<Template>actor|flora/trees/tree_dead.xml</Template>
-			<Position x="198.1703" z="222.43494"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="504">
-			<Template>actor|flora/trees/tree_dead.xml</Template>
-			<Position x="186.3241" z="222.10514"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="505">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="139.08231" z="122.63775"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="506">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="147.35645" z="127.40038"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="507">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="160.41111" z="125.70516"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="508">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="174.74393" z="129.9401"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="509">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="185.33066" z="138.83329"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="510">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="182.05594" z="145.5315"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="511">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="194.89298" z="161.6902"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="512">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="192.44043" z="150.3353"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="513">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="214.86966" z="176.5745"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="514">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="205.71573" z="167.23203"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="515">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="232.93131" z="181.04609"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="517">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="271.9621" z="188.58817"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="518">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="294.96918" z="196.67475"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="519">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="310.79914" z="201.76288"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="520">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="326.44828" z="200.94684"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="521">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="343.94294" z="207.28263"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="522">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="338.77521" z="127.55079"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="523">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="338.1926" z="139.84208"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="524">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="351.14591" z="144.94504"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="525">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="144.80695" z="123.22959"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="526">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="134.59897" z="113.09038"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="527">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="140.33216" z="116.04592"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="528">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="136.36161" z="125.35343"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="529">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="140.02408" z="114.93798"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="530">
-			<Template>gaia/flora_bush_temperate</Template>
-			<Player>0</Player>
-			<Position x="160.94892" z="124.00335"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="531">
-			<Template>gaia/geology_stonemine_medit_quarry</Template>
-			<Player>0</Player>
-			<Position x="231.89936" z="191.7417"/>
-			<Orientation y="2.00121"/>
-		</Entity>
-		<Entity uid="532">
-			<Template>gaia/geology_stonemine_medit_quarry</Template>
-			<Player>0</Player>
-			<Position x="245.26487" z="196.60132"/>
-			<Orientation y="1.62592"/>
-		</Entity>
-		<Entity uid="540">
-			<Template>actor|props/units/weapons/rock.xml</Template>
-			<Position x="226.73203" z="187.03202"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="541">
-			<Template>actor|geology/stone_medit_med.xml</Template>
-			<Position x="231.65223" z="200.90278"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="543">
-			<Template>actor|geology/stone_granite_greek_med.xml</Template>
-			<Position x="235.98588" z="200.02973"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="544">
-			<Template>actor|geology/stone_granite_greek_large.xml</Template>
-			<Position x="233.16602" z="201.50623"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="545">
-			<Template>actor|geology/stone_granite_greek_large.xml</Template>
-			<Position x="230.1055" z="199.82209"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="546">
-			<Template>actor|geology/stone_granite_greek_large.xml</Template>
-			<Position x="229.28534" z="203.5463"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="547">
-			<Template>actor|geology/stone_granite_greek_small.xml</Template>
-			<Position x="228.804" z="205.0037"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="548">
-			<Template>actor|geology/stone_granite_greek_small.xml</Template>
-			<Position x="227.33735" z="202.79429"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="549">
-			<Template>actor|geology/stone_granite_greek_small.xml</Template>
-			<Position x="253.274" z="200.27042"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="550">
-			<Template>actor|props/special/eyecandy/blocks_limestone_pile_b.xml</Template>
-			<Position x="249.5431" z="188.68763"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="552">
-			<Template>actor|props/special/eyecandy/blocks_limestone_pile_b.xml</Template>
-			<Position x="250.55475" z="189.05002"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="553">
-			<Template>actor|props/special/eyecandy/blocks_limestone_pile_b.xml</Template>
-			<Position x="250.88306" z="189.90601"/>
-			<Orientation y="-0.7432"/>
-		</Entity>
-		<Entity uid="554">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="395.24988" z="160.90836"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="555">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="407.44516" z="170.32602"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="556">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="400.84897" z="164.94611"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="557">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="405.81553" z="160.11228"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="558">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="417.29944" z="168.00196"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="559">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="421.3245" z="183.44248"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="560">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="409.24967" z="191.82941"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="561">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="407.25098" z="183.16584"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="562">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="429.32154" z="201.90665"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="563">
-			<Template>actor|props/flora/bush_medit_la_dry.xml</Template>
-			<Position x="429.03513" z="189.2173"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="564">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="415.61652" z="167.40564"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="565">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="397.9116" z="174.60682"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="566">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="400.22013" z="187.70688"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="567">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="410.21555" z="188.44672"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="568">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="416.99885" z="196.92972"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="569">
-			<Template>actor|props/flora/bush_medit_me_dry.xml</Template>
-			<Position x="424.2027" z="178.64142"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="570">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="389.34266" z="158.7717"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="571">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="387.18128" z="166.88425"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="572">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="393.75345" z="170.82706"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="573">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="412.611" z="164.41675"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="574">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="418.33341" z="169.79233"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="575">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="434.30094" z="181.6861"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="576">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="422.06223" z="157.66202"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="577">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="437.01145" z="175.36811"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="578">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="452.56904" z="216.31803"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="579">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="437.79868" z="211.26258"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="580">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="432.19025" z="196.13266"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="581">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="389.03818" z="153.95218"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="582">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="385.758" z="160.06687"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="583">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="383.97318" z="166.8538"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="584">
-			<Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-			<Position x="391.50574" z="156.48938"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="594">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="313.53397" z="124.89072"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="595">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="317.52372" z="132.0546"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="596">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="310.02594" z="131.29172"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="597">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="322.73624" z="127.50736"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="598">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="319.59858" z="121.48458"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="599">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="315.25208" z="115.65203"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="600">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="326.15955" z="120.41326"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="601">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="322.11493" z="113.76371"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="602">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="265.01313" z="155.43631"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="603">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="275.27244" z="161.34623"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="604">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="285.00037" z="156.56583"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="605">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="270.92975" z="148.327"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="606">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="280.57734" z="148.0388"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="609">
-			<Template>other/bridge_hele</Template>
-			<Player>0</Player>
-			<Position x="350.30353" z="582.69074"/>
-			<Orientation y="-0.15276"/>
-		</Entity>
-		<Entity uid="610">
-			<Template>other/bridge_hele</Template>
-			<Player>0</Player>
-			<Position x="350.43921" z="574.88343"/>
-			<Orientation y="3.02306"/>
-		</Entity>
-		<Entity uid="611">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="373.25062" z="613.68433"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="612">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="368.41175" z="652.93451"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="613">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="380.17237" z="724.85346"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="614">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="367.36286" z="670.17981"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="615">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="376.06083" z="711.67792"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="616">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="372.75916" z="697.75391"/>
-			<Orientation y="-2.68052"/>
-		</Entity>
-		<Entity uid="617">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="366.51371" z="633.09491"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="618">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="367.44733" z="625.59668"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="619">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="363.55817" z="641.6717"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="620">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="384.68024" z="746.94178"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="621">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="369.55854" z="687.42133"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="622">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="363.5557" z="680.0448"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="623">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="362.34775" z="654.87818"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="624">
-			<Template>actor|flora/trees/oak.xml</Template>
-			<Position x="405.00504" z="634.06794"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="625">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="410.23511" z="655.89838"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="626">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="414.35492" z="702.3423"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="627">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="439.59064" z="703.94556"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="628">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="439.77558" z="742.45667"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="629">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="416.70704" z="600.30329"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="630">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="408.1887" z="566.42725"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="631">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="404.89658" z="543.25812"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="632">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="428.56873" z="514.71473"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="633">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="459.25486" z="521.36341"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="634">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="442.76911" z="568.36432"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="635">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="414.1858" z="522.50507"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="636">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="396.44105" z="503.47577"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="637">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="421.5954" z="473.2234"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="638">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="467.58375" z="491.04383"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="639">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="457.7505" z="467.86725"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="640">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="443.25303" z="462.13077"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="641">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="430.40943" z="504.26664"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="642">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="408.93903" z="492.23353"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="643">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="443.56522" z="483.14283"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="644">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="392.41843" z="533.14509"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="645">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="433.5907" z="536.99134"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="646">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="425.38611" z="609.36524"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="647">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="415.96567" z="455.9733"/>
-			<Orientation y="1.76523"/>
-		</Entity>
-		<Entity uid="648">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="467.50028" z="448.90934"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="649">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="444.37195" z="490.67075"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="650">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="449.37632" z="520.71802"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="651">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="433.69266" z="587.25489"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="652">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="444.28876" z="608.0912"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="653">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="426.62879" z="626.42634"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="654">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="450.3548" z="673.31257"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="655">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="480.79395" z="746.50843"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="656">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="441.11622" z="684.92817"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="657">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="473.85126" z="703.84382"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="658">
-			<Template>actor|flora/trees/oak_old.xml</Template>
-			<Position x="465.99531" z="655.76667"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="659">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="425.7339" z="549.75403"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="660">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="403.3725" z="529.30127"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="661">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="404.9084" z="483.73838"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="662">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="418.55585" z="485.64866"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="663">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="412.02054" z="506.88422"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="664">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="392.5572" z="518.72944"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="665">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="464.27073" z="505.94282"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="666">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="448.66462" z="501.6479"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="667">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="476.64094" z="480.73798"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="668">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="497.14475" z="452.17939"/>
-			<Orientation y="-1.59238"/>
-		</Entity>
-		<Entity uid="669">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="439.41034" z="453.58307"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="670">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="498.83881" z="469.7758"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="671">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="504.10315" z="480.99326"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="672">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="483.35676" z="470.22428"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="673">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="477.45429" z="463.1995"/>
-			<Orientation y="1.49782"/>
-		</Entity>
-		<Entity uid="674">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="557.98755" z="467.848"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="675">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="558.60401" z="457.82911"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="680">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="248.21915" z="334.35572"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="681">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="235.83548" z="310.69733"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="682">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="211.43268" z="315.1344"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="686">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="208.56965" z="432.21106"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="687">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="196.30451" z="430.28931"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="688">
-			<Template>actor|flora/trees/poplar.xml</Template>
-			<Position x="203.00351" z="445.74079"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="690">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="295.08243" z="374.17927"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="691">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="285.3093" z="367.81202"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="692">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="274.65989" z="355.1048"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="693">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="296.83954" z="350.70917"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="694">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="287.00565" z="341.8393"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="695">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="257.06269" z="319.37583"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="696">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="263.68131" z="340.39826"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="697">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="276.91807" z="371.93818"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="700">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="188.78492" z="390.1681"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="705">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="222.29566" z="323.1933"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="706">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="223.24106" z="312.58902"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="707">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="242.6851" z="316.23432"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="708">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="242.84614" z="304.82038"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="709">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="231.1277" z="296.57453"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="710">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="213.33219" z="292.55533"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="711">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="192.20939" z="306.53269"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="712">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="195.65299" z="334.29075"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="713">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="195.1154" z="350.57557"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="714">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="204.42606" z="337.2146"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="715">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="191.4834" z="367.70002"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="717">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="185.79249" z="374.19806"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="718">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="199.31894" z="354.88581"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="719">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="186.15091" z="355.95298"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="720">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="182.60193" z="350.09565"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="721">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="167.89039" z="380.17902"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="722">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="180.3281" z="378.125"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="723">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="204.99079" z="405.44272"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="724">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="194.40339" z="407.95276"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="725">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="204.80195" z="416.12372"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="727">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="261.54389" z="350.72141"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="738">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="316.35163" z="364.74122"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="739">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="299.09888" z="362.60682"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="743">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="189.80964" z="358.15629"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="747">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="183.77063" z="441.57306"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="748">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="152.83664" z="396.61942"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="749">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="169.2598" z="393.11857"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="750">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="164.84177" z="406.61265"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="751">
-			<Template>actor|flora/trees/oak_large.xml</Template>
-			<Position x="174.07914" z="417.83628"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="758">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="211.80631" z="332.6182"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="759">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="226.08982" z="327.19544"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="760">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="234.62043" z="319.43857"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="761">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="200.28089" z="322.48331"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="762">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="216.5943" z="302.62681"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="763">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="248.22498" z="316.01008"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="764">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="308.50971" z="369.38654"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="765">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="309.54154" z="356.57181"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="766">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="309.90021" z="342.37067"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="767">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="192.42905" z="446.75776"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="768">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="196.79221" z="455.17002"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="769">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="180.75208" z="458.52216"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="770">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="158.57712" z="450.06556"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="771">
-			<Template>actor|flora/trees/carob.xml</Template>
-			<Position x="192.66071" z="422.59186"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="776">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="212.1674" z="455.69831"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="778">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="317.2782" z="370.71125"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="779">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="305.01124" z="359.10004"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="780">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="310.87165" z="350.10526"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="781">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="316.61088" z="333.05329"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="782">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="285.52231" z="355.16138"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="783">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="280.74189" z="345.88282"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="784">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="197.68772" z="339.0164"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="785">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="191.65931" z="360.81489"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="786">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="331.00876" z="314.66343"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="787">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="323.57193" z="304.61695"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="788">
-			<Template>actor|flora/trees/european_beech.xml</Template>
-			<Position x="319.38584" z="308.4123"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="789">
-			<Template>actor|flora/trees/european_beech_aut.xml</Template>
-			<Position x="330.50174" z="304.81891"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="790">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="322.3177" z="345.55497"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="791">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="435.06885" z="482.2667"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="792">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="430.05732" z="473.34986"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="793">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="425.19834" z="504.55329"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="794">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="417.89469" z="551.12055"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="795">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="445.13083" z="530.60914"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="796">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="446.60077" z="505.42853"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="797">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="468.99665" z="486.73377"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="798">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="483.75184" z="494.79184"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="799">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="463.92554" z="498.71198"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="800">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="441.86786" z="500.6659"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="801">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="426.6521" z="500.8075"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="802">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="412.05726" z="522.22144"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="803">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="404.92148" z="520.95398"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="804">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="423.22202" z="522.81714"/>
-			<Orientation y="-0.023"/>
-		</Entity>
-		<Entity uid="805">
-			<Template>actor|flora/trees/pine.xml</Template>
-			<Position x="426.02656" z="544.34253"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="816">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="293.41395" z="420.88416"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="817">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="278.42872" z="449.1919"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="818">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="254.16202" z="439.51804"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="819">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="245.73127" z="424.49088"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="820">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="224.61896" z="442.31037"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="821">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="211.7021" z="448.74927"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="822">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="230.73502" z="435.11634"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="823">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="254.94352" z="397.21128"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="824">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="282.73444" z="395.53852"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="825">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="283.72248" z="382.71949"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="826">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="257.08155" z="380.06635"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="827">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="243.86936" z="360.29679"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="828">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="230.12113" z="349.35679"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="829">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="206.13492" z="366.07087"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="830">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="210.23288" z="378.72761"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="831">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="223.00068" z="408.09617"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="832">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="274.77643" z="398.40864"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="833">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="271.94043" z="376.57764"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="834">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="209.56562" z="400.6727"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="835">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="256.87415" z="426.6699"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="836">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="277.35538" z="413.88913"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="837">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="289.8188" z="404.94327"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="838">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="298.97522" z="389.78766"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="839">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="292.73353" z="388.25763"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="840">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="313.47407" z="370.71186"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="841">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="238.09263" z="444.48777"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="842">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="222.58854" z="453.58317"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="843">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="219.11991" z="424.17707"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="844">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="214.76163" z="409.85438"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="845">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="241.33765" z="433.14533"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="846">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="238.1131" z="411.96781"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="847">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="253.12269" z="387.91611"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="848">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="281.50593" z="387.15821"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="849">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="250.34083" z="351.69962"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="850">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="216.3953" z="352.09629"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="851">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="221.67142" z="380.95875"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="852">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="306.35013" z="380.09751"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="853">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="294.74564" z="397.31449"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="854">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="267.4308" z="434.41706"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="855">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="247.43897" z="445.17344"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="856">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="214.61527" z="445.09849"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="857">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="214.4289" z="433.98493"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="858">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="223.80188" z="418.56913"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="859">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="236.28608" z="370.75837"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="860">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="263.93592" z="370.39136"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="861">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="264.63871" z="377.96283"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="862">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="228.98288" z="356.72938"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="863">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="215.7887" z="362.98896"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="864">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="199.60062" z="377.49772"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="865">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="214.27204" z="392.12006"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="866">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="224.70881" z="393.32493"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="867">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="236.0973" z="389.14322"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="868">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="287.74625" z="427.74582"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="869">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="289.75095" z="446.86094"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="870">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="302.12772" z="427.67975"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="871">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="326.34516" z="445.12974"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="878">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="333.81931" z="465.12278"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="879">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="311.88306" z="470.46222"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="880">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="316.26081" z="487.23627"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="881">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="333.5919" z="494.2782"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="882">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="317.00712" z="477.43372"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="883">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="335.92206" z="447.6905"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="884">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="329.8141" z="457.90241"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="885">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="336.59748" z="455.95893"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="887">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="325.01636" z="487.0904"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="888">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="329.26172" z="507.09375"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="889">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="322.07071" z="500.42438"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="890">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="342.43747" z="439.78794"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="891">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="293.67206" z="412.7198"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="892">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="139.5294" z="466.46894"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="893">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="123.80936" z="479.87946"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="894">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="104.783" z="498.18232"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="895">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="91.08356" z="518.30707"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="896">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="146.5186" z="448.35389"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="897">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="159.16691" z="429.49494"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="898">
-			<Template>gaia/flora_tree_pine</Template>
-			<Player>0</Player>
-			<Position x="109.09702" z="465.42771"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="899">
-			<Template>structures/athen_temple</Template>
-			<Player>2</Player>
-			<Position x="200.32447" z="645.34937"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="900">
-			<Template>structures/athen_house</Template>
-			<Player>2</Player>
-			<Position x="157.70838" z="531.41285"/>
-			<Orientation y="-1.18644"/>
-		</Entity>
-		<Entity uid="901">
-			<Template>structures/athen_house</Template>
-			<Player>2</Player>
-			<Position x="139.94852" z="540.08753"/>
-			<Orientation y="-0.74064"/>
-		</Entity>
-		<Entity uid="902">
-			<Template>structures/athen_house</Template>
-			<Player>2</Player>
-			<Position x="129.44422" z="556.7356"/>
-			<Orientation y="0.35138"/>
-		</Entity>
-		<Entity uid="903">
-			<Template>structures/athen_barracks</Template>
-			<Player>2</Player>
-			<Position x="285.41495" z="600.81592"/>
-			<Orientation y="3.0927"/>
-		</Entity>
-		<Entity uid="904">
-			<Template>gaia/flora_tree_dead</Template>
-			<Player>0</Player>
-			<Position x="342.1027" z="264.7233"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="905">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="345.98322" z="258.13758"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="906">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="357.94999" z="242.52845"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="907">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="366.93171" z="223.9339"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="908">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="364.68461" z="234.81965"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="909">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="355.62165" z="255.33942"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="910">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="333.52533" z="270.98804"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="911">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="106.74198" z="554.55561"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="912">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="113.03136" z="579.13471"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="913">
-			<Template>gaia/flora_tree_oak</Template>
-			<Player>0</Player>
-			<Position x="99.37262" z="599.35047"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="914">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="85.4023" z="575.65198"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="915">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="110.14855" z="562.87372"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="916">
-			<Template>gaia/flora_tree_oak_large</Template>
-			<Player>0</Player>
-			<Position x="112.81067" z="535.44507"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="917">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="108.1707" z="600.34815"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="918">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="117.47388" z="572.34467"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="919">
-			<Template>gaia/flora_tree_carob</Template>
-			<Player>0</Player>
-			<Position x="105.24753" z="544.9994"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="920">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="90.96926" z="548.09888"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="921">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="92.65961" z="568.76301"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="922">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="87.55578" z="589.90741"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="923">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="102.4559" z="587.0813"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="924">
-			<Template>gaia/flora_tree_poplar</Template>
-			<Player>0</Player>
-			<Position x="116.39847" z="589.42347"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="925">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="101.42736" z="569.49201"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="926">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="90.23523" z="554.83973"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="927">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="77.74418" z="566.66541"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="928">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="102.13585" z="610.37989"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="929">
-			<Template>gaia/flora_tree_euro_beech</Template>
-			<Player>0</Player>
-			<Position x="120.7789" z="607.1272"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="930">
-			<Template>structures/athen_farmstead</Template>
-			<Player>2</Player>
-			<Position x="235.97013" z="501.99305"/>
-			<Orientation y="0.5644"/>
-		</Entity>
-		<Entity uid="933">
-			<Template>structures/athen_field</Template>
-			<Player>2</Player>
-			<Position x="233.76633" z="475.63215"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="934">
-			<Template>structures/athen_field</Template>
-			<Player>2</Player>
-			<Position x="253.64756" z="486.32065"/>
-			<Orientation y="2.44729"/>
-		</Entity>
-		<Entity uid="935">
-			<Template>structures/athen_field</Template>
-			<Player>2</Player>
-			<Position x="270.99665" z="510.89509"/>
-			<Orientation y="-0.86657"/>
-		</Entity>
-		<Entity uid="936">
-			<Template>structures/athen_field</Template>
-			<Player>2</Player>
-			<Position x="246.96119" z="517.26301"/>
-			<Orientation y="2.21221"/>
-		</Entity>
-		<Entity uid="937">
-			<Template>structures/athen_field</Template>
-			<Player>2</Player>
-			<Position x="210.76322" z="493.6969"/>
-			<Orientation y="-0.88595"/>
-		</Entity>
-		<Entity uid="938">
-			<Template>structures/athen_field</Template>
-			<Player>2</Player>
-			<Position x="205.93451" z="512.72181"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="939">
-			<Template>structures/athen_field</Template>
-			<Player>2</Player>
-			<Position x="226.37327" z="532.69538"/>
-			<Orientation y="-0.7138"/>
-		</Entity>
-		<Entity uid="940">
-			<Template>structures/athen_outpost</Template>
-			<Player>2</Player>
-			<Position x="319.74756" z="555.36121"/>
-			<Orientation y="-2.8877"/>
-		</Entity>
-		<Entity uid="941">
-			<Template>structures/athen_outpost</Template>
-			<Player>2</Player>
-			<Position x="298.8573" z="480.46076"/>
-			<Orientation y="-0.35004"/>
-		</Entity>
-		<Entity uid="944">
-			<Template>gaia/geology_stonemine_medit_quarry</Template>
-			<Player>0</Player>
-			<Position x="228.18204" z="669.21045"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="945">
-			<Template>gaia/geology_stonemine_medit_quarry</Template>
-			<Player>0</Player>
-			<Position x="246.55753" z="668.75287"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="946">
-			<Template>gaia/geology_metal_mediterranean_slabs</Template>
-			<Player>0</Player>
-			<Position x="270.07816" z="663.3772"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="947">
-			<Template>gaia/geology_metal_mediterranean_slabs</Template>
-			<Player>0</Player>
-			<Position x="286.58524" z="659.51655"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="948">
-			<Template>structures/athen_storehouse</Template>
-			<Player>2</Player>
-			<Position x="247.051" z="640.09693"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="949">
-			<Template>units/spart_infantry_javelinist_b</Template>
-			<Player>1</Player>
-			<Position x="282.56431" z="130.67441"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="950">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="210.38764" z="510.01066"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="951">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="218.20554" z="522.05677"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="952">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="246.06785" z="517.8282"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="953">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="218.41211" z="511.15317"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="954">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="222.15934" z="519.7173"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="955">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="227.4314" z="524.62391"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="956">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="238.18631" z="523.7223"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="957">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="214.39643" z="498.87885"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="958">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="220.06067" z="496.09214"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="959">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="225.48761" z="489.2064"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="960">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="233.1803" z="487.62006"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="961">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="239.49201" z="487.6858"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="962">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="247.95087" z="489.18985"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="963">
-			<Template>units/athen_support_female_citizen</Template>
-			<Player>2</Player>
-			<Position x="251.73856" z="492.52143"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="964">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="247.10514" z="466.22709"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="965">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="249.17966" z="467.23017"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="966">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="251.33555" z="468.13746"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="967">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="253.26767" z="468.87235"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="968">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="255.65592" z="469.61704"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="969">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="258.11625" z="470.23829"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="970">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="260.34263" z="470.8054"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="971">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="262.43174" z="471.6681"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="972">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="264.55527" z="472.32178"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="973">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="266.6071" z="472.938"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="974">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="268.73783" z="473.908"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="975">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="270.25599" z="474.62711"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="976">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="231.16391" z="459.69764"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="977">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="231.75095" z="461.39985"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="978">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="232.4892" z="462.99451"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="979">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="233.42066" z="464.78217"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="980">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="234.46543" z="466.39438"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="981">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="235.64368" z="468.02561"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="982">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="228.45359" z="460.72455"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="983">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="229.04944" z="462.20734"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="984">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="229.748" z="463.7097"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="985">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="230.53275" z="465.30567"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="986">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="231.22233" z="466.79044"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="987">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="232.2754" z="468.28495"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="988">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="280.24195" z="481.64167"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="989">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="283.26261" z="483.01041"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="990">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="276.80323" z="480.67914"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="991">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="273.3555" z="479.22007"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="992">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="287.23063" z="484.40928"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="993">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="291.29358" z="485.85676"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="994">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="271.46009" z="482.11615"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="995">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="276.06125" z="483.95112"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="996">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="278.65271" z="485.22562"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="997">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="282.1579" z="486.7295"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="998">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="285.46155" z="488.05292"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="999">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="289.39509" z="490.22852"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1000">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="270.40537" z="485.70453"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1001">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="274.48905" z="487.73105"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1002">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="277.71637" z="489.13431"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1003">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="280.72669" z="490.36393"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1004">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="283.80698" z="491.44751"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1005">
-			<Template>units/athen_champion_ranged</Template>
-			<Player>2</Player>
-			<Position x="287.52875" z="492.96641"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1006">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="249.04303" z="463.28089"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1007">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="251.71436" z="464.06897"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1008">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="253.46512" z="464.95008"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1009">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="255.4337" z="465.84092"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1010">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="257.86884" z="466.82328"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1011">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="259.70234" z="467.35169"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1012">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="261.90186" z="467.97483"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1013">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="264.34964" z="468.99256"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1014">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="266.33341" z="469.64332"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1015">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="268.07172" z="470.91993"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1016">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="270.2545" z="471.27082"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1017">
-			<Template>units/athen_champion_marine</Template>
-			<Player>2</Player>
-			<Position x="272.42185" z="472.01844"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1018">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="244.64554" z="469.92106"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1019">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="246.6666" z="470.84971"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1020">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="249.13636" z="472.1128"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1021">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="251.80436" z="473.29603"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1022">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="254.7823" z="474.24033"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1023">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="257.11942" z="475.07392"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1024">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="260.75232" z="476.13276"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1025">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="263.87024" z="476.95173"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1026">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="266.32337" z="477.66181"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1027">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="268.45267" z="478.08783"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1028">
-			<Template>units/athen_champion_infantry</Template>
-			<Player>2</Player>
-			<Position x="270.12162" z="478.51548"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1029">
-			<Template>units/athen_infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="259.1167" z="507.84064"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1030">
-			<Template>units/athen_infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="262.12653" z="508.71125"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1031">
-			<Template>units/athen_infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="265.67154" z="510.20408"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1032">
-			<Template>units/athen_infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="257.65998" z="511.65943"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1033">
-			<Template>units/athen_infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="260.58887" z="512.47486"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1034">
-			<Template>units/athen_infantry_spearman_b</Template>
-			<Player>2</Player>
-			<Position x="263.7627" z="513.44556"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1035">
-			<Template>units/athen_infantry_javelinist_b</Template>
-			<Player>2</Player>
-			<Position x="254.379" z="516.68818"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1036">
-			<Template>units/athen_infantry_javelinist_b</Template>
-			<Player>2</Player>
-			<Position x="256.86942" z="517.60206"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1037">
-			<Template>units/athen_infantry_javelinist_b</Template>
-			<Player>2</Player>
-			<Position x="259.00943" z="518.38209"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1038">
-			<Template>units/athen_infantry_javelinist_b</Template>
-			<Player>2</Player>
-			<Position x="262.08844" z="519.5699"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1039">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="236.7133" z="95.15862"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1040">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="243.77277" z="89.46189"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-		<Entity uid="1041">
-			<Template>gaia/flora_bush_berry</Template>
-			<Player>0</Player>
-			<Position x="237.5522" z="87.68006"/>
-			<Orientation y="2.35621"/>
-		</Entity>
-	</Entities>
-	<Paths/>
+  <Entities>
+    <Entity uid="11">
+      <Template>structures/spart_civil_centre</Template>
+      <Player>1</Player>
+      <Position x="273.9791" z="112.74604"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="12">
+      <Template>structures/athen_civil_centre</Template>
+      <Player>2</Player>
+      <Position x="206.77826" z="573.94031"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="28">
+      <Template>units/spart_support_female_citizen</Template>
+      <Player>1</Player>
+      <Position x="295.27" z="117.63486"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="29">
+      <Template>units/spart_support_female_citizen</Template>
+      <Player>1</Player>
+      <Position x="294.702" z="108.062"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="30">
+      <Template>units/spart_support_female_citizen</Template>
+      <Player>1</Player>
+      <Position x="298.45057" z="112.34449"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="31">
+      <Template>actor|props/flora/bush.xml</Template>
+      <Position x="311.87916" z="40.33628"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="32">
+      <Template>actor|props/flora/bush.xml</Template>
+      <Position x="336.331" z="37.07163"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="33">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="316.32712" z="39.04838"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="34">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="315.12186" z="36.18021"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="35">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="332.34989" z="40.98403"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="36">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="328.94983" z="36.1786"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="37">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="331.00867" z="26.1484"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="38">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="308.4409" z="29.40123"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="39">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="309.6757" z="44.43873"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="40">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="314.14502" z="55.05442"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="41">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="338.24317" z="52.09615"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="45">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="332.3046" z="21.46665"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="46">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="333.19233" z="23.8357"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="47">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="331.48215" z="23.20743"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="48">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="330.5528" z="22.21087"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="49">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="330.87052" z="19.96854"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="50">
+      <Template>actor|props/flora/bush_medit_underbrush.xml</Template>
+      <Position x="304.12043" z="23.89312"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="51">
+      <Template>actor|props/flora/bush_medit_underbrush.xml</Template>
+      <Position x="302.01688" z="14.60314"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="52">
+      <Template>actor|props/flora/bush_medit_underbrush.xml</Template>
+      <Position x="311.28263" z="18.11367"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="53">
+      <Template>actor|props/flora/bush_tempe_a.xml</Template>
+      <Position x="334.68326" z="43.28914"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="54">
+      <Template>actor|props/flora/bush_tempe_a.xml</Template>
+      <Position x="333.25794" z="46.73554"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="55">
+      <Template>actor|props/flora/bush_tempe_a.xml</Template>
+      <Position x="333.60325" z="31.57432"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="56">
+      <Template>actor|props/flora/bush_tempe_a.xml</Template>
+      <Position x="314.75351" z="30.6906"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="57">
+      <Template>actor|props/flora/bush_tempe_a.xml</Template>
+      <Position x="311.83741" z="29.94072"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="58">
+      <Template>actor|props/flora/bush_tempe_b.xml</Template>
+      <Position x="332.42573" z="34.95893"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="59">
+      <Template>actor|props/flora/bush_tempe_b.xml</Template>
+      <Position x="339.87766" z="41.4277"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="60">
+      <Template>actor|props/flora/bush_tempe_b.xml</Template>
+      <Position x="321.1826" z="40.10346"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="61">
+      <Template>actor|props/flora/bush_tempe_b.xml</Template>
+      <Position x="317.46207" z="41.88428"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="62">
+      <Template>actor|props/flora/bush_tempe_b.xml</Template>
+      <Position x="314.14264" z="45.12787"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="63">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="352.23047" z="110.73655"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="64">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="342.6389" z="125.23243"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="65">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="355.7504" z="125.30983"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="66">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="368.89283" z="117.95693"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="67">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="361.53272" z="109.70215"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="68">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="348.25791" z="131.26566"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="69">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="343.88404" z="114.54667"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="70">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="333.96525" z="130.08533"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="71">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="349.21842" z="105.67501"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="72">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="356.37183" z="103.86101"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="73">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="344.58646" z="99.90734"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="74">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="343.64243" z="108.88508"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="75">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="338.73667" z="115.786"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="76">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="339.69248" z="106.92482"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="77">
+      <Template>actor|props/flora/bush_medit_me_lush.xml</Template>
+      <Position x="341.50355" z="105.46235"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="78">
+      <Template>actor|props/flora/bush_medit_me_lush.xml</Template>
+      <Position x="335.80094" z="109.60636"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="79">
+      <Template>actor|props/flora/bush_medit_me_lush.xml</Template>
+      <Position x="331.42676" z="13.79944"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="80">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="329.0695" z="17.64138"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="81">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="338.01383" z="38.49915"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="82">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="337.65522" z="37.25264"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="83">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="338.03315" z="34.70882"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="84">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="334.96073" z="32.61797"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="85">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="334.27326" z="34.46485"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="86">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="333.71763" z="37.42101"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="87">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="336.20194" z="34.38773"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="88">
+      <Template>actor|props/flora/bush_tempe_me_dry.xml</Template>
+      <Position x="335.23304" z="30.20907"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="89">
+      <Template>actor|props/flora/bush_tempe_me_lush.xml</Template>
+      <Position x="313.23563" z="28.3107"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="90">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="313.1486" z="24.4542"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="91">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="306.82251" z="23.33655"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="92">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="302.2389" z="14.03611"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="93">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="333.20566" z="17.19762"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="94">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="333.21177" z="18.03217"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="95">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="328.55057" z="18.15554"/>
+      <Orientation y="-2.52764"/>
+    </Entity>
+    <Entity uid="101">
+      <Template>structures/spart_gerousia</Template>
+      <Player>1</Player>
+      <Position x="219.715" z="155.47907"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="102">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="254.47297" z="28.77331"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="103">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="248.95542" z="30.60622"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="104">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="256.2472" z="31.99848"/>
+      <Orientation y="-1.52941"/>
+    </Entity>
+    <Entity uid="105">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="249.86835" z="31.41152"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="106">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="260.41697" z="35.74132"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="107">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="250.29233" z="34.07108"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="108">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="259.45917" z="28.83437"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="109">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="252.98179" z="36.87697"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="110">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="196.78718" z="54.34076"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="111">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="199.62363" z="57.70708"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="112">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="194.16996" z="60.04773"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="113">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="199.09037" z="62.7639"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="114">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="198.93891" z="56.99227"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="115">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="194.05283" z="57.22164"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="116">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="194.92334" z="59.8069"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="117">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="196.19568" z="62.01072"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="118">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="247.84925" z="35.21077"/>
+      <Orientation y="-1.25675"/>
+    </Entity>
+    <Entity uid="119">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="245.8508" z="35.89704"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="120">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="247.88974" z="38.46592"/>
+      <Orientation y="1.19042"/>
+    </Entity>
+    <Entity uid="121">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="253.18064" z="40.8498"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="122">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="259.60834" z="43.0568"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="123">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="254.81455" z="43.21915"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="124">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="255.90491" z="39.49312"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="125">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="268.30671" z="33.10135"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="126">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="263.16016" z="26.73383"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="127">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="257.45038" z="38.75931"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="128">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="245.50385" z="30.68905"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="129">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="243.87381" z="33.73101"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="130">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="286.45432" z="24.27747"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="131">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="277.41062" z="20.53335"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="132">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="294.05207" z="24.07998"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="133">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="279.73218" z="29.4666"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="135">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="272.43778" z="22.91803"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="136">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="279.61442" z="25.17363"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="137">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="270.08732" z="29.79163"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="139">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="295.28623" z="20.55785"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="140">
+      <Template>actor|props/flora/bush_medit_la_lush.xml</Template>
+      <Position x="302.40604" z="20.71213"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="141">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="275.2146" z="33.2954"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="142">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="280.11286" z="32.06983"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="143">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="296.05774" z="33.3466"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="144">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="289.84754" z="30.01304"/>
+      <Orientation y="2.12012"/>
+    </Entity>
+    <Entity uid="145">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="273.2317" z="24.63198"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="146">
+      <Template>actor|props/flora/bush_highlands.xml</Template>
+      <Position x="282.9629" z="33.10106"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="147">
+      <Template>actor|props/flora/bush_highlands.xml</Template>
+      <Position x="292.38144" z="36.50915"/>
+      <Orientation y="1.64647"/>
+    </Entity>
+    <Entity uid="148">
+      <Template>actor|props/flora/bush_highlands.xml</Template>
+      <Position x="296.66977" z="37.06144"/>
+      <Orientation y="-1.45406"/>
+    </Entity>
+    <Entity uid="149">
+      <Template>actor|props/flora/bush_highlands.xml</Template>
+      <Position x="282.21488" z="37.72843"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="150">
+      <Template>actor|props/flora/bush_highlands.xml</Template>
+      <Position x="273.27198" z="38.61175"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="151">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="287.32526" z="37.03464"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="152">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="275.23084" z="40.24912"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="153">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="271.48734" z="38.07955"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="154">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="280.71897" z="42.14367"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="155">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="302.77823" z="49.75844"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="156">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="289.98371" z="39.0684"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="157">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="296.17835" z="34.54712"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="158">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="276.7002" z="28.12082"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="159">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="274.14444" z="27.84714"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="164">
+      <Template>actor|props/flora/bush_tempe_sm.xml</Template>
+      <Position x="265.43494" z="24.83764"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="165">
+      <Template>actor|props/flora/bush_tempe_sm.xml</Template>
+      <Position x="278.37522" z="23.72504"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="166">
+      <Template>actor|props/flora/bush_tempe_sm.xml</Template>
+      <Position x="286.23588" z="26.59415"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="167">
+      <Template>actor|props/flora/bush_tempe_sm.xml</Template>
+      <Position x="296.72794" z="28.60911"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="168">
+      <Template>actor|props/flora/bush_tempe_sm.xml</Template>
+      <Position x="302.17454" z="27.59171"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="169">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="284.89451" z="30.18696"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="170">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="267.06147" z="37.38021"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="171">
+      <Template>actor|props/flora/bush_tempe_sm_lush.xml</Template>
+      <Position x="301.72526" z="34.76001"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="172">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="280.2256" z="39.3318"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="173">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="276.40638" z="36.52205"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="174">
+      <Template>actor|props/flora/bush_medit_sm_lush.xml</Template>
+      <Position x="266.54911" z="36.35251"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="175">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="271.20255" z="36.35253"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="176">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="287.83832" z="36.08974"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="177">
+      <Template>actor|props/flora/bush_medit_me.xml</Template>
+      <Position x="285.43769" z="31.42228"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="178">
+      <Template>actor|props/flora/bush_medit_me_lush.xml</Template>
+      <Position x="280.3252" z="32.02233"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="179">
+      <Template>actor|props/flora/bush_medit_me_lush.xml</Template>
+      <Position x="297.93104" z="31.54233"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="180">
+      <Template>actor|props/flora/bush_tempe_me_lush.xml</Template>
+      <Position x="282.82288" z="26.90476"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="181">
+      <Template>actor|props/flora/bush_tempe_me_lush.xml</Template>
+      <Position x="274.00992" z="30.23928"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="182">
+      <Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
+      <Position x="270.38248" z="24.49682"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="183">
+      <Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
+      <Position x="274.86835" z="22.44986"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="184">
+      <Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
+      <Position x="264.16999" z="24.94616"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="185">
+      <Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
+      <Position x="266.38672" z="24.94616"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="186">
+      <Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
+      <Position x="267.03528" z="26.09928"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="187">
+      <Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
+      <Position x="291.87266" z="19.58149"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="188">
+      <Template>actor|props/flora/bush_tempe_la_lush.xml</Template>
+      <Position x="285.40857" z="20.9524"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="189">
+      <Template>actor|props/flora/foliagebush.xml</Template>
+      <Position x="288.24842" z="21.29178"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="190">
+      <Template>actor|props/flora/foliagebush.xml</Template>
+      <Position x="283.04896" z="20.83062"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="191">
+      <Template>actor|props/flora/foliagebush.xml</Template>
+      <Position x="281.66346" z="21.93403"/>
+      <Orientation y="0.86461"/>
+    </Entity>
+    <Entity uid="192">
+      <Template>actor|props/flora/foliagebush.xml</Template>
+      <Position x="284.37168" z="22.277"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="193">
+      <Template>actor|props/flora/foliagebush.xml</Template>
+      <Position x="282.35499" z="23.18769"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="194">
+      <Template>actor|props/flora/foliagebush.xml</Template>
+      <Position x="298.45963" z="21.47562"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="195">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="287.00412" z="20.45141"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="196">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="289.10392" z="21.10778"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="197">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="293.02747" z="17.37601"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="198">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="297.34318" z="17.01391"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="199">
+      <Template>actor|props/flora/bush_tempe_la.xml</Template>
+      <Position x="299.50019" z="16.07941"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="200">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="275.71418" z="26.56916"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="201">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="282.79346" z="22.06981"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="202">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="292.2797" z="21.64238"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="203">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="288.7516" z="20.5013"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="204">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="298.6811" z="19.14942"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="205">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="298.50953" z="25.24166"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="206">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="283.00156" z="23.50725"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="207">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="287.77054" z="21.09528"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="208">
+      <Template>actor|props/flora/bush_medit_la.xml</Template>
+      <Position x="287.95173" z="24.86187"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="209">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="288.82581" z="35.0086"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="210">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="289.8884" z="35.81725"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="211">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="290.4268" z="37.23607"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="212">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="290.07209" z="35.57451"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="213">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="296.79011" z="32.76421"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="214">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="294.97129" z="31.81437"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="215">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="295.21015" z="30.77144"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="216">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="276.96131" z="35.10988"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="217">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="278.78965" z="36.35962"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="218">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="277.34113" z="36.54398"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="219">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="275.2725" z="36.45162"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="220">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="260.52085" z="35.72602"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="221">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="267.6615" z="35.81543"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="222">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="268.74088" z="34.42621"/>
+      <Orientation y="1.8438"/>
+    </Entity>
+    <Entity uid="223">
+      <Template>actor|props/flora/bush_medit_sm.xml</Template>
+      <Position x="268.1172" z="37.58532"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="225">
+      <Template>actor|props/flora/bush_desert_dry_a.xml</Template>
+      <Position x="269.47815" z="61.69985"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="226">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="287.69126" z="55.1538"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="227">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="304.5748" z="78.98967"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="228">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="309.99076" z="80.02712"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="229">
+      <Template>actor|props/flora/bush_tempe_sm_dry.xml</Template>
+      <Position x="182.83262" z="106.45444"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="230">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="260.82682" z="53.32554"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="231">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="223.59562" z="83.53635"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="232">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="200.2223" z="62.42489"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="233">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="194.06037" z="57.30793"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="234">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="276.77" z="54.62615"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="235">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="272.66929" z="44.23176"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="236">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="309.15726" z="58.50882"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="237">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="136.49097" z="145.34888"/>
+      <Orientation y="-0.75988"/>
+    </Entity>
+    <Entity uid="238">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="154.89536" z="167.10907"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="239">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="136.32291" z="171.36371"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="245">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="201.90397" z="171.44248"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="246">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="183.31312" z="166.71232"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="247">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="171.49274" z="164.2505"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="256">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="176.0121" z="141.4928"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="257">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="166.80262" z="150.9994"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="258">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="123.25811" z="134.4115"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="260">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="270.38392" z="214.72745"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="261">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="178.31711" z="153.13578"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="262">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="192.14722" z="164.54468"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="263">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="218.26578" z="179.06016"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="266">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="151.05924" z="144.40867"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="267">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="141.50644" z="137.68918"/>
+      <Orientation y="-2.1806"/>
+    </Entity>
+    <Entity uid="268">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="131.63785" z="131.93677"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="269">
+      <Template>gaia/flora_tree_dead</Template>
+      <Player>0</Player>
+      <Position x="163.55393" z="136.7511"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="272">
+      <Template>gaia/flora_tree_aleppo_pine</Template>
+      <Player>0</Player>
+      <Position x="184.30573" z="159.62476"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="273">
+      <Template>gaia/flora_tree_aleppo_pine</Template>
+      <Player>0</Player>
+      <Position x="204.26023" z="180.19291"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="276">
+      <Template>gaia/flora_tree_aleppo_pine</Template>
+      <Player>0</Player>
+      <Position x="260.73942" z="219.076"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="277">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="153.91056" z="128.00287"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="278">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="138.84675" z="131.49656"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="279">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="117.54499" z="125.24613"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="280">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="129.1868" z="148.71134"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="281">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="124.96007" z="127.30735"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="282">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="180.77411" z="154.55854"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="283">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="207.24662" z="177.26194"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="284">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="213.41617" z="189.35013"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="285">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="265.60907" z="207.18122"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="287">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="271.37467" z="228.47855"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="288">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="286.9535" z="225.28986"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="289">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="300.08478" z="215.84726"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="290">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="321.23053" z="216.67615"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="291">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="342.39954" z="212.63984"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="292">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="338.97663" z="241.1106"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="293">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="315.52485" z="242.88175"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="294">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="305.94599" z="233.95151"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="297">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="163.85712" z="145.09705"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="298">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="157.24369" z="137.70725"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="299">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="130.41483" z="120.81693"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="301">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="286.80616" z="200.07569"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="302">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="277.38938" z="186.03571"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="303">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="358.23948" z="210.82163"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="304">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="346.91962" z="231.55964"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="305">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="327.01813" z="204.20688"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="306">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="318.1319" z="228.53132"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="307">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="150.30365" z="156.19263"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="308">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="126.75513" z="159.46436"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="309">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="143.521" z="174.71476"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="310">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="167.99921" z="125.69198"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="311">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="172.56763" z="133.99674"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="314">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="332.69266" z="223.3107"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="315">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="356.65717" z="226.4657"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="316">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="311.57334" z="212.9318"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="317">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="297.85627" z="227.05314"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="318">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="280.31357" z="209.95374"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="319">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="335.67624" z="250.19459"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="320">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="325.00742" z="257.45377"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="321">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="139.79816" z="155.13456"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="322">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="157.80436" z="159.32563"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="323">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="272.25943" z="193.99772"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="324">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="301.81354" z="205.40989"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="325">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="291.92786" z="212.45865"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="327">
+      <Template>gaia/flora_tree_aleppo_pine</Template>
+      <Player>0</Player>
+      <Position x="316.68903" z="206.21564"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="328">
+      <Template>gaia/flora_tree_aleppo_pine</Template>
+      <Player>0</Player>
+      <Position x="335.66312" z="219.7027"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="329">
+      <Template>gaia/flora_tree_aleppo_pine</Template>
+      <Player>0</Player>
+      <Position x="355.28876" z="219.80805"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="330">
+      <Template>gaia/flora_tree_aleppo_pine</Template>
+      <Player>0</Player>
+      <Position x="330.15882" z="231.18406"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="331">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="85.51034" z="152.94758"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="332">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="100.33367" z="155.5142"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="333">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="113.73923" z="157.74915"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="334">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="94.47974" z="170.21973"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="335">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="105.43018" z="177.04825"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="336">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="143.10096" z="193.82447"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="337">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="169.805" z="203.8407"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="338">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="211.5305" z="214.95362"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="339">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="182.77295" z="191.89506"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="340">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="167.93131" z="192.93125"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="341">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="137.45923" z="190.10242"/>
+      <Orientation y="-1.14083"/>
+    </Entity>
+    <Entity uid="342">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="122.43638" z="188.1002"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="343">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="123.4878" z="212.22303"/>
+      <Orientation y="0.06952"/>
+    </Entity>
+    <Entity uid="344">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="217.92277" z="227.26853"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="345">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="250.83463" z="239.7291"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="346">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="235.56061" z="226.58008"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="347">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="264.23151" z="248.3441"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="348">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="278.07526" z="250.8602"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="349">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="297.05137" z="254.04575"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="350">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="308.03116" z="269.86326"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="351">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="274.71772" z="261.21576"/>
+      <Orientation y="-0.93134"/>
+    </Entity>
+    <Entity uid="352">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="263.9422" z="278.72028"/>
+      <Orientation y="-0.13407"/>
+    </Entity>
+    <Entity uid="353">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="246.84516" z="267.6601"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="354">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="226.07441" z="241.30646"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="355">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="301.37812" z="300.77118"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="356">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="329.43256" z="291.52833"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="357">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="329.27973" z="279.87507"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="358">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="344.28019" z="298.52375"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="359">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="338.35734" z="308.78193"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="360">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="326.93696" z="327.50501"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="361">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="310.5276" z="333.599"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="362">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="299.83027" z="335.12775"/>
+      <Orientation y="-1.93113"/>
+    </Entity>
+    <Entity uid="363">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="281.54715" z="315.20417"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="364">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="226.12446" z="275.59546"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="365">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="191.50956" z="293.85944"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="366">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="192.31678" z="289.20197"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="367">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="212.36121" z="266.34849"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="368">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="205.28553" z="307.31217"/>
+      <Orientation y="-0.7143"/>
+    </Entity>
+    <Entity uid="369">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="189.8877" z="312.02417"/>
+      <Orientation y="-1.03068"/>
+    </Entity>
+    <Entity uid="370">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="176.88715" z="293.6703"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="372">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="194.60785" z="335.90006"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="373">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="180.2386" z="320.8396"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="374">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="178.60361" z="366.97101"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="375">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="186.41456" z="399.02744"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="376">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="186.20914" z="414.8585"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="377">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="161.92142" z="422.33341"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="378">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="146.25513" z="417.79511"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="379">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="116.50344" z="437.68241"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="380">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="99.35412" z="453.03736"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="381">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="53.22292" z="496.63685"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="382">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="56.55631" z="525.9773"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="383">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="101.01702" z="482.95014"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="384">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="134.79654" z="459.62818"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="385">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="135.37186" z="438.92917"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="386">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="149.02771" z="460.91788"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="387">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="184.59562" z="423.83283"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="388">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="176.19895" z="451.56724"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="389">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="189.41547" z="236.5424"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="390">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="197.55188" z="227.37851"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="391">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="198.839" z="191.26844"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="392">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="234.09989" z="217.7143"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="393">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="175.35608" z="178.21738"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="394">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="282.37168" z="243.14002"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="395">
+      <Template>actor|flora/trees/aleppo_pine.xml</Template>
+      <Position x="301.62708" z="249.27222"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="396">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="112.5968" z="144.9202"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="397">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="119.75585" z="150.50199"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="398">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="122.89795" z="167.45304"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="399">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="110.14748" z="172.30594"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="400">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="152.60746" z="186.28919"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="401">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="154.00303" z="176.46415"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="402">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="182.17353" z="176.24738"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="403">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="190.9534" z="187.7092"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="404">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="196.3744" z="210.98938"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="405">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="171.61457" z="209.33152"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="406">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="205.72181" z="206.0316"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="407">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="220.41568" z="213.4943"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="408">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="243.25687" z="224.34803"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="409">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="220.21482" z="205.81025"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="410">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="203.09238" z="185.37989"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="411">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="198.02106" z="177.94465"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="412">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="187.71543" z="175.0116"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="413">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="239.39621" z="212.83011"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="414">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="249.31016" z="226.44309"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="415">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="274.38642" z="235.8711"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="416">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="283.599" z="235.98401"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="417">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="291.4416" z="242.48813"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="418">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="308.84858" z="246.33997"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="419">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="317.44556" z="265.21763"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="420">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="313.12311" z="274.51752"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="421">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="304.82645" z="282.6301"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="422">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="286.76453" z="258.30756"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="423">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="284.40452" z="309.72742"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="424">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="267.00458" z="326.0593"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="425">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="187.81434" z="329.93693"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="426">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="186.69706" z="303.13126"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="427">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="333.37558" z="276.2793"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="428">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="346.49286" z="297.75358"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="429">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="339.27561" z="292.10468"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="430">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="306.24158" z="294.52924"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="431">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="318.59217" z="274.24595"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="432">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="314.77985" z="311.31171"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="433">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="325.2776" z="335.57093"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="434">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="319.56464" z="349.83457"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="435">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="305.64252" z="323.95997"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="436">
+      <Template>actor|flora/trees/european_beech_top.xml</Template>
+      <Position x="337.05878" z="284.02845"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="437">
+      <Template>actor|flora/trees/european_beech_top.xml</Template>
+      <Position x="161.8891" z="186.94706"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="438">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="117.25695" z="146.34684"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="439">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="161.04407" z="175.13971"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="440">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="169.92701" z="183.61893"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="441">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="119.43598" z="178.36933"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="442">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="151.65961" z="197.00397"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="443">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="183.99058" z="220.21592"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="444">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="233.97501" z="225.17527"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="445">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="287.20453" z="244.19587"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="446">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="284.77503" z="255.66968"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="447">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="245.6904" z="265.57078"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="448">
+      <Template>actor|flora/trees/lumbardypoplar.xml</Template>
+      <Position x="225.24534" z="236.95548"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="449">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="130.13678" z="140.50306"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="450">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="163.3682" z="166.12305"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="451">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="168.60807" z="177.21201"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="452">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="123.89872" z="179.67035"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="453">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="125.44326" z="171.59473"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="454">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="113.58481" z="156.09607"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="455">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="119.26896" z="153.46204"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="456">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="106.47886" z="168.99656"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="457">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="102.89548" z="165.47947"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="458">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="110.43932" z="166.89332"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="459">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="114.42458" z="174.77564"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="460">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="176.5864" z="193.39078"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="461">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="185.06678" z="208.21216"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="462">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="207.33216" z="202.73258"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="463">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="225.68046" z="214.13044"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="464">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="222.11097" z="221.72562"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="465">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="211.39396" z="223.26346"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="466">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="229.25812" z="230.82547"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="467">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="258.32895" z="228.71067"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="468">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="264.54801" z="238.53812"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="469">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="247.9618" z="241.20038"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="470">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="132.0774" z="165.12055"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="471">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="134.53748" z="185.1497"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="472">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="209.48783" z="197.45301"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="473">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="185.82227" z="203.42869"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="474">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="240.71918" z="243.9885"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="475">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="258.86286" z="242.73353"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="476">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="253.70377" z="252.38645"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="477">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="290.0001" z="255.96103"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="478">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="170.69791" z="172.24479"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="479">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="195.30781" z="199.21772"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="480">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="178.91749" z="190.02964"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="481">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="201.8125" z="224.04264"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="482">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="233.9698" z="234.25492"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="483">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="245.29307" z="237.7309"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="484">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="250.63648" z="222.8573"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="485">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="229.55546" z="224.17707"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="486">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="275.03418" z="250.98545"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="487">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="261.43873" z="270.6511"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="488">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="312.8993" z="257.58964"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="489">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="300.18693" z="264.1764"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="490">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="282.44687" z="289.39002"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="491">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="312.81803" z="307.35865"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="492">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="323.10361" z="323.67243"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="493">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="304.33048" z="322.85798"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="494">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="104.61954" z="140.25709"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="495">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="112.26095" z="135.09223"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="496">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="104.76392" z="130.57685"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="497">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="87.95913" z="150.53507"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="498">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="94.09791" z="144.749"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="499">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="91.24474" z="153.52302"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="500">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="109.05925" z="127.21428"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="501">
+      <Template>actor|flora/trees/tree_dead.xml</Template>
+      <Position x="125.45754" z="160.59546"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="502">
+      <Template>actor|flora/trees/tree_dead.xml</Template>
+      <Position x="157.81678" z="195.78504"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="503">
+      <Template>actor|flora/trees/tree_dead.xml</Template>
+      <Position x="198.1703" z="222.43494"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="504">
+      <Template>actor|flora/trees/tree_dead.xml</Template>
+      <Position x="186.3241" z="222.10514"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="505">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="139.08231" z="122.63775"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="506">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="147.35645" z="127.40038"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="507">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="160.41111" z="125.70516"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="508">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="174.74393" z="129.9401"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="509">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="185.33066" z="138.83329"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="510">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="182.05594" z="145.5315"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="511">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="194.89298" z="161.6902"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="512">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="192.44043" z="150.3353"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="513">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="214.86966" z="176.5745"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="514">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="205.71573" z="167.23203"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="515">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="232.93131" z="181.04609"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="517">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="271.9621" z="188.58817"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="518">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="294.96918" z="196.67475"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="519">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="310.79914" z="201.76288"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="520">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="326.44828" z="200.94684"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="521">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="343.94294" z="207.28263"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="522">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="338.77521" z="127.55079"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="523">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="338.1926" z="139.84208"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="524">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="351.14591" z="144.94504"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="525">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="144.80695" z="123.22959"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="526">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="134.59897" z="113.09038"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="527">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="140.33216" z="116.04592"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="528">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="136.36161" z="125.35343"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="529">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="140.02408" z="114.93798"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="530">
+      <Template>gaia/flora_bush_temperate</Template>
+      <Player>0</Player>
+      <Position x="160.94892" z="124.00335"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="531">
+      <Template>gaia/geology_stonemine_medit_quarry</Template>
+      <Player>0</Player>
+      <Position x="231.89936" z="191.7417"/>
+      <Orientation y="2.00121"/>
+    </Entity>
+    <Entity uid="532">
+      <Template>gaia/geology_stonemine_medit_quarry</Template>
+      <Player>0</Player>
+      <Position x="245.26487" z="196.60132"/>
+      <Orientation y="1.62592"/>
+    </Entity>
+    <Entity uid="540">
+      <Template>actor|props/units/weapons/rock.xml</Template>
+      <Position x="226.73203" z="187.03202"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="541">
+      <Template>actor|geology/stone_medit_med.xml</Template>
+      <Position x="231.65223" z="200.90278"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="543">
+      <Template>actor|geology/stone_granite_greek_med.xml</Template>
+      <Position x="235.98588" z="200.02973"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="544">
+      <Template>actor|geology/stone_granite_greek_large.xml</Template>
+      <Position x="233.16602" z="201.50623"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="545">
+      <Template>actor|geology/stone_granite_greek_large.xml</Template>
+      <Position x="230.1055" z="199.82209"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="546">
+      <Template>actor|geology/stone_granite_greek_large.xml</Template>
+      <Position x="229.28534" z="203.5463"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="547">
+      <Template>actor|geology/stone_granite_greek_small.xml</Template>
+      <Position x="228.804" z="205.0037"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="548">
+      <Template>actor|geology/stone_granite_greek_small.xml</Template>
+      <Position x="227.33735" z="202.79429"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="549">
+      <Template>actor|geology/stone_granite_greek_small.xml</Template>
+      <Position x="253.274" z="200.27042"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="550">
+      <Template>actor|props/special/eyecandy/blocks_limestone_pile_b.xml</Template>
+      <Position x="249.5431" z="188.68763"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="552">
+      <Template>actor|props/special/eyecandy/blocks_limestone_pile_b.xml</Template>
+      <Position x="250.55475" z="189.05002"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="553">
+      <Template>actor|props/special/eyecandy/blocks_limestone_pile_b.xml</Template>
+      <Position x="250.88306" z="189.90601"/>
+      <Orientation y="-0.7432"/>
+    </Entity>
+    <Entity uid="554">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="395.24988" z="160.90836"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="555">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="407.44516" z="170.32602"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="556">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="400.84897" z="164.94611"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="557">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="405.81553" z="160.11228"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="558">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="417.29944" z="168.00196"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="559">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="421.3245" z="183.44248"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="560">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="409.24967" z="191.82941"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="561">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="407.25098" z="183.16584"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="562">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="429.32154" z="201.90665"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="563">
+      <Template>actor|props/flora/bush_medit_la_dry.xml</Template>
+      <Position x="429.03513" z="189.2173"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="564">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="415.61652" z="167.40564"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="565">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="397.9116" z="174.60682"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="566">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="400.22013" z="187.70688"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="567">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="410.21555" z="188.44672"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="568">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="416.99885" z="196.92972"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="569">
+      <Template>actor|props/flora/bush_medit_me_dry.xml</Template>
+      <Position x="424.2027" z="178.64142"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="570">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="389.34266" z="158.7717"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="571">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="387.18128" z="166.88425"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="572">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="393.75345" z="170.82706"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="573">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="412.611" z="164.41675"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="574">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="418.33341" z="169.79233"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="575">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="434.30094" z="181.6861"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="576">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="422.06223" z="157.66202"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="577">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="437.01145" z="175.36811"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="578">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="452.56904" z="216.31803"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="579">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="437.79868" z="211.26258"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="580">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="432.19025" z="196.13266"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="581">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="389.03818" z="153.95218"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="582">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="385.758" z="160.06687"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="583">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="383.97318" z="166.8538"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="584">
+      <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
+      <Position x="391.50574" z="156.48938"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="594">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="313.53397" z="124.89072"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="595">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="317.52372" z="132.0546"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="596">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="310.02594" z="131.29172"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="597">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="322.73624" z="127.50736"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="598">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="319.59858" z="121.48458"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="599">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="315.25208" z="115.65203"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="600">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="326.15955" z="120.41326"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="601">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="322.11493" z="113.76371"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="602">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="265.01313" z="155.43631"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="603">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="275.27244" z="161.34623"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="604">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="285.00037" z="156.56583"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="605">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="270.92975" z="148.327"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="606">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="280.57734" z="148.0388"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="609">
+      <Template>other/bridge_hele</Template>
+      <Player>0</Player>
+      <Position x="350.30353" z="582.69074"/>
+      <Orientation y="-0.15276"/>
+    </Entity>
+    <Entity uid="610">
+      <Template>other/bridge_hele</Template>
+      <Player>0</Player>
+      <Position x="350.43921" z="574.88343"/>
+      <Orientation y="3.02306"/>
+    </Entity>
+    <Entity uid="611">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="373.25062" z="613.68433"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="612">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="368.41175" z="652.93451"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="613">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="380.17237" z="724.85346"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="614">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="367.36286" z="670.17981"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="615">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="376.06083" z="711.67792"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="616">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="372.75916" z="697.75391"/>
+      <Orientation y="-2.68052"/>
+    </Entity>
+    <Entity uid="617">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="366.51371" z="633.09491"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="618">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="367.44733" z="625.59668"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="619">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="363.55817" z="641.6717"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="620">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="384.68024" z="746.94178"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="621">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="369.55854" z="687.42133"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="622">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="363.5557" z="680.0448"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="623">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="362.34775" z="654.87818"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="624">
+      <Template>actor|flora/trees/oak.xml</Template>
+      <Position x="405.00504" z="634.06794"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="625">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="410.23511" z="655.89838"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="626">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="414.35492" z="702.3423"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="627">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="439.59064" z="703.94556"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="628">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="439.77558" z="742.45667"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="629">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="416.70704" z="600.30329"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="630">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="408.1887" z="566.42725"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="631">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="404.89658" z="543.25812"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="632">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="428.56873" z="514.71473"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="633">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="459.25486" z="521.36341"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="634">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="442.76911" z="568.36432"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="635">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="414.1858" z="522.50507"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="636">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="396.44105" z="503.47577"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="637">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="421.5954" z="473.2234"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="638">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="467.58375" z="491.04383"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="639">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="457.7505" z="467.86725"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="640">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="443.25303" z="462.13077"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="641">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="430.40943" z="504.26664"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="642">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="408.93903" z="492.23353"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="643">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="443.56522" z="483.14283"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="644">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="392.41843" z="533.14509"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="645">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="433.5907" z="536.99134"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="646">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="425.38611" z="609.36524"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="647">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="415.96567" z="455.9733"/>
+      <Orientation y="1.76523"/>
+    </Entity>
+    <Entity uid="648">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="467.50028" z="448.90934"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="649">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="444.37195" z="490.67075"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="650">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="449.37632" z="520.71802"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="651">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="433.69266" z="587.25489"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="652">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="444.28876" z="608.0912"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="653">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="426.62879" z="626.42634"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="654">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="450.3548" z="673.31257"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="655">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="480.79395" z="746.50843"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="656">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="441.11622" z="684.92817"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="657">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="473.85126" z="703.84382"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="658">
+      <Template>actor|flora/trees/oak_old.xml</Template>
+      <Position x="465.99531" z="655.76667"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="659">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="425.7339" z="549.75403"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="660">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="403.3725" z="529.30127"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="661">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="404.9084" z="483.73838"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="662">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="418.55585" z="485.64866"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="663">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="412.02054" z="506.88422"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="664">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="392.5572" z="518.72944"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="665">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="464.27073" z="505.94282"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="666">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="448.66462" z="501.6479"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="667">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="476.64094" z="480.73798"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="668">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="497.14475" z="452.17939"/>
+      <Orientation y="-1.59238"/>
+    </Entity>
+    <Entity uid="669">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="439.41034" z="453.58307"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="670">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="498.83881" z="469.7758"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="671">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="504.10315" z="480.99326"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="672">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="483.35676" z="470.22428"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="673">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="477.45429" z="463.1995"/>
+      <Orientation y="1.49782"/>
+    </Entity>
+    <Entity uid="674">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="557.98755" z="467.848"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="675">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="558.60401" z="457.82911"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="680">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="248.21915" z="334.35572"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="681">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="235.83548" z="310.69733"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="682">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="211.43268" z="315.1344"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="686">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="208.56965" z="432.21106"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="687">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="196.30451" z="430.28931"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="688">
+      <Template>actor|flora/trees/poplar.xml</Template>
+      <Position x="203.00351" z="445.74079"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="690">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="295.08243" z="374.17927"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="691">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="285.3093" z="367.81202"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="692">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="274.65989" z="355.1048"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="693">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="296.83954" z="350.70917"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="694">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="287.00565" z="341.8393"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="695">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="257.06269" z="319.37583"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="696">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="263.68131" z="340.39826"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="697">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="276.91807" z="371.93818"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="700">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="188.78492" z="390.1681"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="705">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="222.29566" z="323.1933"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="706">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="223.24106" z="312.58902"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="707">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="242.6851" z="316.23432"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="708">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="242.84614" z="304.82038"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="709">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="231.1277" z="296.57453"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="710">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="213.33219" z="292.55533"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="711">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="192.20939" z="306.53269"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="712">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="195.65299" z="334.29075"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="713">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="195.1154" z="350.57557"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="714">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="204.42606" z="337.2146"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="715">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="191.4834" z="367.70002"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="717">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="185.79249" z="374.19806"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="718">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="199.31894" z="354.88581"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="719">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="186.15091" z="355.95298"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="720">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="182.60193" z="350.09565"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="721">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="167.89039" z="380.17902"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="722">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="180.3281" z="378.125"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="723">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="204.99079" z="405.44272"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="724">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="194.40339" z="407.95276"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="725">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="204.80195" z="416.12372"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="727">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="261.54389" z="350.72141"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="738">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="316.35163" z="364.74122"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="739">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="299.09888" z="362.60682"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="743">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="189.80964" z="358.15629"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="747">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="183.77063" z="441.57306"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="748">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="152.83664" z="396.61942"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="749">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="169.2598" z="393.11857"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="750">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="164.84177" z="406.61265"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="751">
+      <Template>actor|flora/trees/oak_large.xml</Template>
+      <Position x="174.07914" z="417.83628"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="758">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="211.80631" z="332.6182"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="759">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="226.08982" z="327.19544"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="760">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="234.62043" z="319.43857"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="761">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="200.28089" z="322.48331"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="762">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="216.5943" z="302.62681"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="763">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="248.22498" z="316.01008"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="764">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="308.50971" z="369.38654"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="765">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="309.54154" z="356.57181"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="766">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="309.90021" z="342.37067"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="767">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="192.42905" z="446.75776"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="768">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="196.79221" z="455.17002"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="769">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="180.75208" z="458.52216"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="770">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="158.57712" z="450.06556"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="771">
+      <Template>actor|flora/trees/carob.xml</Template>
+      <Position x="192.66071" z="422.59186"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="776">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="212.1674" z="455.69831"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="778">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="317.2782" z="370.71125"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="779">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="305.01124" z="359.10004"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="780">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="310.87165" z="350.10526"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="781">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="316.61088" z="333.05329"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="782">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="285.52231" z="355.16138"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="783">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="280.74189" z="345.88282"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="784">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="197.68772" z="339.0164"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="785">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="191.65931" z="360.81489"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="786">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="331.00876" z="314.66343"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="787">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="323.57193" z="304.61695"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="788">
+      <Template>actor|flora/trees/european_beech.xml</Template>
+      <Position x="319.38584" z="308.4123"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="789">
+      <Template>actor|flora/trees/european_beech_aut.xml</Template>
+      <Position x="330.50174" z="304.81891"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="790">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="322.3177" z="345.55497"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="791">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="435.06885" z="482.2667"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="792">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="430.05732" z="473.34986"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="793">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="425.19834" z="504.55329"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="794">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="417.89469" z="551.12055"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="795">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="445.13083" z="530.60914"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="796">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="446.60077" z="505.42853"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="797">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="468.99665" z="486.73377"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="798">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="483.75184" z="494.79184"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="799">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="463.92554" z="498.71198"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="800">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="441.86786" z="500.6659"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="801">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="426.6521" z="500.8075"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="802">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="412.05726" z="522.22144"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="803">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="404.92148" z="520.95398"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="804">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="423.22202" z="522.81714"/>
+      <Orientation y="-0.023"/>
+    </Entity>
+    <Entity uid="805">
+      <Template>actor|flora/trees/pine.xml</Template>
+      <Position x="426.02656" z="544.34253"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="816">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="293.41395" z="420.88416"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="817">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="278.42872" z="449.1919"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="818">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="254.16202" z="439.51804"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="819">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="245.73127" z="424.49088"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="820">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="224.61896" z="442.31037"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="821">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="211.7021" z="448.74927"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="822">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="230.73502" z="435.11634"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="823">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="254.94352" z="397.21128"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="824">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="282.73444" z="395.53852"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="825">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="283.72248" z="382.71949"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="826">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="257.08155" z="380.06635"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="827">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="243.86936" z="360.29679"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="828">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="230.12113" z="349.35679"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="829">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="206.13492" z="366.07087"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="830">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="210.23288" z="378.72761"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="831">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="223.00068" z="408.09617"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="832">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="274.77643" z="398.40864"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="833">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="271.94043" z="376.57764"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="834">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="209.56562" z="400.6727"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="835">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="256.87415" z="426.6699"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="836">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="277.35538" z="413.88913"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="837">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="289.8188" z="404.94327"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="838">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="298.97522" z="389.78766"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="839">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="292.73353" z="388.25763"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="840">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="313.47407" z="370.71186"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="841">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="238.09263" z="444.48777"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="842">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="222.58854" z="453.58317"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="843">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="219.11991" z="424.17707"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="844">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="214.76163" z="409.85438"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="845">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="241.33765" z="433.14533"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="846">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="238.1131" z="411.96781"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="847">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="253.12269" z="387.91611"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="848">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="281.50593" z="387.15821"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="849">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="250.34083" z="351.69962"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="850">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="216.3953" z="352.09629"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="851">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="221.67142" z="380.95875"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="852">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="306.35013" z="380.09751"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="853">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="294.74564" z="397.31449"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="854">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="267.4308" z="434.41706"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="855">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="247.43897" z="445.17344"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="856">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="214.61527" z="445.09849"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="857">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="214.4289" z="433.98493"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="858">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="223.80188" z="418.56913"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="859">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="236.28608" z="370.75837"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="860">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="263.93592" z="370.39136"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="861">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="264.63871" z="377.96283"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="862">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="228.98288" z="356.72938"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="863">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="215.7887" z="362.98896"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="864">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="199.60062" z="377.49772"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="865">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="214.27204" z="392.12006"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="866">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="224.70881" z="393.32493"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="867">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="236.0973" z="389.14322"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="868">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="287.74625" z="427.74582"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="869">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="289.75095" z="446.86094"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="870">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="302.12772" z="427.67975"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="871">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="326.34516" z="445.12974"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="878">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="333.81931" z="465.12278"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="879">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="311.88306" z="470.46222"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="880">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="316.26081" z="487.23627"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="881">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="333.5919" z="494.2782"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="882">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="317.00712" z="477.43372"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="883">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="335.92206" z="447.6905"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="884">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="329.8141" z="457.90241"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="885">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="336.59748" z="455.95893"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="887">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="325.01636" z="487.0904"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="888">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="329.26172" z="507.09375"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="889">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="322.07071" z="500.42438"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="890">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="342.43747" z="439.78794"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="891">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="293.67206" z="412.7198"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="892">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="139.5294" z="466.46894"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="893">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="123.80936" z="479.87946"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="894">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="104.783" z="498.18232"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="895">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="91.08356" z="518.30707"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="896">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="146.5186" z="448.35389"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="897">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="159.16691" z="429.49494"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="898">
+      <Template>gaia/flora_tree_pine</Template>
+      <Player>0</Player>
+      <Position x="109.09702" z="465.42771"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="899">
+      <Template>structures/athen_temple</Template>
+      <Player>2</Player>
+      <Position x="200.32447" z="645.34937"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="900">
+      <Template>structures/athen_house</Template>
+      <Player>2</Player>
+      <Position x="157.70838" z="531.41285"/>
+      <Orientation y="-1.18644"/>
+    </Entity>
+    <Entity uid="901">
+      <Template>structures/athen_house</Template>
+      <Player>2</Player>
+      <Position x="139.94852" z="540.08753"/>
+      <Orientation y="-0.74064"/>
+    </Entity>
+    <Entity uid="902">
+      <Template>structures/athen_house</Template>
+      <Player>2</Player>
+      <Position x="129.44422" z="556.7356"/>
+      <Orientation y="0.35138"/>
+    </Entity>
+    <Entity uid="903">
+      <Template>structures/athen_barracks</Template>
+      <Player>2</Player>
+      <Position x="285.41495" z="600.81592"/>
+      <Orientation y="3.0927"/>
+    </Entity>
+    <Entity uid="904">
+      <Template>gaia/flora_tree_dead</Template>
+      <Player>0</Player>
+      <Position x="342.1027" z="264.7233"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="905">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="345.98322" z="258.13758"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="906">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="357.94999" z="242.52845"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="907">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="366.93171" z="223.9339"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="908">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="364.68461" z="234.81965"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="909">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="355.62165" z="255.33942"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="910">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="333.52533" z="270.98804"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="911">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="106.74198" z="554.55561"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="912">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="113.03136" z="579.13471"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="913">
+      <Template>gaia/flora_tree_oak</Template>
+      <Player>0</Player>
+      <Position x="99.37262" z="599.35047"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="914">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="85.4023" z="575.65198"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="915">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="110.14855" z="562.87372"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="916">
+      <Template>gaia/flora_tree_oak_large</Template>
+      <Player>0</Player>
+      <Position x="112.81067" z="535.44507"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="917">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="108.1707" z="600.34815"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="918">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="117.47388" z="572.34467"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="919">
+      <Template>gaia/flora_tree_carob</Template>
+      <Player>0</Player>
+      <Position x="105.24753" z="544.9994"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="920">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="90.96926" z="548.09888"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="921">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="92.65961" z="568.76301"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="922">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="87.55578" z="589.90741"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="923">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="102.4559" z="587.0813"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="924">
+      <Template>gaia/flora_tree_poplar</Template>
+      <Player>0</Player>
+      <Position x="116.39847" z="589.42347"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="925">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="101.42736" z="569.49201"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="926">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="90.23523" z="554.83973"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="927">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="77.74418" z="566.66541"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="928">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="102.13585" z="610.37989"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="929">
+      <Template>gaia/flora_tree_euro_beech</Template>
+      <Player>0</Player>
+      <Position x="120.7789" z="607.1272"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="930">
+      <Template>structures/athen_farmstead</Template>
+      <Player>2</Player>
+      <Position x="235.97013" z="501.99305"/>
+      <Orientation y="0.5644"/>
+    </Entity>
+    <Entity uid="933">
+      <Template>structures/athen_field</Template>
+      <Player>2</Player>
+      <Position x="233.76633" z="475.63215"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="934">
+      <Template>structures/athen_field</Template>
+      <Player>2</Player>
+      <Position x="253.64756" z="486.32065"/>
+      <Orientation y="2.44729"/>
+    </Entity>
+    <Entity uid="935">
+      <Template>structures/athen_field</Template>
+      <Player>2</Player>
+      <Position x="270.99665" z="510.89509"/>
+      <Orientation y="-0.86657"/>
+    </Entity>
+    <Entity uid="936">
+      <Template>structures/athen_field</Template>
+      <Player>2</Player>
+      <Position x="246.96119" z="517.26301"/>
+      <Orientation y="2.21221"/>
+    </Entity>
+    <Entity uid="937">
+      <Template>structures/athen_field</Template>
+      <Player>2</Player>
+      <Position x="210.76322" z="493.6969"/>
+      <Orientation y="-0.88595"/>
+    </Entity>
+    <Entity uid="938">
+      <Template>structures/athen_field</Template>
+      <Player>2</Player>
+      <Position x="205.93451" z="512.72181"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="939">
+      <Template>structures/athen_field</Template>
+      <Player>2</Player>
+      <Position x="226.37327" z="532.69538"/>
+      <Orientation y="-0.7138"/>
+    </Entity>
+    <Entity uid="940">
+      <Template>structures/athen_outpost</Template>
+      <Player>2</Player>
+      <Position x="319.74756" z="555.36121"/>
+      <Orientation y="-2.8877"/>
+    </Entity>
+    <Entity uid="941">
+      <Template>structures/athen_outpost</Template>
+      <Player>2</Player>
+      <Position x="298.8573" z="480.46076"/>
+      <Orientation y="-0.35004"/>
+    </Entity>
+    <Entity uid="944">
+      <Template>gaia/geology_stonemine_medit_quarry</Template>
+      <Player>0</Player>
+      <Position x="228.18204" z="669.21045"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="945">
+      <Template>gaia/geology_stonemine_medit_quarry</Template>
+      <Player>0</Player>
+      <Position x="246.55753" z="668.75287"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="946">
+      <Template>gaia/geology_metal_mediterranean_slabs</Template>
+      <Player>0</Player>
+      <Position x="270.07816" z="663.3772"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="947">
+      <Template>gaia/geology_metal_mediterranean_slabs</Template>
+      <Player>0</Player>
+      <Position x="286.58524" z="659.51655"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="948">
+      <Template>structures/athen_storehouse</Template>
+      <Player>2</Player>
+      <Position x="247.051" z="640.09693"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="949">
+      <Template>units/spart_infantry_javelinist_b</Template>
+      <Player>1</Player>
+      <Position x="282.56431" z="130.67441"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="950">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="210.38764" z="510.01066"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="951">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="218.20554" z="522.05677"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="952">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="246.06785" z="517.8282"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="953">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="218.41211" z="511.15317"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="954">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="222.15934" z="519.7173"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="955">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="227.4314" z="524.62391"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="956">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="238.18631" z="523.7223"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="957">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="214.39643" z="498.87885"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="958">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="220.06067" z="496.09214"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="959">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="225.48761" z="489.2064"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="960">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="233.1803" z="487.62006"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="961">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="239.49201" z="487.6858"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="962">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="247.95087" z="489.18985"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="963">
+      <Template>units/athen_support_female_citizen</Template>
+      <Player>2</Player>
+      <Position x="251.73856" z="492.52143"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="964">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="247.10514" z="466.22709"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="965">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="249.17966" z="467.23017"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="966">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="251.33555" z="468.13746"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="967">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="253.26767" z="468.87235"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="968">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="255.65592" z="469.61704"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="969">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="258.11625" z="470.23829"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="970">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="260.34263" z="470.8054"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="971">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="262.43174" z="471.6681"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="972">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="264.55527" z="472.32178"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="973">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="266.6071" z="472.938"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="974">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="268.73783" z="473.908"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="975">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="270.25599" z="474.62711"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="976">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="231.16391" z="459.69764"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="977">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="231.75095" z="461.39985"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="978">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="232.4892" z="462.99451"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="979">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="233.42066" z="464.78217"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="980">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="234.46543" z="466.39438"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="981">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="235.64368" z="468.02561"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="982">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="228.45359" z="460.72455"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="983">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="229.04944" z="462.20734"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="984">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="229.748" z="463.7097"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="985">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="230.53275" z="465.30567"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="986">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="231.22233" z="466.79044"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="987">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="232.2754" z="468.28495"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="988">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="280.24195" z="481.64167"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="989">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="283.26261" z="483.01041"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="990">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="276.80323" z="480.67914"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="991">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="273.3555" z="479.22007"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="992">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="287.23063" z="484.40928"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="993">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="291.29358" z="485.85676"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="994">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="271.46009" z="482.11615"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="995">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="276.06125" z="483.95112"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="996">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="278.65271" z="485.22562"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="997">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="282.1579" z="486.7295"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="998">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="285.46155" z="488.05292"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="999">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="289.39509" z="490.22852"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1000">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="270.40537" z="485.70453"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1001">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="274.48905" z="487.73105"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1002">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="277.71637" z="489.13431"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1003">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="280.72669" z="490.36393"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1004">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="283.80698" z="491.44751"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1005">
+      <Template>units/athen_champion_archer_infantry</Template>
+      <Player>2</Player>
+      <Position x="287.52875" z="492.96641"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1006">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="249.04303" z="463.28089"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1007">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="251.71436" z="464.06897"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1008">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="253.46512" z="464.95008"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1009">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="255.4337" z="465.84092"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1010">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="257.86884" z="466.82328"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1011">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="259.70234" z="467.35169"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1012">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="261.90186" z="467.97483"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1013">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="264.34964" z="468.99256"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1014">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="266.33341" z="469.64332"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1015">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="268.07172" z="470.91993"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1016">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="270.2545" z="471.27082"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1017">
+      <Template>units/athen_champion_sword_infantry</Template>
+      <Player>2</Player>
+      <Position x="272.42185" z="472.01844"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1018">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="244.64554" z="469.92106"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1019">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="246.6666" z="470.84971"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1020">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="249.13636" z="472.1128"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1021">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="251.80436" z="473.29603"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1022">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="254.7823" z="474.24033"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1023">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="257.11942" z="475.07392"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1024">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="260.75232" z="476.13276"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1025">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="263.87024" z="476.95173"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1026">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="266.32337" z="477.66181"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1027">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="268.45267" z="478.08783"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1028">
+      <Template>units/athen_champion_hoplite_infantry</Template>
+      <Player>2</Player>
+      <Position x="270.12162" z="478.51548"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1029">
+      <Template>units/athen_infantry_spearman_b</Template>
+      <Player>2</Player>
+      <Position x="259.1167" z="507.84064"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1030">
+      <Template>units/athen_infantry_spearman_b</Template>
+      <Player>2</Player>
+      <Position x="262.12653" z="508.71125"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1031">
+      <Template>units/athen_infantry_spearman_b</Template>
+      <Player>2</Player>
+      <Position x="265.67154" z="510.20408"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1032">
+      <Template>units/athen_infantry_spearman_b</Template>
+      <Player>2</Player>
+      <Position x="257.65998" z="511.65943"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1033">
+      <Template>units/athen_infantry_spearman_b</Template>
+      <Player>2</Player>
+      <Position x="260.58887" z="512.47486"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1034">
+      <Template>units/athen_infantry_spearman_b</Template>
+      <Player>2</Player>
+      <Position x="263.7627" z="513.44556"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1035">
+      <Template>units/athen_infantry_javelinist_b</Template>
+      <Player>2</Player>
+      <Position x="254.379" z="516.68818"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1036">
+      <Template>units/athen_infantry_javelinist_b</Template>
+      <Player>2</Player>
+      <Position x="256.86942" z="517.60206"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1037">
+      <Template>units/athen_infantry_javelinist_b</Template>
+      <Player>2</Player>
+      <Position x="259.00943" z="518.38209"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1038">
+      <Template>units/athen_infantry_javelinist_b</Template>
+      <Player>2</Player>
+      <Position x="262.08844" z="519.5699"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1039">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="236.7133" z="95.15862"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1040">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="243.77277" z="89.46189"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+    <Entity uid="1041">
+      <Template>gaia/flora_bush_berry</Template>
+      <Player>0</Player>
+      <Position x="237.5522" z="87.68006"/>
+      <Orientation y="2.35621"/>
+    </Entity>
+  </Entities>
+  <Paths/>
 </Scenario>
Index: binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
@@ -16,10 +16,6 @@
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_infantry_marine_archer_b
-      units/{civ}_champion_marine
-    </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/dock.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
@@ -36,8 +36,8 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry
-      units/{civ}_champion_ranged
+      units/{civ}_champion_hoplite_infantry
+      units/{civ}_champion_archer_infantry
     </Entities>
   </ProductionQueue>
   <Sound>
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
@@ -3,4 +3,9 @@
   <Identity>
     <Civ>athen</Civ>
   </Identity>
+  <ProductionQueue>
+    <Entities datatype="tokens">
+      units/{civ}_champion_javelin_infantry
+    </Entities>
+  </ProductionQueue>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -19,8 +19,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_champion_sword_infantry_barracks
+      units/{civ}_champion_javelin_chariot_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -26,11 +26,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_javelin_chariot
       units/{civ}_hero_boudicca
       units/{civ}_hero_caratacos
       units/{civ}_hero_cunobelin
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
@@ -14,10 +14,10 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_war_elephant
       units/{civ}_hero_hamilcar
       units/{civ}_hero_hannibal
       units/{civ}_hero_maharbal
-      units/{civ}_champion_elephant
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
@@ -19,8 +19,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
+      units/{civ}_champion_hoplite_infantry
+      units/{civ}_champion_spear_cavalry
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -19,8 +19,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_champion_sword_infantry_barracks
+      units/{civ}_champion_spear_cavalry_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -10,11 +10,11 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_spear_cavalry
       units/{civ}_hero_brennus
       units/{civ}_hero_viridomarus
       units/{civ}_hero_vercingetorix
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
@@ -21,10 +21,10 @@
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Tavern</GenericName>
-    <SpecificName>Taberna</SpecificName>
-    <Tooltip>Recruit Naked Fanatics.</Tooltip>
     <Icon>structures/celtic_embassy.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
+    <SpecificName>Taberna</SpecificName>
+    <Tooltip>Recruit Naked Fanatics.</Tooltip>
     <VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
   </Identity>
   <Obstruction>
@@ -33,7 +33,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_champion_fanatic
+      units/{civ}_champion_spear_infantry
     </Entities>
   </ProductionQueue>
   <RallyPoint/>
Index: binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
@@ -12,8 +12,8 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_champion_sword_infantry_barracks
+      units/{civ}_champion_javelin_cavalry_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -19,11 +19,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_javelin_cavalry
       units/{civ}_hero_caros
       units/{civ}_hero_indibil
       units/{civ}_hero_viriato
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
@@ -22,8 +22,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_a_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_champion_hoplite_infantry_barracks
+      units/{civ}_champion_spear_cavalry_barracks
     </Entities>
     <Technologies datatype="tokens">
       upgrade_rank_advanced_mercenary
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,11 +14,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_hoplite_infantry
+      units/{civ}_champion_spear_cavalry
       units/{civ}_hero_philip
       units/{civ}_hero_alexander
       units/{civ}_hero_demetrius
-      units/{civ}_champion_infantry_a
-      units/{civ}_champion_cavalry
       -units/{civ}_mechanical_siege_ballista_packed
       -units/{civ}_mechanical_siege_scorpio_packed
       -units/{civ}_mechanical_siege_oxybeles_packed
Index: binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
@@ -3,4 +3,11 @@
   <Identity>
     <Civ>mace</Civ>
   </Identity>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_javelin_infantry
+    </Entities>
+  </ProductionQueue>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
@@ -13,8 +13,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_maiden_barracks
+      units/{civ}_champion_mace_infantry_barracks
+      units/{civ}_champion_sword_infantry_barracks
     </Entities>
     <Technologies datatype="tokens">
       mauryans/special_archery_tradition
Index: binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -7,12 +7,12 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_mace_infantry
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_archer_chariot
       units/{civ}_hero_chanakya
       units/{civ}_hero_maurya
       units/{civ}_hero_ashoka
-      units/{civ}_champion_infantry
-      units/{civ}_champion_maiden
-      units/{civ}_champion_chariot
       -units/{civ}_mechanical_siege_ballista_packed
       -units/{civ}_mechanical_siege_scorpio_packed
       -units/{civ}_mechanical_siege_oxybeles_packed
Index: binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
+++ binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
@@ -26,22 +26,22 @@
   </Health>
   <Identity>
     <Civ>ptol</Civ>
-    <GenericName>Mercenary Camp (Egyptian)</GenericName>
-    <SpecificName>Stratópedo Misthophóron Aigyptiakós</SpecificName>
     <Classes datatype="tokens">MercenaryCamp</Classes>
-    <Tooltip>Capture this structure to train mercenaries from Hellenistic Egypt.</Tooltip>
+    <GenericName>Mercenary Camp (Egyptian)</GenericName>
     <Icon>structures/military_settlement.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
+    <SpecificName>Stratópedo Misthophóron Aigyptiakós</SpecificName>
+    <Tooltip>Capture this structure to train mercenaries from Hellenistic Egypt.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="23.5" depth="23.5"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_spearman_merc_b
-      units/{civ}_infantry_swordsman_merc_b
-      units/{civ}_cavalry_spearman_merc_b
-      units/{civ}_cavalry_javelinist_merc_b
+      units/{civ}_infantry_spearman_b
+      units/{civ}_infantry_swordsman_b
+      units/{civ}_cavalry_spearman_b
+      units/{civ}_cavalry_javelinist_b
     </Entities>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -43,10 +43,10 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
+      units/{civ}_champion_spear_infantry
       units/{civ}_hero_cyrus
       units/{civ}_hero_darius
       units/{civ}_hero_xerxes
-      units/{civ}_champion_infantry
     </Entities>
     <Technologies datatype="tokens">
       persians/immortals
Index: binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
@@ -7,7 +7,7 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_cavalry
+      units/{civ}_champion_spear_cavalry
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -41,9 +41,9 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_kardakes_hoplite
-      units/{civ}_kardakes_skirmisher
-      units/{civ}_champion_elephant
+      units/{civ}_champion_hoplite_infantry
+      units/{civ}_champion_javelin_infantry
+      units/{civ}_champion_war_elephant
     </Entities>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -13,9 +13,9 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
+      units/{civ}_champion_pike_infantry
+      units/{civ}_champion_spear_cavalry
+      units/{civ}_champion_war_elephant
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
@@ -8,7 +8,7 @@
     <Civ>ptol</Civ>
     <GenericName>Military Colony</GenericName>
     <SpecificName>Klēroukhia</SpecificName>
-    <Tooltip>This is the Ptolemaic expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
+    <Tooltip>This is the Ptolemaic expansion building, similar to Civic Centres for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="36.0" depth="36.0"/>
@@ -16,10 +16,10 @@
   <ProductionQueue>
     <Entities replace="" datatype="tokens">
       units/{civ}_support_female_citizen
-      units/{civ}_infantry_spearman_merc_b
-      units/{civ}_infantry_swordsman_merc_b
-      units/{civ}_cavalry_spearman_merc_b
-      units/{civ}_cavalry_javelinist_merc_b
+      units/{civ}_infantry_spearman_b
+      units/{civ}_infantry_swordsman_b
+      units/{civ}_cavalry_spearman_b
+      units/{civ}_cavalry_javelinist_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
@@ -22,8 +22,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
+      units/{civ}_champion_sword_infantry_barracks
+      units/{civ}_champion_sword_cavalry_barracks
     </Entities>
     <Technologies datatype="tokens">
       unlock_champion_units
Index: binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -6,11 +6,11 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_sword_cavalry
       units/{civ}_hero_marcellus
       units/{civ}_hero_maximus
       units/{civ}_hero_scipio
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
@@ -14,11 +14,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_chariot
-      units/{civ}_champion_infantry_swordsman
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
+      units/{civ}_champion_pike_infantry
+      units/{civ}_champion_scythed_chariot
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_spear_cavalry
+      units/{civ}_champion_war_elephant
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
Index: binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
@@ -6,16 +6,16 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <Tooltip>This is the Seleucid expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
+    <Tooltip>This is the Seleucid expansion building, similar to Civic Centres for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="30.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_swordsman_merc_b
-      units/{civ}_infantry_archer_merc_b
-      units/{civ}_cavalry_spearman_merc_b
+      units/{civ}_infantry_swordsman_b
+      units/{civ}_infantry_archer_b
+      units/{civ}_cavalry_spearman_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml
@@ -22,7 +22,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_sword
+      units/{civ}_infantry_swordsman
     </Entities>
   </ProductionQueue>
   <VisualActor>
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
@@ -3,4 +3,11 @@
   <Identity>
     <Civ>spart</Civ>
   </Identity>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}_champion_sword_infantry
+      units/{civ}_champion_javelin_infantry
+    </Entities>
+  </ProductionQueue>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
@@ -38,10 +38,10 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
+      units/{civ}_champion_hoplite_infantry
       units/{civ}_hero_leonidas
       units/{civ}_hero_brasidas
       units/{civ}_hero_agis
-      units/{civ}_champion_infantry_spear
     </Entities>
     <Technologies datatype="tokens">
       hellenes/spartans_agoge
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
@@ -31,10 +31,10 @@
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Stoa</GenericName>
-    <SpecificName>Hellenic Royal Stoa</SpecificName>
-    <Tooltip>Recruit special units.</Tooltip>
     <Icon>gaia/special_stoa.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
+    <SpecificName>Hellenic Royal Stoa</SpecificName>
+    <Tooltip>Recruit special units.</Tooltip>
     <VisibleClasses datatype="tokens">Town</VisibleClasses>
   </Identity>
   <Loot>
@@ -48,8 +48,6 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_black_cloak
-      units/{civ}_thureophoros
-      units/{civ}_thorakites
     </Entities>
   </ProductionQueue>
   <TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_archer_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_archer_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_archer">
+  <Identity>
+    <Civ>athen</Civ>
+    <GenericName>Scythian Archer</GenericName>
+    <Icon>units/athen_champion_ranged.png</Icon>
+    <Lang>greek</Lang>
+    <SpecificName>Toxótēs Skythikós</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/athenians/champion_unit_ranged.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_hoplite_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_hoplite_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Identity>
+    <Civ>athen</Civ>
+    <GenericName>City Guard</GenericName>
+    <Icon>units/athen_champion_infantry.png</Icon>
+    <Lang>greek</Lang>
+    <SpecificName>Epílektos</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/athenians/champion_unit_spear.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <GenericName>City Guard</GenericName>
-    <SpecificName>Epílektos</SpecificName>
-    <Icon>units/athen_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/athenians/champion_unit_spear.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_javelin_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_javelin_infantry.xml
@@ -0,0 +1,6 @@
+<?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/athen_champion_marine.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Athenian Marine</GenericName>
-    <SpecificName>Epibátēs Athēnaîos</SpecificName>
-    <Icon>units/athen_champion_marine.png</Icon>
-    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/athenians/champion_unit_marine.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Scythian Archer</GenericName>
-    <SpecificName>Toxótēs Skythikós</SpecificName>
-    <Icon>units/athen_champion_ranged.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/athenians/champion_unit_ranged.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_sword_infantry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>athen</Civ>
+    <GenericName>Athenian Marine</GenericName>
+    <Icon>units/athen_champion_marine.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
+    <SpecificName>Epibátēs Athēnaîos</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/athenians/champion_unit_marine.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen_infantry_archer_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen_infantry_archer_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_b.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_ranged_archer">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/athen_gymnasion
+      structures/athen_theatron
+      structures/athen_prytaneion
+      structures/athen_royal_stoa
+      structures/{civ}_wonder
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>athen</Civ>
+    <GenericName>Cretan Mercenary Archer</GenericName>
+    <Icon>units/hele_infantry_archer.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
+    <SelectionGroupName>units/athen_infantry_marine_archer_b</SelectionGroupName>
+    <SpecificName>Toxótēs Krētikós</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen_infantry_archer_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen_infantry_archer_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_infantry_marine_archer_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/athen_infantry_marine_archer_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/athenians/infantry_archer_a.xml</Actor>
-  </VisualActor>
-</Entity>
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
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen_gymnasion
-      structures/athen_theatron
-      structures/athen_prytaneion
-      structures/athen_royal_stoa
-      structures/{civ}_wonder
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <SelectionGroupName>units/athen_infantry_marine_archer_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <GenericName>Cretan Mercenary Archer</GenericName>
-    <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/hele_infantry_archer.png</Icon>
-    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/athen_infantry_marine_archer_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/athenians/infantry_archer_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_infantry_marine_archer_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/athenians/infantry_archer_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
@@ -9,8 +9,8 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/athen_infantry_marine_archer_b
-      units/athen_champion_marine
+      units/athen_infantry_archer_b
+      units/athen_champion_sword_infantry
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
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/brit_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_javelinist">
-  <Footprint replace="">
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>brit</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <GenericName>Celtic Chariot</GenericName>
-    <SpecificName>Carbanto</SpecificName>
-    <SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_brit.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/celts/champion_unit_4.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>brit</Civ>
-    <GenericName>Brythonic Longswordsman</GenericName>
-    <SpecificName>Delamokludda</SpecificName>
-    <SelectionGroupName>units/brit_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_brit.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/celts/champion_unit_3.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_javelin_chariot.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_javelin_chariot.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_javelinist">
+  <Footprint replace="">
+    <Square width="10.0" depth="10.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>brit</Civ>
+    <GenericName>Celtic Chariot</GenericName>
+    <Icon>units/celt_champion_cavalry_brit.png</Icon>
+    <SelectionGroupName>units/brit_champion_javelin_chariot</SelectionGroupName>
+    <SpecificName>Carbanto</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/champion_unit_4.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_javelin_chariot_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_javelin_chariot_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit_champion_javelin_chariot">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_sword_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>brit</Civ>
+    <GenericName>Brythonic Longswordsman</GenericName>
+    <Icon>units/celt_champion_infantry_brit.png</Icon>
+    <SelectionGroupName>units/brit_champion_sword_infantry</SelectionGroupName>
+    <SpecificName>Delamokludda</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/champion_unit_3.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_sword_infantry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_sword_infantry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit_champion_sword_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>Sacred Band Cavalry</GenericName>
-    <SpecificName>Sacred Band of Astarte</SpecificName>
-    <Icon>units/cart_sacred_band_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/champion_unit_3.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>North African War Elephant</GenericName>
-    <SpecificName>Pil Malḥamit</SpecificName>
-    <Icon>units/cart_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/champion_unit_2.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_hoplite_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_hoplite_infantry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Identity>
+    <Civ>cart</Civ>
+    <GenericName>Sacred Band Infantry</GenericName>
+    <Icon>units/cart_champion_infantry.png</Icon>
+    <SpecificName>Sacred Band of Ba'al</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/carthaginians/champion_spearman.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>Sacred Band Infantry</GenericName>
-    <SpecificName>Sacred Band of Ba'al</SpecificName>
-    <Icon>units/cart_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/champion_spearman.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_pike_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_pike_infantry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_pikeman">
+  <Identity>
+    <Civ>cart</Civ>
+    <GenericName>Sacred Band Pikeman</GenericName>
+    <Icon>units/cart_champion_infantry.png</Icon>
+    <SpecificName>Mašal</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/carthaginians/champion_unit_1.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>cart</Civ>
-    <GenericName>Sacred Band Pikeman</GenericName>
-    <SpecificName>Mašal</SpecificName>
-    <Icon>units/cart_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/carthaginians/champion_unit_1.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_spear_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_spear_cavalry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_spearman">
+  <Identity>
+    <Civ>cart</Civ>
+    <GenericName>Sacred Band Cavalry</GenericName>
+    <Icon>units/cart_sacred_band_cavalry.png</Icon>
+    <SpecificName>Sacred Band of Astarte</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/carthaginians/champion_unit_3.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_champion_war_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/cart_champion_war_elephant.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_elephant_melee">
+  <Identity>
+    <Civ>cart</Civ>
+    <GenericName>North African War Elephant</GenericName>
+    <Icon>units/cart_champion_cavalry.png</Icon>
+    <SpecificName>Pil Malḥamit</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/carthaginians/champion_unit_2.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>gaul</Civ>
-    <GenericName>Gallic Noble Cavalry</GenericName>
-    <SpecificName>Gallic Brihent</SpecificName>
-    <SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
-    <Icon>units/celt_champion_cavalry_gaul.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/celts/champion_unit_2.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Armour>
-    <Hack op="add">-4</Hack>
-    <Pierce op="add">-4</Pierce>
-  </Armour>
-  <Cost>
-    <BuildTime op="mul">0.5</BuildTime>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max op="mul">0.85</Max>
-  </Health>
-  <Identity>
-    <Civ>gaul</Civ>
-    <GenericName>Naked Fanatic</GenericName>
-    <SpecificName>Gaesata</SpecificName>
-    <Icon>units/celt_fanatic.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <UnitMotion>
-    <WalkSpeed op="add">5</WalkSpeed>
-    <Run>
-      <Speed op="add">2</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/celts/fanatic.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>gaul</Civ>
-    <GenericName>Heavy Swordsman</GenericName>
-    <SpecificName>Solduros</SpecificName>
-    <SelectionGroupName>units/gaul_champion_infantry</SelectionGroupName>
-    <Icon>units/celt_champion_infantry_gaul.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/celts/champion_unit_1.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_spear_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_spear_cavalry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_spearman">
+  <Identity>
+    <Civ>gaul</Civ>
+    <GenericName>Gallic Noble Cavalry</GenericName>
+    <Icon>units/celt_champion_cavalry_gaul.png</Icon>
+    <SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
+    <SpecificName>Gallic Brihent</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/champion_unit_2.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_spear_cavalry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_spear_cavalry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul_champion_spear_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_spear_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_spear_infantry.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Armour>
+    <Hack op="add">-4</Hack>
+    <Pierce op="add">-4</Pierce>
+  </Armour>
+  <Cost>
+    <BuildTime op="mul">0.5</BuildTime>
+    <Resources>
+      <food>0</food>
+      <metal op="mul">2</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">0.85</Max>
+  </Health>
+  <Identity>
+    <Civ>gaul</Civ>
+    <GenericName>Naked Fanatic</GenericName>
+    <Icon>units/celt_fanatic.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SpecificName>Gaesata</SpecificName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="add">5</WalkSpeed>
+    <Run>
+      <Speed op="add">2</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/celts/fanatic.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_sword_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>gaul</Civ>
+    <GenericName>Heavy Swordsman</GenericName>
+    <Icon>units/celt_champion_infantry_gaul.png</Icon>
+    <SelectionGroupName>units/gaul_champion_sword_infantry</SelectionGroupName>
+    <SpecificName>Solduros</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/champion_unit_1.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_sword_infantry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_sword_infantry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul_champion_sword_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_javelinist">
-  <Attack>
-    <Ranged>
-      <Pierce>5</Pierce>
-      <Crush>15</Crush>
-    </Ranged>
-  </Attack>
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Leial Zalduneria</SpecificName>
-    <Icon>units/iber_champion_cavalry.png</Icon>
-    <SelectionGroupName>units/iber_champion_cavalry</SelectionGroupName>
-    <Tooltip>Special: Flaming javelins. Good vs. Buildings.</Tooltip>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/champion_unit_2.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Leial Ezpatari</SpecificName>
-    <Icon>units/iber_champion_infantry.png</Icon>
-    <SelectionGroupName>units/iber_champion_infantry</SelectionGroupName>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/champion_unit_1.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_javelin_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber_champion_javelin_cavalry.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_javelinist">
+  <Attack>
+    <Ranged>
+      <Crush>15</Crush>
+      <Pierce>5</Pierce>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <Civ>iber</Civ>
+    <Icon>units/iber_champion_cavalry.png</Icon>
+    <SelectionGroupName>units/iber_champion_javelin_cavalry</SelectionGroupName>
+    <SpecificName>Leial Zalduneria</SpecificName>
+    <Tooltip>Special: Flaming javelins. Good vs. Buildings.</Tooltip>
+  </Identity>
+  <VisualActor>
+    <Actor>units/iberians/champion_unit_2.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_javelin_cavalry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber_champion_javelin_cavalry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/iber_champion_javelin_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber_champion_sword_infantry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>iber</Civ>
+    <Icon>units/iber_champion_infantry.png</Icon>
+    <SelectionGroupName>units/iber_champion_sword_infantry</SelectionGroupName>
+    <SpecificName>Leial Ezpatari</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/iberians/champion_unit_1.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_sword_infantry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/iber_champion_sword_infantry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/iber_champion_sword_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Companion Cavalry</GenericName>
-    <SpecificName>Hetaîros</SpecificName>
-    <Icon>units/hele_champion_cavalry_mace.png</Icon>
-    <SelectionGroupName>units/mace_champion_cavalry</SelectionGroupName>
-  </Identity>
-  <VisualActor>
-    <Actor>units/macedonians/champion_cavalry.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Identity>
+    <Civ>mace</Civ>
+    <GenericName>Macedonian Shield Bearer</GenericName>
+    <Icon>units/macedonian_hypaspist.png</Icon>
+    <Lang>greek</Lang>
+    <SelectionGroupName>units/mace_champion_hoplite_infantry</SelectionGroupName>
+    <SpecificName>Hypaspistḗs</SpecificName>
+  </Identity>
+  <Promotion>
+    <Entity>units/mace_champion_hoplite_infantry_e</Entity>
+    <RequiredXp>2000</RequiredXp>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/macedonians/champion_infantry_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry_barracks.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_champion_hoplite_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+  <Promotion>
+    <Entity>units/mace_champion_hoplite_infantry_e_barracks</Entity>
+  </Promotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry_e.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_champion_hoplite_infantry">
+  <Armour>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">1</Pierce>
+  </Armour>
+  <Health>
+    <Max op="mul">1.1</Max>
+  </Health>
+  <Identity>
+    <Icon>units/macedonian_argyraspidai.png</Icon>
+    <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/macedonians/champion_infantry_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry_e_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_hoplite_infantry_e_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_champion_hoplite_infantry_e">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Macedonian Shield Bearer</GenericName>
-    <SpecificName>Hypaspistḗs</SpecificName>
-    <Icon>units/macedonian_hypaspist.png</Icon>
-    <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
-  </Identity>
-  <Promotion>
-    <Entity>units/mace_champion_infantry_e</Entity>
-    <RequiredXp>2000</RequiredXp>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/macedonians/champion_infantry_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_a">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/mace_champion_infantry_e_barracks</Entity>
-  </Promotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_a">
-  <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">1</Pierce>
-  </Armour>
-  <Health>
-    <Max op="mul">1.1</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
-    <Icon>units/macedonian_argyraspidai.png</Icon>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/macedonians/champion_infantry_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_e">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_javelin_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_javelin_infantry.xml
@@ -0,0 +1,6 @@
+<?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/mace_champion_spear_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_spear_cavalry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_spearman">
+  <Identity>
+    <Civ>mace</Civ>
+    <GenericName>Companion Cavalry</GenericName>
+    <Icon>units/hele_champion_cavalry_mace.png</Icon>
+    <Lang>greek</Lang>
+    <SelectionGroupName>units/mace_champion_cavalry</SelectionGroupName>
+    <SpecificName>Hetaîros</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/macedonians/champion_cavalry.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_spear_cavalry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_spear_cavalry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_champion_spear_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_sword_infantry.xml
@@ -0,0 +1,6 @@
+<?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_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_archer_chariot.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_archer_chariot.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_archer">
+  <Footprint replace="">
+    <Square width="5.5" depth="10.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>maur</Civ>
+    <GenericName>War Chariot</GenericName>
+    <Icon>units/maur_champion_chariot.png</Icon>
+    <SelectionGroupName>units/maur_champion_archer_chariot</SelectionGroupName>
+    <SpecificName>Rath</SpecificName>
+    <Tooltip>Deals Trample Damage.</Tooltip>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+  </Identity>
+  <ResourceGatherer>
+    <MaxDistance>5.0</MaxDistance>
+    <Capacities>
+      <food>50</food>
+    </Capacities>
+  </ResourceGatherer>
+  <VisualActor>
+    <Actor>units/mauryans/chariot_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_archer_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_archer_infantry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_archer">
+  <Identity>
+    <Civ>maur</Civ>
+    <Gender>female</Gender>
+    <GenericName>Maiden Guard Archer</GenericName>
+    <Icon>units/maur_champion_maiden_archer.png</Icon>
+    <SelectionGroupName>units/maur_champion_archer_infantry</SelectionGroupName>
+    <SpecificName>Visha Kanya</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/mauryans/champion_maiden_guard_archer.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
-  <Footprint replace="">
-    <Square width="5.5" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <GenericName>War Chariot</GenericName>
-    <SpecificName>Rath</SpecificName>
-    <SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
-    <Icon>units/maur_champion_chariot.png</Icon>
-    <Tooltip>Deals Trample Damage.</Tooltip>
-  </Identity>
-  <ResourceGatherer>
-    <MaxDistance>5.0</MaxDistance>
-    <Capacities>
-      <food>50</food>
-    </Capacities>
-  </ResourceGatherer>
-  <VisualActor>
-    <Actor>units/mauryans/chariot_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>maur</Civ>
-    <GenericName>Indian War Elephant</GenericName>
-    <SpecificName>Gajendra</SpecificName>
-    <Icon>units/maur_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/elephant_siege.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Armour>
-    <Hack op="add">-1</Hack>
-    <Pierce op="add">-1</Pierce>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Hack>0</Hack>
-      <Crush>10.5</Crush>
-    </Melee>
-  </Attack>
-  <Identity>
-    <Civ>maur</Civ>
-    <GenericName>Warrior</GenericName>
-    <SpecificName>Yōddha</SpecificName>
-    <SelectionGroupName>units/maur_champion_infantry</SelectionGroupName>
-    <Icon>units/maur_champion_maceman.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/champion_maceman.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/maur_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_mace_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_mace_infantry.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack op="add">-1</Hack>
+    <Pierce op="add">-1</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>0</Hack>
+      <Crush>10.5</Crush>
+    </Melee>
+  </Attack>
+  <Identity>
+    <Civ>maur</Civ>
+    <GenericName>Warrior</GenericName>
+    <Icon>units/maur_champion_maceman.png</Icon>
+    <SelectionGroupName>units/maur_champion_mace_infantry</SelectionGroupName>
+    <SpecificName>Yōddha</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/mauryans/champion_maceman.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_mace_infantry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_mace_infantry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur_champion_mace_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>maur</Civ>
-    <Gender>female</Gender>
-    <GenericName>Maiden Guard</GenericName>
-    <SpecificName>Visha Kanya</SpecificName>
-    <SelectionGroupName>units/maur_champion_maiden</SelectionGroupName>
-    <Icon>units/maur_champion_maiden.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/champion_maiden_guard.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Identity>
-    <Civ>maur</Civ>
-    <Gender>female</Gender>
-    <GenericName>Maiden Guard Archer</GenericName>
-    <SpecificName>Visha Kanya</SpecificName>
-    <Icon>units/maur_champion_maiden_archer.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/mauryans/champion_maiden_guard_archer.xml</Actor>
-  </VisualActor>
-</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
+++ /dev/null
@@ -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/maur_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_sword_infantry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>maur</Civ>
+    <Gender>female</Gender>
+    <GenericName>Maiden Guard</GenericName>
+    <Icon>units/maur_champion_maiden.png</Icon>
+    <SelectionGroupName>units/maur_champion_sword_infantry</SelectionGroupName>
+    <SpecificName>Visha Kanya</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/mauryans/champion_maiden_guard.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_sword_infantry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_sword_infantry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur_champion_sword_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_war_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_war_elephant.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_elephant_melee">
+  <Identity>
+    <Civ>maur</Civ>
+    <GenericName>Indian War Elephant</GenericName>
+    <Icon>units/maur_champion_elephant.png</Icon>
+    <SpecificName>Gajendra</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/mauryans/elephant_siege.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
@@ -9,7 +9,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/maur_champion_maiden_archer
+      units/maur_champion_archer_infantry
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
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
@@ -17,11 +17,11 @@
   </Cost>
   <Identity>
     <Civ>gaia</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Armored Swordsman</GenericName>
-    <SpecificName>Thōrakitēs</SpecificName>
+    <GenericName>Armoured Swordsman</GenericName>
     <Icon>units/mace_thorakites.png</Icon>
+    <Lang>greek</Lang>
     <RequiredTechnology>phase_city</RequiredTechnology>
+    <SpecificName>Thōrakitēs</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <VisualActor>
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
@@ -8,11 +8,11 @@
   </Cost>
   <Identity>
     <Civ>gaia</Civ>
-    <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
-    <SpecificName>Thyreophóros</SpecificName>
     <Icon>units/mace_thureophoros.png</Icon>
+    <Lang>greek</Lang>
     <RequiredTechnology>phase_city</RequiredTechnology>
+    <SpecificName>Thyreophóros</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_javelinist_b_trireme">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_javelinist_e_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelinist">
-  <Cost>
-    <BuildTime op="add">3</BuildTime>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <SelectionGroupName>units/pers_cavalry_javelinist_b</SelectionGroupName>
-    <GenericName>Median Light Cavalry</GenericName>
-    <SpecificName>Mada Asabara</SpecificName>
-    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-    <Icon>units/pers_cavalry_javelinist.png</Icon>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_javelinist_a_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_javelinist_a_trireme">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b_trireme">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
-  <Cost>
-    <BuildTime op="add">3</BuildTime>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <SelectionGroupName>units/pers_cavalry_swordsman_b</SelectionGroupName>
-    <GenericName>Hyrcanian Cavalry</GenericName>
-    <SpecificName>Varkaniya Asabara</SpecificName>
-    <Icon>units/pers_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a_trireme">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_archer_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_archer_cavalry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_archer">
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Bactrian Heavy Cavalry Archer</GenericName>
+    <Icon>units/pers_champion_cavalry.png</Icon>
+    <SpecificName>Bakhtrish Asabara</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/champion_unit_2_archer.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Bactrian Heavy Lancer</GenericName>
-    <SpecificName>Bakhtrish Asabara</SpecificName>
-    <Icon>units/pers_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/champion_unit_2.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Bactrian Heavy Cavalry Archer</GenericName>
-    <SpecificName>Bakhtrish Asabara</SpecificName>
-    <Icon>units/pers_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/champion_unit_2_archer.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Indian War Elephant</GenericName>
-    <SpecificName>Hinduya Pila</SpecificName>
-    <Icon>units/pers_war_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/war_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_hoplite_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_hoplite_infantry.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <metal op="mul">2</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Cardaces Hoplite</GenericName>
+    <Icon>units/pers_kardakes.png</Icon>
+    <SpecificName>Hoplites Kardakes</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/kardakes_hoplite.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Persian Immortal</GenericName>
-    <SpecificName>Anusiya</SpecificName>
-    <Classes datatype="tokens">Immortal</Classes>
-    <Icon>units/pers_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/champion_unit_1.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_javelin_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_javelin_infantry.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_javelinist">
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <metal op="mul">2</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Cardaces Skirmisher</GenericName>
+    <Icon>units/pers_kardakes_skirmisher.png</Icon>
+    <SpecificName>Peltastes Kardakes</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/kardakes_skirmisher.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_spear_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_spear_cavalry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_spearman">
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Bactrian Heavy Lancer</GenericName>
+    <Icon>units/pers_champion_cavalry.png</Icon>
+    <SpecificName>Bakhtrish Asabara</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/champion_unit_2.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_spear_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_spear_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Identity>
+    <Civ>pers</Civ>
+    <Classes datatype="tokens">Immortal</Classes>
+    <GenericName>Persian Immortal</GenericName>
+    <Icon>units/pers_champion_infantry.png</Icon>
+    <SpecificName>Anusiya</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/champion_unit_1.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_war_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_war_elephant.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_elephant_melee">
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Indian War Elephant</GenericName>
+    <Icon>units/pers_war_elephant.png</Icon>
+    <SpecificName>Hinduya Pila</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/war_elephant.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
@@ -12,7 +12,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers_champion_infantry
+      units/pers_champion_spear_infantry
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
Index: binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Cardaces Hoplite</GenericName>
-    <SpecificName>Hoplites Kardakes</SpecificName>
-    <Icon>units/pers_kardakes.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/kardakes_hoplite.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelinist">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Cardaces Skirmisher</GenericName>
-    <SpecificName>Peltastes Kardakes</SpecificName>
-    <Icon>units/pers_kardakes_skirmisher.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-  </Identity>
-  <VisualActor>
-    <Actor>units/persians/kardakes_skirmisher.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
@@ -7,14 +7,15 @@
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Phoenician Trireme</GenericName>
-    <SpecificName>Vazarka Hamaraniyanava</SpecificName>
     <Icon>units/pers_ship_trireme.png</Icon>
+    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
+    <SpecificName>Vazarka Hamaraniyanava</SpecificName>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers_cavalry_swordsman_b_trireme
-      units/pers_cavalry_javelinist_b_trireme
+      units/pers_cavalry_swordsman_b
+      units/pers_cavalry_javelinist_b
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_cavalry_javelinist_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_cavalry_javelinist_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/macedonians/cavalry_javelinist_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_b.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_ranged_javelinist">
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>Tarantine Settler Cavalry</GenericName>
+    <Icon>units/mace_cavalry_javelinist.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/ptol_javelin_cavalry</SelectionGroupName>
+    <SpecificName>Hippeús Tarantînos</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_cavalry_javelinist_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/macedonians/cavalry_javelinist_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_cavalry_javelinist_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/macedonians/cavalry_javelinist_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_javelinist_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_cavalry_javelinist_merc_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/macedonians/cavalry_javelinist_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelinist">
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SelectionGroupName>units/ptol_cavalry_javelinist_merc_b</SelectionGroupName>
-    <GenericName>Tarantine Settler Cavalry</GenericName>
-    <SpecificName>Hippeús Tarantînos</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/mace_cavalry_javelinist.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_cavalry_javelinist_merc_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/macedonians/cavalry_javelinist_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_javelinist_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/macedonians/cavalry_javelinist_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_cavalry_spearman_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_cavalry_spearman_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/ptolemies/cavalry_spearman_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_b.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_melee_spearman">
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>Macedonian Settler Cavalry</GenericName>
+    <Icon>units/ptol_cavalry_spearman.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/ptol_cavalry_spearman</SelectionGroupName>
+    <SpecificName>Hippeús Makedonikós</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_cavalry_spearman_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/ptolemies/cavalry_spearman_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_cavalry_spearman_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/ptolemies/cavalry_spearman_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_spearman_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_cavalry_spearman_merc_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/ptolemies/cavalry_spearman_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SelectionGroupName>units/ptol_cavalry_spearman_merc_b</SelectionGroupName>
-    <GenericName>Macedonian Settler Cavalry</GenericName>
-    <SpecificName>Hippeús Makedonikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/ptol_cavalry_spearman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_cavalry_spearman_merc_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/ptolemies/cavalry_spearman_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_spearman_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/ptolemies/cavalry_spearman_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Royal Guard Cavalry</GenericName>
-    <SpecificName>Ágēma Basiléōs</SpecificName>
-    <Icon>units/ptol_champion_cavalry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/champion_cavalry.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Towered War Elephant</GenericName>
-    <SpecificName>Polémou Eléphantos</SpecificName>
-    <Icon>units/ptol_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/champion_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>ptol</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Royal Guard Infantry</GenericName>
-    <SpecificName>Phalangitès Agema</SpecificName>
-    <Icon>units/ptol_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/ptolemies/champion_infantry.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_quinquereme">
-  <Cost>
-    <Population>8</Population>
-    <BuildTime>60</BuildTime>
-    <Resources>
-      <wood>400</wood>
-      <metal>300</metal>
-      <stone>350</stone>
-    </Resources>
-  </Cost>
-  <GarrisonHolder>
-    <Max>100</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>4000</Max>
-  </Health>
-  <Identity>
-    <Civ>ptol</Civ>
-    <GenericName>Juggernaut</GenericName>
-    <SpecificName>Tessarakonterēs</SpecificName>
-    <Classes datatype="tokens">Juggernaut</Classes>
-    <Icon>units/rome_ship_quinquereme.png</Icon>
-  </Identity>
-  <Loot>
-    <xp>200</xp>
-    <wood>50</wood>
-    <metal>50</metal>
-  </Loot>
-  <TrainingRestrictions>
-    <Category>Juggernaut</Category>
-  </TrainingRestrictions>
-  <VisualActor>
-    <Actor>structures/romans/quinquereme.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut_wargalley.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut_wargalley.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_quinquereme">
+  <Cost>
+    <Population>8</Population>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <wood>400</wood>
+      <metal>300</metal>
+      <stone>350</stone>
+    </Resources>
+  </Cost>
+  <GarrisonHolder>
+    <Max>100</Max>
+  </GarrisonHolder>
+  <Health>
+    <Max>4000</Max>
+  </Health>
+  <Identity>
+    <Civ>ptol</Civ>
+    <Classes datatype="tokens">Juggernaut</Classes>
+    <GenericName>Juggernaut</GenericName>
+    <Icon>units/rome_ship_quinquereme.png</Icon>
+    <SpecificName>Tessarakonterēs</SpecificName>
+  </Identity>
+  <Loot>
+    <xp>200</xp>
+    <wood>50</wood>
+    <metal>50</metal>
+  </Loot>
+  <TrainingRestrictions>
+    <Category>Juggernaut</Category>
+  </TrainingRestrictions>
+  <VisualActor>
+    <Actor>structures/romans/quinquereme.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_pike_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_pike_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_pikeman">
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>Royal Guard Infantry</GenericName>
+    <Icon>units/ptol_champion_infantry.png</Icon>
+    <Lang>greek</Lang>
+    <SpecificName>Phalangitès Agema</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/ptolemies/champion_infantry.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_spear_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_spear_cavalry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_spearman">
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>Royal Guard Cavalry</GenericName>
+    <Icon>units/ptol_champion_cavalry.png</Icon>
+    <SpecificName>Ágēma Basiléōs</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/ptolemies/champion_cavalry.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_war_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_war_elephant.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_elephant_melee">
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>North African War Elephant</GenericName>
+    <Icon>units/ptol_champion_elephant.png</Icon>
+    <SpecificName>Polémou Eléphantos</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/ptolemies/champion_elephant.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_infantry_spearman_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_infantry_spearman_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_spearman_2_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_b.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee_spearman">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/ptol_military_colony
+      structures/ptol_lighthouse
+      structures/ptol_library
+      structures/ptol_wonder
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>ptol</Civ>
+    <GenericName>Mercenary Thureos Spearman</GenericName>
+    <Icon>units/ptol_infantry_spearman_2.png</Icon>
+    <SelectionGroupName>units/ptol_infantry_spearman</SelectionGroupName>
+    <SpecificName>Thureophóros Misthophóros</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_infantry_spearman_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_spearman_2_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_infantry_spearman_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_spearman_2_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_infantry_spearman_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_infantry_spearman_merc_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/ptolemies/infantry_spearman_2_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol_military_colony
-      structures/ptol_lighthouse
-      structures/ptol_library
-      structures/ptol_wonder
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SelectionGroupName>units/ptol_infantry_spearman_merc_b</SelectionGroupName>
-    <GenericName>Mercenary Thureos Spearman</GenericName>
-    <SpecificName>Thureophóros Misthophóros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/ptol_infantry_spearman_2.png</Icon>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_infantry_spearman_merc_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/ptolemies/infantry_spearman_2_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_infantry_spearman_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/ptolemies/infantry_spearman_2_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_infantry_swordsman_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_infantry_swordsman_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_swordsman_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_b.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee_swordsman">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/ptol_military_colony
+      structures/ptol_lighthouse
+      structures/ptol_library
+      structures/ptol_wonder
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>ptol</Civ>
+    <Classes datatype="tokens">Celt</Classes>
+    <GenericName>Gallic Mercenary Swordsman</GenericName>
+    <Icon>units/cart_infantry_swordsman.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/ptol_infantry_swordsman</SelectionGroupName>
+    <SpecificName>Gallikós Mistophorós</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_infantry_swordsman_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_swordsman_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/ptol_infantry_swordsman_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_swordsman_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_infantry_swordsman_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_infantry_swordsman_merc_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/ptolemies/infantry_swordsman_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol_military_colony
-      structures/ptol_lighthouse
-      structures/ptol_library
-      structures/ptol_wonder
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>ptol</Civ>
-    <SelectionGroupName>units/ptol_infantry_swordsman_merc_b</SelectionGroupName>
-    <GenericName>Gallic Mercenary Swordsman</GenericName>
-    <SpecificName>Gallikós Mistophorós</SpecificName>
-    <Classes datatype="tokens">Celt</Classes>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/cart_infantry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_infantry_swordsman_merc_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/ptolemies/infantry_swordsman_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_infantry_swordsman_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/ptolemies/infantry_swordsman_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_swordsman">
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <SpecificName>Eques Consularis</SpecificName>
-    <GenericName>Consular Bodyguard</GenericName>
-    <Icon>units/rome_champion_cavalry.png</Icon>
-    <SelectionGroupName>units/rome_champion_cavalry</SelectionGroupName>
-  </Identity>
-  <VisualActor>
-    <Actor>units/romans/champion_unit_2.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <GenericName>Italic Heavy Infantry</GenericName>
-    <SpecificName>Extraordinarius</SpecificName>
-    <SelectionGroupName>units/rome_champion_infantry</SelectionGroupName>
-    <Icon>units/rome_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/romans/champion_unit_1.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-    <SelectionGroupName>units/rome_champion_infantry</SelectionGroupName>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_sword_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome_champion_sword_cavalry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_swordsman">
+  <Identity>
+    <Civ>rome</Civ>
+    <GenericName>Consular Bodyguard</GenericName>
+    <Icon>units/rome_champion_cavalry.png</Icon>
+    <Lang>latin</Lang>
+    <SelectionGroupName>units/rome_champion_sword_cavalry</SelectionGroupName>
+    <SpecificName>Eques Consularis</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/romans/champion_unit_2.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_sword_cavalry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome_champion_sword_cavalry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome_champion_sword_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome_champion_sword_infantry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>rome</Civ>
+    <GenericName>Italic Heavy Infantry</GenericName>
+    <Icon>units/rome_champion_infantry.png</Icon>
+    <Lang>latin</Lang>
+    <SelectionGroupName>units/rome_champion_sword_infantry</SelectionGroupName>
+    <SpecificName>Extraordinarius</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/romans/champion_unit_1.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_sword_infantry_barracks.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/rome_champion_sword_infantry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome_champion_sword_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele_cavalry_spearman_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/sele_cavalry_spearman_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/macedonians/cavalry_spearman_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_b.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_melee_spearman">
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Companion Cavalry</GenericName>
+    <Icon>units/mace_cavalry_spearman.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/sele_cavalry_spearman</SelectionGroupName>
+    <SpecificName>Hippos Hetairike</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/sele_cavalry_spearman_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/macedonians/cavalry_spearman_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele_cavalry_spearman_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/macedonians/cavalry_spearman_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_cavalry_spearman_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/sele_cavalry_spearman_merc_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/macedonians/cavalry_spearman_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <SelectionGroupName>units/sele_cavalry_spearman_merc_b</SelectionGroupName>
-    <GenericName>Companion Cavalry</GenericName>
-    <SpecificName>Hippos Hetairike</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <Icon>units/mace_cavalry_spearman.png</Icon>
-  </Identity>
-  <Promotion>
-    <Entity>units/sele_cavalry_spearman_merc_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/macedonians/cavalry_spearman_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_cavalry_spearman_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/macedonians/cavalry_spearman_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Seleucid Cataphract</GenericName>
-    <SpecificName>Seleukidón Kataphraktos</SpecificName>
-    <Icon>units/sele_champion_cataphract.png</Icon>
-    <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/champion_cataphract.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
-  <Footprint replace="">
-    <Square width="7.5" depth="15.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <GenericName>Scythed Chariot</GenericName>
-    <SpecificName>Drepanèphoros</SpecificName>
-    <Icon>units/sele_champion_chariot.png</Icon>
-    <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
-  </Identity>
-  <ResourceGatherer>
-    <MaxDistance>5.0</MaxDistance>
-    <Capacities>
-      <food>50</food>
-    </Capacities>
-  </ResourceGatherer>
-  <VisualActor>
-    <Actor>units/persians/cavalry_archer_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Armored War Elephant</GenericName>
-    <SpecificName>Thorakisménos Eléphantos</SpecificName>
-    <Icon>units/maur_champion_elephant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/champion_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Silver Shield Pikeman</GenericName>
-    <SpecificName>Phalangitès Argyraspis</SpecificName>
-    <Icon>units/sele_champion_infantry_pikeman.png</Icon>
-    <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/champion_infantry_pikeman.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Romanized Heavy Swordsman</GenericName>
-    <SpecificName>Thorakitès Rhomaïkós</SpecificName>
-    <Icon>units/sele_champion_swordsman.png</Icon>
-    <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/seleucids/champion_infantry_swordsman.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_pike_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_pike_infantry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_pikeman">
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Silver Shield Pikeman</GenericName>
+    <Icon>units/sele_champion_infantry_pikeman.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
+    <SpecificName>Phalangitès Argyraspis</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/seleucids/champion_infantry_pikeman.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_scythed_chariot.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_scythed_chariot.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_archer">
+  <Footprint replace="">
+    <Square width="7.5" depth="15.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Scythed Chariot</GenericName>
+    <Icon>units/sele_champion_chariot.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
+    <SpecificName>Drepanèphoros</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+  </Identity>
+  <ResourceGatherer>
+    <MaxDistance>5.0</MaxDistance>
+    <Capacities>
+      <food>50</food>
+    </Capacities>
+  </ResourceGatherer>
+  <VisualActor>
+    <Actor>units/persians/cavalry_archer_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_spear_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_spear_cavalry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_spearman">
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Seleucid Cataphract</GenericName>
+    <Icon>units/sele_champion_cataphract.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
+    <SpecificName>Seleukidón Kataphraktos</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/seleucids/champion_cataphract.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_sword_infantry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Romanized Heavy Swordsman</GenericName>
+    <Icon>units/sele_champion_swordsman.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>successors/unlock_reform_army</RequiredTechnology>
+    <SpecificName>Thorakitès Rhomaïkós</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/seleucids/champion_infantry_swordsman.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_war_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_war_elephant.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_elephant_melee">
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Syrian War Elephant</GenericName>
+    <Icon>units/maur_champion_elephant.png</Icon>
+    <Lang>greek</Lang>
+    <SpecificName>Sýrios Eléphantos</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/seleucids/champion_elephant.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele_infantry_archer_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/sele_infantry_archer_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/seleucids/infantry_archer_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_b.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_ranged_archer">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/sele_military_colony
+      structures/sele_library
+      structures/sele_wonder
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Syrian Archer</GenericName>
+    <Icon>units/hele_infantry_archer.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/sele_infantry_archer</SelectionGroupName>
+    <SpecificName>Toxótēs Syrías</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/sele_infantry_archer_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/seleucids/infantry_archer_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele_infantry_archer_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/seleucids/infantry_archer_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_infantry_archer_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/sele_infantry_archer_merc_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_archer_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/sele_military_colony
-      structures/sele_library
-      structures/sele_wonder
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <SelectionGroupName>units/sele_infantry_archer_merc_b</SelectionGroupName>
-    <GenericName>Syrian Archer</GenericName>
-    <SpecificName>Toxótēs Syrías</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <Icon>units/hele_infantry_archer.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/sele_infantry_archer_merc_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_archer_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_infantry_archer_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_archer_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele_infantry_swordsman_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/sele_infantry_swordsman_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/seleucids/infantry_swordsman_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_b.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee_swordsman">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/sele_military_colony
+      structures/sele_library
+      structures/sele_wonder
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>sele</Civ>
+    <GenericName>Thracian Mercenary Swordsman</GenericName>
+    <Icon>units/sele_infantry_swordsman.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SelectionGroupName>units/sele_infantry_swordsman</SelectionGroupName>
+    <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/sele_infantry_swordsman_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/seleucids/infantry_swordsman_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/sele_infantry_swordsman_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/seleucids/infantry_swordsman_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_infantry_swordsman_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/sele_infantry_swordsman_merc_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_swordsman_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/sele_military_colony
-      structures/sele_library
-      structures/sele_wonder
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>sele</Civ>
-    <Lang>greek</Lang>
-    <SelectionGroupName>units/sele_infantry_swordsman_merc_b</SelectionGroupName>
-    <GenericName>Thracian Mercenary Swordsman</GenericName>
-    <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
-    <Icon>units/sele_infantry_swordsman.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/sele_infantry_swordsman_merc_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_swordsman_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_infantry_swordsman_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/seleucids/infantry_swordsman_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_hoplite_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_hoplite_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Identity>
+    <Civ>spart</Civ>
+    <GenericName>Spartan Hoplite</GenericName>
+    <Icon>units/spart_champion_infantry_spear.png</Icon>
+    <Lang>greek</Lang>
+    <SpecificName>Spartiátēs</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/spartans/champion_infantry.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_pikeman">
-  <Identity>
-    <Civ>spart</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Spartan Pikeman</GenericName>
-    <SpecificName>Phalangites Spartiatis</SpecificName>
-    <Icon>units/spart_champion_infantry_pike.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/spartans/champion_pikeman.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>spart</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Spartan Hoplite</GenericName>
-    <SpecificName>Spartiátēs</SpecificName>
-    <Icon>units/spart_champion_infantry_spear.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/spartans/champion_infantry.xml</Actor>
-  </VisualActor>
-</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
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/spart_syssiton
-      structures/spart_theatron
-      structures/spart_royal_stoa
-      -structures/{civ}_wallset_stone
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-10.0</food>
-      <metal op="add">+20.0</metal>
-    </Resources>
-    <BuildTime op="add">+5</BuildTime>
-  </Cost>
-  <Identity>
-    <Civ>spart</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Skiritai Commando</GenericName>
-    <SpecificName>Ékdromos Skirítēs</SpecificName>
-    <Rank>Elite</Rank>
-    <Icon>units/spart_champion_infantry_sword.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <food op="mul">2.0</food>
-    <metal op="mul">2.0</metal>
-  </Loot>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/spartans/champion_infantry_sword.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_javelin_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_javelin_infantry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/merc_thureophoros">
+  <Identity>
+    <Civ>spart</Civ>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_pike_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_pike_infantry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_pikeman">
+  <Identity>
+    <Civ>spart</Civ>
+    <GenericName>Spartan Pikeman</GenericName>
+    <Icon>units/spart_champion_infantry_pike.png</Icon>
+    <Lang>greek</Lang>
+    <SpecificName>Phalangites Spartiatis</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/spartans/champion_pikeman.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_champion_sword_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_champion_sword_infantry.xml
@@ -0,0 +1,6 @@
+<?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_infantry_swordsman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/spart_infantry_swordsman.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee_swordsman">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/spart_syssiton
+      structures/spart_theatron
+      structures/spart_royal_stoa
+      -structures/{civ}_wallset_stone
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-10.0</food>
+      <metal op="add">+20.0</metal>
+    </Resources>
+    <BuildTime op="add">+5</BuildTime>
+  </Cost>
+  <Identity>
+    <Civ>spart</Civ>
+    <GenericName>Skiritai Commando</GenericName>
+    <Icon>units/spart_champion_infantry_sword.png</Icon>
+    <Lang>greek</Lang>
+    <Rank>Elite</Rank>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <SpecificName>Ékdromos Skirítēs</SpecificName>
+  </Identity>
+  <Loot>
+    <food op="mul">2.0</food>
+    <metal op="mul">2.0</metal>
+  </Loot>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/spartans/champion_infantry_sword.xml</Actor>
+  </VisualActor>
+</Entity>
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>