Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml
@@ -1829,85 +1829,85 @@
 			<Actor seed="52364"/>
 		</Entity>
 		<Entity uid="312">
-			<Template>actor|flora/trees/oak_new.xml</Template>
+			<Template>gaia/flora_tree_oak_new</Template>
 			<Position x="424.22193" z="489.50052"/>
 			<Orientation y="-2.09751"/>
 			<Actor seed="10894"/>
 		</Entity>
 		<Entity uid="313">
-			<Template>actor|flora/trees/oak_new.xml</Template>
+			<Template>gaia/flora_tree_oak_new</Template>
 			<Position x="442.46845" z="515.12226"/>
 			<Orientation y="-1.05286"/>
 			<Actor seed="32986"/>
 		</Entity>
 		<Entity uid="314">
-			<Template>actor|flora/trees/oak_new.xml</Template>
+			<Template>gaia/flora_tree_oak_new</Template>
 			<Position x="431.61197" z="532.64039"/>
 			<Orientation y="2.20598"/>
 			<Actor seed="38136"/>
 		</Entity>
 		<Entity uid="315">
-			<Template>actor|flora/trees/oak_new.xml</Template>
+			<Template>gaia/flora_tree_oak_new</Template>
 			<Position x="436.49344" z="546.46796"/>
 			<Orientation y="2.17826"/>
 			<Actor seed="31744"/>
 		</Entity>
 		<Entity uid="316">
-			<Template>actor|flora/trees/oak_new.xml</Template>
+			<Template>gaia/flora_tree_oak_new</Template>
 			<Position x="452.6595" z="496.0347"/>
 			<Orientation y="-2.27367"/>
 			<Actor seed="41880"/>
 		</Entity>
 		<Entity uid="317">
-			<Template>actor|flora/trees/oak_dead.xml</Template>
+			<Template>gaia/flora_tree_oak_dead</Template>
 			<Position x="454.97693" z="510.1074"/>
 			<Orientation y="-0.65487"/>
 			<Actor seed="42154"/>
 		</Entity>
 		<Entity uid="318">
-			<Template>actor|flora/trees/oak.xml</Template>
+			<Template>gaia/flora_tree_oak</Template>
 			<Position x="447.99671" z="526.29566"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58354"/>
 		</Entity>
 		<Entity uid="319">
-			<Template>actor|flora/trees/oak.xml</Template>
+			<Template>gaia/flora_tree_oak</Template>
 			<Position x="446.077" z="538.71949"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13360"/>
 		</Entity>
 		<Entity uid="320">
-			<Template>actor|flora/trees/oak.xml</Template>
+			<Template>gaia/flora_tree_oak</Template>
 			<Position x="452.44227" z="519.80683"/>
 			<Orientation y="-1.55266"/>
 			<Actor seed="13674"/>
 		</Entity>
 		<Entity uid="321">
-			<Template>actor|flora/trees/oak.xml</Template>
+			<Template>gaia/flora_tree_oak</Template>
 			<Position x="381.0912" z="483.48273"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24640"/>
 		</Entity>
 		<Entity uid="322">
-			<Template>actor|flora/trees/oak.xml</Template>
+			<Template>gaia/flora_tree_oak</Template>
 			<Position x="408.54578" z="431.80625"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="50976"/>
 		</Entity>
 		<Entity uid="323">
-			<Template>actor|flora/trees/european_beech.xml</Template>
+			<Template>gaia/flora_tree_euro_beech</Template>
 			<Position x="446.81611" z="534.00977"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53462"/>
 		</Entity>
 		<Entity uid="324">
-			<Template>actor|flora/trees/european_beech.xml</Template>
+			<Template>gaia/flora_tree_euro_beech</Template>
 			<Position x="439.59449" z="541.22706"/>
 			<Orientation y="-1.95727"/>
 			<Actor seed="59634"/>
 		</Entity>
 		<Entity uid="325">
-			<Template>actor|flora/trees/european_beech.xml</Template>
+			<Template>gaia/flora_tree_euro_beech</Template>
 			<Position x="450.25858" z="512.6811"/>
 			<Orientation y="-2.64278"/>
 			<Actor seed="5722"/>
@@ -13869,14 +13869,14 @@
 			<Template>skirmish/structures/default_civil_centre</Template>
 			<Player>1</Player>
 			<Position x="891.96637" z="296.1344"/>
-			<Orientation y="-2.92199"/>
+			<Orientation y="-2.35621"/>
 			<Actor seed="39394"/>
 		</Entity>
 		<Entity uid="2180">
 			<Template>skirmish/structures/default_civil_centre</Template>
 			<Player>3</Player>
 			<Position x="110.928" z="590.06428"/>
-			<Orientation y="1.91382"/>
+			<Orientation y="2.35621"/>
 			<Actor seed="47848"/>
 		</Entity>
 		<Entity uid="2222">
@@ -14163,14 +14163,14 @@
 			<Template>skirmish/structures/default_civil_centre</Template>
 			<Player>2</Player>
 			<Position x="370.42457" z="159.67954"/>
-			<Orientation y="-4.2874"/>
+			<Orientation y="2.35621"/>
 			<Actor seed="10920"/>
 		</Entity>
 		<Entity uid="2263">
 			<Template>skirmish/structures/default_civil_centre</Template>
 			<Player>4</Player>
 			<Position x="655.99903" z="744.41425"/>
-			<Orientation y="1.94481"/>
+			<Orientation y="-2.35621"/>
 			<Actor seed="20220"/>
 		</Entity>
 		<Entity uid="2264">