Index: ps/trunk/binaries/data/mods/public/maps/random/african_plains.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/african_plains.js
+++ ps/trunk/binaries/data/mods/public/maps/random/african_plains.js
@@ -22,7 +22,7 @@
 var oRhino = "gaia/fauna_rhino";
 var oLion = "gaia/fauna_lion";
 var oLioness = "gaia/fauna_lioness";
-var oHawk = "gaia/fauna_hawk";
+var oHawk = "birds/buzzard";
 var oGiraffe = "gaia/fauna_giraffe";
 var oGiraffe2 = "gaia/fauna_giraffe_infant";
 var oGazelle = "gaia/fauna_gazelle";
Index: ps/trunk/binaries/data/mods/public/maps/random/danubius.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/danubius.js
+++ ps/trunk/binaries/data/mods/public/maps/random/danubius.js
@@ -32,7 +32,7 @@
 const oSheep = "gaia/fauna_sheep";
 const oGoat = "gaia/fauna_goat";
 const oWolf = "gaia/fauna_wolf";
-const oHawk = "gaia/fauna_hawk";
+const oHawk = "birds/buzzard";
 const oRabbit = "gaia/fauna_rabbit";
 const oBoar = "gaia/fauna_boar";
 const oBear = "gaia/fauna_bear_brown";
Index: ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
+++ ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
@@ -63,7 +63,7 @@
 const oLioness = "gaia/fauna_lioness";
 const oCrocodile = "gaia/fauna_crocodile";
 const oFish = "gaia/fauna_fish_tilapia";
-const oHawk = "gaia/fauna_hawk";
+const oHawk = "birds/buzzard";
 
 // The main temple on elephantine was very similar looking (Greco-Roman-Egyptian):
 const oWonder = "structures/ptol_wonder";
Index: ps/trunk/binaries/data/mods/public/maps/random/fields_of_meroe.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/fields_of_meroe.js
+++ ps/trunk/binaries/data/mods/public/maps/random/fields_of_meroe.js
@@ -27,7 +27,7 @@
 const oGiraffe = "gaia/fauna_giraffe";
 const oLion = "gaia/fauna_lion";
 const oFish = "gaia/fauna_fish";
-const oHawk = "gaia/fauna_hawk";
+const oHawk = "birds/buzzard";
 const oStoneLarge = "gaia/geology_stonemine_savanna_quarry";
 const oStoneSmall = "gaia/geology_stone_desert_small";
 const oMetalLarge = "gaia/geology_metal_savanna_slabs";
Index: ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
+++ ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
@@ -161,7 +161,7 @@
 			"fauna": {
 				"startingAnimal": "gaia/fauna_goat",
 				"goat": "gaia/fauna_goat",
-				"hawk": "gaia/fauna_hawk",
+				"hawk": "birds/buzzard",
 				"horse": "gaia/fauna_horse",
 				"pony": "gaia/fauna_pony"
 			},
Index: ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
+++ ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -61,7 +61,7 @@
 const oLioness = "gaia/fauna_lioness";
 const oCrocodile = "gaia/fauna_crocodile";
 const oFish = "gaia/fauna_fish_tilapia";
-const oHawk = "gaia/fauna_hawk";
+const oHawk = "birds/buzzard";
 const oTempleApedemak = "structures/kush_temple";
 const oTempleAmun = "structures/kush_temple_amun";
 const oPyramidLarge = "structures/kush_pyramid_large";
Index: ps/trunk/binaries/data/mods/public/maps/random/lower_nubia.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/lower_nubia.js
+++ ps/trunk/binaries/data/mods/public/maps/random/lower_nubia.js
@@ -63,7 +63,7 @@
 const oElephantInfant = "gaia/fauna_elephant_african_infant";
 const oLion = "gaia/fauna_lion";
 const oLioness = "gaia/fauna_lioness";
-const oHawk = "gaia/fauna_hawk";
+const oHawk = "birds/buzzard";
 const oPyramid = "structures/kush_pyramid_large";
 
 const aRock = actorTemplate("geology/stone_savanna_med");
Index: ps/trunk/binaries/data/mods/public/maps/random/pompeii.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/pompeii.js
+++ ps/trunk/binaries/data/mods/public/maps/random/pompeii.js
@@ -39,7 +39,7 @@
 g_Terrains.cliff = "ocean_rock_b";
 
 g_Gaia.mainHuntableAnimal = "gaia/fauna_goat";
-g_Gaia.secondaryHuntableAnimal =  "gaia/fauna_hawk";
+g_Gaia.secondaryHuntableAnimal =  "birds/buzzard";
 g_Gaia.fruitBush = "gaia/fauna_chicken";
 g_Gaia.fish = "gaia/fauna_fish";
 g_Gaia.tree1 = "gaia/flora_tree_dead";
Index: ps/trunk/binaries/data/mods/public/maps/random/scythian_rivulet.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/scythian_rivulet.js
+++ ps/trunk/binaries/data/mods/public/maps/random/scythian_rivulet.js
@@ -23,7 +23,7 @@
 const oRabbit = "gaia/fauna_rabbit";
 const oWolf1 = "gaia/fauna_wolf";
 const oWolf2 = "gaia/fauna_arctic_wolf";
-const oHawk = "gaia/fauna_hawk";
+const oHawk = "birds/buzzard";
 const oFish = "gaia/fauna_fish";
 const oStoneLarge = "gaia/geology_stonemine_alpine_quarry";
 const oStoneSmall = "gaia/geology_stone_alpine_a";
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
@@ -33417,222 +33417,222 @@
 			<Orientation y="2.63404"/>
 		</Entity>
 		<Entity uid="7709">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1679.58936" z="606.24878"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7710">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1730.0553" z="698.0113"/>
 			<Orientation y="-2.25785"/>
 		</Entity>
 		<Entity uid="7712">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1967.0138" z="911.02784"/>
 			<Orientation y="-2.03156"/>
 		</Entity>
 		<Entity uid="7713">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1776.81434" z="1051.79212"/>
 			<Orientation y="0.17861"/>
 		</Entity>
 		<Entity uid="7714">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1671.66285" z="1205.10035"/>
 			<Orientation y="-1.58916"/>
 		</Entity>
 		<Entity uid="7715">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1562.46912" z="1264.24756"/>
 			<Orientation y="-0.44051"/>
 		</Entity>
 		<Entity uid="7716">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1420.31458" z="1395.49988"/>
 			<Orientation y="-3.04801"/>
 		</Entity>
 		<Entity uid="7717">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1350.3169" z="1308.86658"/>
 			<Orientation y="-2.85717"/>
 		</Entity>
 		<Entity uid="7718">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1277.49085" z="1203.36487"/>
 			<Orientation y="-0.27326"/>
 		</Entity>
 		<Entity uid="7719">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1049.172" z="1371.85572"/>
 			<Orientation y="-0.47991"/>
 		</Entity>
 		<Entity uid="7720">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="972.00428" z="1446.44459"/>
 			<Orientation y="-2.65632"/>
 		</Entity>
 		<Entity uid="7721">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="889.17566" z="1477.56824"/>
 			<Orientation y="0.0608"/>
 		</Entity>
 		<Entity uid="7722">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="677.63056" z="1471.71009"/>
 			<Orientation y="-2.5686"/>
 		</Entity>
 		<Entity uid="7723">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="569.86701" z="1324.07154"/>
 			<Orientation y="0.76578"/>
 		</Entity>
 		<Entity uid="7724">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="681.85389" z="1075.2522"/>
 			<Orientation y="3.03502"/>
 		</Entity>
 		<Entity uid="7725">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="482.70127" z="906.84174"/>
 			<Orientation y="-1.42531"/>
 		</Entity>
 		<Entity uid="7726">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="76.03254" z="780.41797"/>
 			<Orientation y="1.63967"/>
 		</Entity>
 		<Entity uid="7727">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="349.35123" z="736.00562"/>
 			<Orientation y="2.21804"/>
 		</Entity>
 		<Entity uid="7728">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="715.25574" z="648.54554"/>
 			<Orientation y="2.18746"/>
 		</Entity>
 		<Entity uid="7729">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="777.00074" z="349.3754"/>
 			<Orientation y="-2.81403"/>
 		</Entity>
 		<Entity uid="7730">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="533.27137" z="71.29061"/>
 			<Orientation y="1.16312"/>
 		</Entity>
 		<Entity uid="7731">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="683.9441" z="133.56919"/>
 			<Orientation y="1.14844"/>
 		</Entity>
 		<Entity uid="7732">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="841.36823" z="198.08909"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7733">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="961.15381" z="301.66675"/>
 			<Orientation y="-3.06917"/>
 		</Entity>
 		<Entity uid="7734">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1057.99622" z="333.27521"/>
 			<Orientation y="2.18015"/>
 		</Entity>
 		<Entity uid="7735">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1058.11902" z="482.89264"/>
 			<Orientation y="-0.15848"/>
 		</Entity>
 		<Entity uid="7736">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="964.3105" z="708.27588"/>
 			<Orientation y="3.03006"/>
 		</Entity>
 		<Entity uid="7737">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="969.39551" z="954.69214"/>
 			<Orientation y="1.00394"/>
 		</Entity>
 		<Entity uid="7738">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1080.63111" z="900.35895"/>
 			<Orientation y="-2.44333"/>
 		</Entity>
 		<Entity uid="7739">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1186.18445" z="714.02088"/>
 			<Orientation y="-2.74753"/>
 		</Entity>
 		<Entity uid="7740">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1200.94642" z="571.6327"/>
 			<Orientation y="1.9609"/>
 		</Entity>
 		<Entity uid="7741">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1300.23475" z="408.74552"/>
 			<Orientation y="-2.24178"/>
 		</Entity>
 		<Entity uid="7742">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1418.12623" z="174.21647"/>
 			<Orientation y="1.508"/>
 		</Entity>
 		<Entity uid="7743">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1537.8672" z="149.89051"/>
 			<Orientation y="-2.11463"/>
 		</Entity>
 		<Entity uid="7744">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1691.00196" z="374.19501"/>
 			<Orientation y="-2.33561"/>
 		</Entity>
 		<Entity uid="7745">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1596.99805" z="475.5196"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7746">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1449.90552" z="607.1714"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7747">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1361.59449" z="790.10138"/>
 			<Orientation y="-2.65677"/>
 		</Entity>
 		<Entity uid="7748">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1433.0005" z="1600.86304"/>
 			<Orientation y="0.64939"/>
 		</Entity>
 		<Entity uid="7749">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1654.04712" z="1803.91419"/>
 			<Orientation y="-2.37711"/>
 		</Entity>
 		<Entity uid="7750">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1809.04871" z="1633.12378"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7751">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1846.77771" z="1430.71827"/>
 			<Orientation y="-2.76876"/>
 		</Entity>
 		<Entity uid="7752">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1830.08863" z="1111.32679"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7753">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1980.73182" z="1174.70069"/>
 			<Orientation y="-2.15816"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/gold_rush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/gold_rush.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/gold_rush.xml
@@ -4563,102 +4563,102 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="888">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="276.72129" z="61.13926"/>
 			<Orientation y="0.07015"/>
 		</Entity>
 		<Entity uid="889">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="180.91477" z="273.32795"/>
 			<Orientation y="-2.71863"/>
 		</Entity>
 		<Entity uid="890">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="95.54955" z="376.25623"/>
 			<Orientation y="0.6162"/>
 		</Entity>
 		<Entity uid="891">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="223.60651" z="493.74555"/>
 			<Orientation y="-2.96314"/>
 		</Entity>
 		<Entity uid="892">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="282.85312" z="650.48572"/>
 			<Orientation y="0.18029"/>
 		</Entity>
 		<Entity uid="893">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="512.69727" z="681.72889"/>
 			<Orientation y="-2.49122"/>
 		</Entity>
 		<Entity uid="894">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="550.48957" z="467.13035"/>
 			<Orientation y="0.60906"/>
 		</Entity>
 		<Entity uid="895">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="721.08704" z="664.18128"/>
 			<Orientation y="-2.91979"/>
 		</Entity>
 		<Entity uid="896">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="702.46473" z="396.58722"/>
 			<Orientation y="-2.4997"/>
 		</Entity>
 		<Entity uid="897">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="530.9651" z="213.0665"/>
 			<Orientation y="0.11821"/>
 		</Entity>
 		<Entity uid="898">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="692.81635" z="182.10022"/>
 			<Orientation y="-2.89606"/>
 		</Entity>
 		<Entity uid="899">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="540.19105" z="20.33985"/>
 			<Orientation y="0.18627"/>
 		</Entity>
 		<Entity uid="900">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="691.71241" z="24.42737"/>
 			<Orientation y="-0.72869"/>
 		</Entity>
 		<Entity uid="901">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="307.43622" z="389.33051"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="902">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="434.28058" z="346.80921"/>
 			<Orientation y="-2.36902"/>
 		</Entity>
 		<Entity uid="903">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="391.28425" z="449.63453"/>
 			<Orientation y="-2.6488"/>
 		</Entity>
 		<Entity uid="904">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="369.07172" z="302.323"/>
 			<Orientation y="0.04358"/>
 		</Entity>
 		<Entity uid="905">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="338.54444" z="175.30442"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="906">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="402.81281" z="104.67264"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="907">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="52.0497" z="39.26832"/>
 			<Orientation y="-2.23174"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/necropolis.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/necropolis.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/necropolis.xml
@@ -37835,227 +37835,227 @@
 			<Actor seed="10659"/>
 		</Entity>
 		<Entity uid="7709">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1679.58936" z="606.24878"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7710">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1730.0553" z="698.0113"/>
 			<Orientation y="-2.25785"/>
 		</Entity>
 		<Entity uid="7711">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1871.28028" z="914.0063"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7712">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1967.0138" z="911.02784"/>
 			<Orientation y="-2.03156"/>
 		</Entity>
 		<Entity uid="7713">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1776.81434" z="1051.79212"/>
 			<Orientation y="0.17861"/>
 		</Entity>
 		<Entity uid="7714">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1671.66285" z="1205.10035"/>
 			<Orientation y="-1.58916"/>
 		</Entity>
 		<Entity uid="7715">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1562.46912" z="1264.24756"/>
 			<Orientation y="-0.44051"/>
 		</Entity>
 		<Entity uid="7716">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1420.31458" z="1395.49988"/>
 			<Orientation y="-3.04801"/>
 		</Entity>
 		<Entity uid="7717">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1350.3169" z="1308.86658"/>
 			<Orientation y="-2.85717"/>
 		</Entity>
 		<Entity uid="7718">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1277.49085" z="1203.36487"/>
 			<Orientation y="-0.27326"/>
 		</Entity>
 		<Entity uid="7719">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1049.172" z="1371.85572"/>
 			<Orientation y="-0.47991"/>
 		</Entity>
 		<Entity uid="7720">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="972.00428" z="1446.44459"/>
 			<Orientation y="-2.65632"/>
 		</Entity>
 		<Entity uid="7721">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="889.17566" z="1477.56824"/>
 			<Orientation y="0.0608"/>
 		</Entity>
 		<Entity uid="7722">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="677.63056" z="1471.71009"/>
 			<Orientation y="-2.5686"/>
 		</Entity>
 		<Entity uid="7723">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="569.86701" z="1324.07154"/>
 			<Orientation y="0.76578"/>
 		</Entity>
 		<Entity uid="7724">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="681.85389" z="1075.2522"/>
 			<Orientation y="3.03502"/>
 		</Entity>
 		<Entity uid="7725">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="482.70127" z="906.84174"/>
 			<Orientation y="-1.42531"/>
 		</Entity>
 		<Entity uid="7726">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="76.03254" z="780.41797"/>
 			<Orientation y="1.63967"/>
 		</Entity>
 		<Entity uid="7727">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="349.35123" z="736.00562"/>
 			<Orientation y="2.21804"/>
 		</Entity>
 		<Entity uid="7728">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="715.25574" z="648.54554"/>
 			<Orientation y="2.18746"/>
 		</Entity>
 		<Entity uid="7729">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="777.00074" z="349.3754"/>
 			<Orientation y="-2.81403"/>
 		</Entity>
 		<Entity uid="7730">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="533.27137" z="71.29061"/>
 			<Orientation y="1.16312"/>
 		</Entity>
 		<Entity uid="7731">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="633.0434" z="136.29073"/>
 			<Orientation y="1.14844"/>
 		</Entity>
 		<Entity uid="7732">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="841.36823" z="198.08909"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7733">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="961.15381" z="301.66675"/>
 			<Orientation y="-3.06917"/>
 		</Entity>
 		<Entity uid="7734">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1057.99622" z="333.27521"/>
 			<Orientation y="2.18015"/>
 		</Entity>
 		<Entity uid="7735">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1058.11902" z="482.89264"/>
 			<Orientation y="-0.15848"/>
 		</Entity>
 		<Entity uid="7736">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="964.3105" z="708.27588"/>
 			<Orientation y="3.03006"/>
 		</Entity>
 		<Entity uid="7737">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="969.39551" z="954.69214"/>
 			<Orientation y="1.00394"/>
 		</Entity>
 		<Entity uid="7738">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1080.63111" z="900.35895"/>
 			<Orientation y="-2.44333"/>
 		</Entity>
 		<Entity uid="7739">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1186.18445" z="714.02088"/>
 			<Orientation y="-2.74753"/>
 		</Entity>
 		<Entity uid="7740">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1200.94642" z="571.6327"/>
 			<Orientation y="1.9609"/>
 		</Entity>
 		<Entity uid="7741">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1300.23475" z="408.74552"/>
 			<Orientation y="-2.24178"/>
 		</Entity>
 		<Entity uid="7742">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1418.12623" z="174.21647"/>
 			<Orientation y="1.508"/>
 		</Entity>
 		<Entity uid="7743">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1537.8672" z="149.89051"/>
 			<Orientation y="-2.11463"/>
 		</Entity>
 		<Entity uid="7744">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1691.00196" z="374.19501"/>
 			<Orientation y="-2.33561"/>
 		</Entity>
 		<Entity uid="7745">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1596.99805" z="475.5196"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7746">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1449.90552" z="607.1714"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7747">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1361.59449" z="790.10138"/>
 			<Orientation y="-2.65677"/>
 		</Entity>
 		<Entity uid="7748">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1433.0005" z="1600.86304"/>
 			<Orientation y="0.64939"/>
 		</Entity>
 		<Entity uid="7749">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1626.48401" z="1755.04065"/>
 			<Orientation y="-2.37711"/>
 		</Entity>
 		<Entity uid="7750">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1809.04871" z="1633.12378"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7751">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1846.77771" z="1430.71827"/>
 			<Orientation y="-2.76876"/>
 		</Entity>
 		<Entity uid="7752">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1830.08863" z="1111.32679"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7753">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1980.73182" z="1174.70069"/>
 			<Orientation y="-2.15816"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sahel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sahel.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sahel.xml
@@ -16995,97 +16995,97 @@
 			<Actor seed="294"/>
 		</Entity>
 		<Entity uid="2782">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="520.47474" z="846.412"/>
 			<Orientation y="-2.31501"/>
 			<Actor seed="32346"/>
 		</Entity>
 		<Entity uid="2783">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="289.01539" z="506.46808"/>
 			<Orientation y="0.56624"/>
 			<Actor seed="4078"/>
 		</Entity>
 		<Entity uid="2784">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="390.33167" z="155.60651"/>
 			<Orientation y="-1.26845"/>
 			<Actor seed="15690"/>
 		</Entity>
 		<Entity uid="2785">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="595.24451" z="186.08112"/>
 			<Orientation y="-2.11434"/>
 			<Actor seed="41804"/>
 		</Entity>
 		<Entity uid="2786">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="797.68665" z="174.37781"/>
 			<Orientation y="-0.34803"/>
 			<Actor seed="27118"/>
 		</Entity>
 		<Entity uid="2787">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1105.7046" z="374.80329"/>
 			<Orientation y="-2.19982"/>
 			<Actor seed="25462"/>
 		</Entity>
 		<Entity uid="2788">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="974.64661" z="566.021"/>
 			<Orientation y="0.57406"/>
 			<Actor seed="26744"/>
 		</Entity>
 		<Entity uid="2789">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="728.18531" z="769.45075"/>
 			<Orientation y="-2.63668"/>
 			<Actor seed="30470"/>
 		</Entity>
 		<Entity uid="2790">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="528.50104" z="334.25232"/>
 			<Orientation y="1.01278"/>
 			<Actor seed="39804"/>
 		</Entity>
 		<Entity uid="2791">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="775.19996" z="485.62006"/>
 			<Orientation y="-2.17688"/>
 			<Actor seed="49938"/>
 		</Entity>
 		<Entity uid="2792">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="330.80024" z="638.5381"/>
 			<Orientation y="-2.04899"/>
 			<Actor seed="32068"/>
 		</Entity>
 		<Entity uid="2793">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="125.63758" z="602.8545"/>
 			<Orientation y="1.22063"/>
 			<Actor seed="27706"/>
 		</Entity>
 		<Entity uid="2794">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="691.78125" z="68.85892"/>
 			<Orientation y="0.94733"/>
 			<Actor seed="46478"/>
 		</Entity>
 		<Entity uid="2795">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1200.58045" z="640.00031"/>
 			<Orientation y="-1.57081"/>
 			<Actor seed="51792"/>
 		</Entity>
 		<Entity uid="2796">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="580.69446" z="1138.219"/>
 			<Orientation y="-2.17466"/>
 			<Actor seed="40874"/>
 		</Entity>
 		<Entity uid="2797">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="542.2212" z="393.19013"/>
 			<Orientation y="1.22619"/>
 			<Actor seed="45856"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -2307,31 +2307,31 @@
 			<Actor seed="45378"/>
 		</Entity>
 		<Entity uid="519">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="317.03351" z="613.2107"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39434"/>
 		</Entity>
 		<Entity uid="520">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="774.41626" z="639.00672"/>
 			<Orientation y="-1.92583"/>
 			<Actor seed="57578"/>
 		</Entity>
 		<Entity uid="521">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="484.78266" z="112.63007"/>
 			<Orientation y="0.25553"/>
 			<Actor seed="36378"/>
 		</Entity>
 		<Entity uid="522">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="649.04078" z="127.06585"/>
 			<Orientation y="-1.28731"/>
 			<Actor seed="22012"/>
 		</Entity>
 		<Entity uid="523">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="542.47626" z="326.32496"/>
 			<Orientation y="3.07296"/>
 			<Actor seed="4452"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
@@ -28437,102 +28437,102 @@
 			<Orientation y="0.44756"/>
 		</Entity>
 		<Entity uid="5226">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="597.63965" z="538.68653"/>
 			<Orientation y="0.6941"/>
 		</Entity>
 		<Entity uid="5227">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="894.85981" z="522.63282"/>
 			<Orientation y="-2.36567"/>
 		</Entity>
 		<Entity uid="5228">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="644.44483" z="216.11921"/>
 			<Orientation y="0.81014"/>
 		</Entity>
 		<Entity uid="5229">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="828.75934" z="177.29914"/>
 			<Orientation y="-1.86248"/>
 		</Entity>
 		<Entity uid="5230">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="423.22172" z="182.48862"/>
 			<Orientation y="0.6419"/>
 		</Entity>
 		<Entity uid="5231">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="550.67267" z="125.60291"/>
 			<Orientation y="-0.14254"/>
 		</Entity>
 		<Entity uid="5232">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="272.95914" z="335.41828"/>
 			<Orientation y="-2.56302"/>
 		</Entity>
 		<Entity uid="5233">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="137.70841" z="366.78541"/>
 			<Orientation y="0.11402"/>
 		</Entity>
 		<Entity uid="5234">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="180.08704" z="742.24018"/>
 			<Orientation y="-2.87021"/>
 		</Entity>
 		<Entity uid="5235">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="380.26154" z="594.12378"/>
 			<Orientation y="0.4949"/>
 		</Entity>
 		<Entity uid="5236">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="490.82276" z="890.2912"/>
 			<Orientation y="-2.8482"/>
 		</Entity>
 		<Entity uid="5237">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="399.5589" z="428.07258"/>
 			<Orientation y="1.00261"/>
 		</Entity>
 		<Entity uid="5238">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="575.20655" z="382.89325"/>
 			<Orientation y="-2.18548"/>
 		</Entity>
 		<Entity uid="5239">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="265.89252" z="130.17753"/>
 			<Orientation y="0.90963"/>
 		</Entity>
 		<Entity uid="5240">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="420.36158" z="24.78501"/>
 			<Orientation y="0.63662"/>
 		</Entity>
 		<Entity uid="5241">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="642.93726" z="272.71287"/>
 			<Orientation y="0.54744"/>
 		</Entity>
 		<Entity uid="5242">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="817.87055" z="586.04822"/>
 			<Orientation y="-2.27012"/>
 		</Entity>
 		<Entity uid="5243">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="587.27088" z="792.71436"/>
 			<Orientation y="-2.8173"/>
 		</Entity>
 		<Entity uid="5244">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="784.49769" z="813.53724"/>
 			<Orientation y="-2.5755"/>
 		</Entity>
 		<Entity uid="5245">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="583.71314" z="230.48917"/>
 			<Orientation y="0.23797"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/serengeti.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/serengeti.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/serengeti.xml
@@ -14875,62 +14875,62 @@
 			<Orientation y="0.14594"/>
 		</Entity>
 		<Entity uid="3028">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="138.12868" z="489.1544"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3029">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="282.13001" z="589.62433"/>
 			<Orientation y="0.21634"/>
 		</Entity>
 		<Entity uid="3030">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="328.40268" z="425.48981"/>
 			<Orientation y="-2.78043"/>
 		</Entity>
 		<Entity uid="3031">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="459.37317" z="281.76972"/>
 			<Orientation y="0.4969"/>
 		</Entity>
 		<Entity uid="3032">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="610.22284" z="316.45008"/>
 			<Orientation y="-2.50071"/>
 		</Entity>
 		<Entity uid="3033">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="707.823" z="345.80274"/>
 			<Orientation y="0.42508"/>
 		</Entity>
 		<Entity uid="3034">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="670.56672" z="738.42286"/>
 			<Orientation y="-2.62052"/>
 		</Entity>
 		<Entity uid="3035">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="252.68992" z="79.16445"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3036">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="538.21937" z="29.3888"/>
 			<Orientation y="0.2145"/>
 		</Entity>
 		<Entity uid="3037">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="528.5611" z="240.96283"/>
 			<Orientation y="-3.0536"/>
 		</Entity>
 		<Entity uid="3038">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="42.46622" z="24.71785"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3039">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="222.4546" z="179.83057"/>
 			<Orientation y="2.35621"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/tropical_island.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/tropical_island.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/tropical_island.xml
@@ -5052,7 +5052,7 @@
 			<Actor seed="33836"/>
 		</Entity>
 		<Entity uid="1158">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="548.70441" z="343.96308"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17350"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
@@ -12836,7 +12836,7 @@
 			<Actor seed="3882"/>
 		</Entity>
 		<Entity uid="4743">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="760.17261" z="212.49033"/>
 			<Orientation y="-1.82041"/>
 			<Actor seed="24156"/>
@@ -20342,13 +20342,13 @@
 			<Actor seed="6252"/>
 		</Entity>
 		<Entity uid="5837">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="160.17875" z="269.62372"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18790"/>
 		</Entity>
 		<Entity uid="5838">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="251.88567" z="687.13746"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13248"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
@@ -12996,49 +12996,49 @@
 			<Actor seed="58364"/>
 		</Entity>
 		<Entity uid="2087">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="180.689" z="264.68671"/>
 			<Orientation y="0.38505"/>
 			<Actor seed="36100"/>
 		</Entity>
 		<Entity uid="2088">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="519.69922" z="494.23584"/>
 			<Orientation y="-2.31138"/>
 			<Actor seed="34688"/>
 		</Entity>
 		<Entity uid="2089">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="633.5854" z="179.79267"/>
 			<Orientation y="0.66529"/>
 			<Actor seed="25932"/>
 		</Entity>
 		<Entity uid="2090">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="799.628" z="729.271"/>
 			<Orientation y="-2.12172"/>
 			<Actor seed="37642"/>
 		</Entity>
 		<Entity uid="2091">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="260.58454" z="665.06031"/>
 			<Orientation y="0.46299"/>
 			<Actor seed="42944"/>
 		</Entity>
 		<Entity uid="2092">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="778.17975" z="160.42649"/>
 			<Orientation y="-0.0654"/>
 			<Actor seed="13742"/>
 		</Entity>
 		<Entity uid="2093">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="583.38569" z="59.94735"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46610"/>
 		</Entity>
 		<Entity uid="2094">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="808.64783" z="375.65247"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35640"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
@@ -1481,67 +1481,67 @@
 			<Orientation y="-2.81122"/>
 		</Entity>
 		<Entity uid="5011">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="379.26008" z="1133.81446"/>
 			<Orientation y="0.9918"/>
 		</Entity>
 		<Entity uid="5012">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="318.48218" z="1216.59058"/>
 			<Orientation y="-3.354"/>
 		</Entity>
 		<Entity uid="5013">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="929.49183" z="1075.87952"/>
 			<Orientation y="0.22391"/>
 		</Entity>
 		<Entity uid="5014">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="456.09717" z="940.19288"/>
 			<Orientation y="1.09362"/>
 		</Entity>
 		<Entity uid="5015">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="258.1128" z="524.42518"/>
 			<Orientation y="-3.2967"/>
 		</Entity>
 		<Entity uid="5016">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="732.9621" z="749.80481"/>
 			<Orientation y="1.0266"/>
 		</Entity>
 		<Entity uid="5017">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1316.57764" z="350.03132"/>
 			<Orientation y="-0.20005"/>
 		</Entity>
 		<Entity uid="5018">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1140.98871" z="1400.62342"/>
 			<Orientation y="-1.968"/>
 		</Entity>
 		<Entity uid="5019">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="691.29975" z="1512.43244"/>
 			<Orientation y="-3.53962"/>
 		</Entity>
 		<Entity uid="5020">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1193.49836" z="827.67701"/>
 			<Orientation y="1.51632"/>
 		</Entity>
 		<Entity uid="5021">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="69.18128" z="766.6432"/>
 			<Orientation y="-0.65088"/>
 		</Entity>
 		<Entity uid="5022">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="210.82605" z="961.43982"/>
 			<Orientation y="-4.12871"/>
 		</Entity>
 		<Entity uid="5023">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1042.81623" z="689.61426"/>
 			<Orientation y="-1.24277"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
@@ -5543,107 +5543,107 @@
 			<Orientation y="0.95383"/>
 		</Entity>
 		<Entity uid="1645">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="175.17348" z="642.79072"/>
 			<Orientation y="-1.71604"/>
 		</Entity>
 		<Entity uid="1646">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="269.54731" z="630.07685"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1647">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="433.81385" z="796.81452"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1648">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="384.42344" z="827.8462"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1649">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="305.47291" z="870.46528"/>
 			<Orientation y="-2.44262"/>
 		</Entity>
 		<Entity uid="1650">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="213.41416" z="744.6844"/>
 			<Orientation y="-2.82558"/>
 		</Entity>
 		<Entity uid="1651">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="209.96644" z="673.40967"/>
 			<Orientation y="1.38521"/>
 		</Entity>
 		<Entity uid="1652">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="509.55781" z="501.85508"/>
 			<Orientation y="1.804"/>
 		</Entity>
 		<Entity uid="1653">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="776.81141" z="283.31046"/>
 			<Orientation y="-2.53658"/>
 		</Entity>
 		<Entity uid="1654">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="708.4662" z="191.95084"/>
 			<Orientation y="-2.16681"/>
 		</Entity>
 		<Entity uid="1655">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="596.64893" z="132.75141"/>
 			<Orientation y="-1.76066"/>
 		</Entity>
 		<Entity uid="1656">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="502.48411" z="131.88411"/>
 			<Orientation y="-1.25637"/>
 		</Entity>
 		<Entity uid="1657">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="420.88743" z="163.91839"/>
 			<Orientation y="-0.1987"/>
 		</Entity>
 		<Entity uid="1658">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="366.87714" z="306.3614"/>
 			<Orientation y="-0.37853"/>
 		</Entity>
 		<Entity uid="1659">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="236.01532" z="559.149"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1660">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="895.17481" z="526.27259"/>
 			<Orientation y="-1.78234"/>
 		</Entity>
 		<Entity uid="1661">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="746.69666" z="657.28791"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1662">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="736.6858" z="684.17841"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1663">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="593.38318" z="831.94892"/>
 			<Orientation y="-0.4498"/>
 		</Entity>
 		<Entity uid="1664">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="511.12635" z="841.5312"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1665">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="446.98536" z="218.0491"/>
 			<Orientation y="2.35621"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
@@ -2185,31 +2185,31 @@
 			<Actor seed="4974"/>
 		</Entity>
 		<Entity uid="519">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="317.03351" z="613.2107"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39434"/>
 		</Entity>
 		<Entity uid="520">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="774.41626" z="639.00672"/>
 			<Orientation y="-1.92583"/>
 			<Actor seed="57578"/>
 		</Entity>
 		<Entity uid="521">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="484.78266" z="112.63007"/>
 			<Orientation y="0.25553"/>
 			<Actor seed="36378"/>
 		</Entity>
 		<Entity uid="522">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="649.04078" z="127.06585"/>
 			<Orientation y="-1.28731"/>
 			<Actor seed="22012"/>
 		</Entity>
 		<Entity uid="523">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="542.47626" z="326.32496"/>
 			<Orientation y="3.07296"/>
 			<Actor seed="4452"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml
@@ -25171,77 +25171,77 @@
 			<Orientation y="-2.18337"/>
 		</Entity>
 		<Entity uid="5036">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="261.6471" z="659.80207"/>
 			<Orientation y="0.78356"/>
 		</Entity>
 		<Entity uid="5037">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="632.57697" z="573.10108"/>
 			<Orientation y="-2.15325"/>
 		</Entity>
 		<Entity uid="5038">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="463.29743" z="252.5026"/>
 			<Orientation y="0.78814"/>
 		</Entity>
 		<Entity uid="5039">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="825.03962" z="161.1996"/>
 			<Orientation y="-1.61825"/>
 		</Entity>
 		<Entity uid="5040">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1149.43677" z="474.11735"/>
 			<Orientation y="0.48736"/>
 		</Entity>
 		<Entity uid="5041">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1098.55542" z="609.70887"/>
 			<Orientation y="-1.41137"/>
 		</Entity>
 		<Entity uid="5042">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="772.6667" z="1066.21778"/>
 			<Orientation y="-1.7563"/>
 		</Entity>
 		<Entity uid="5043">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="455.20557" z="1050.54542"/>
 			<Orientation y="0.90798"/>
 		</Entity>
 		<Entity uid="5044">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="336.563" z="141.74143"/>
 			<Orientation y="1.44573"/>
 		</Entity>
 		<Entity uid="5045">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="688.23108" z="34.67621"/>
 			<Orientation y="0.7841"/>
 		</Entity>
 		<Entity uid="5046">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="943.87348" z="147.38306"/>
 			<Orientation y="-1.51003"/>
 		</Entity>
 		<Entity uid="5047">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="720.8606" z="420.80347"/>
 			<Orientation y="0.36776"/>
 		</Entity>
 		<Entity uid="5048">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="453.92972" z="1085.7323"/>
 			<Orientation y="-1.67621"/>
 		</Entity>
 		<Entity uid="5049">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="51.5741" z="656.02601"/>
 			<Orientation y="0.52724"/>
 		</Entity>
 		<Entity uid="5050">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="785.02643" z="777.2079"/>
 			<Orientation y="-1.41839"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
@@ -12187,13 +12187,13 @@
 			<Actor seed="22946"/>
 		</Entity>
 		<Entity uid="2285">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="339.80121" z="247.98044"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36356"/>
 		</Entity>
 		<Entity uid="2286">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="741.58936" z="682.40577"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="44338"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -77640,13 +77640,13 @@
 			<Actor seed="55646"/>
 		</Entity>
 		<Entity uid="16862">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1338.58704" z="273.37912"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5282"/>
 		</Entity>
 		<Entity uid="16863">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1037.74866" z="184.85984"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="31574"/>
@@ -92662,37 +92662,37 @@
 			<Actor seed="41016"/>
 		</Entity>
 		<Entity uid="19518">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1036.4773" z="180.55784"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="65110"/>
 		</Entity>
 		<Entity uid="19519">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1824.95252" z="557.29468"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39364"/>
 		</Entity>
 		<Entity uid="19520">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1676.58997" z="747.58954"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52276"/>
 		</Entity>
 		<Entity uid="19521">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="808.86103" z="992.04206"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37904"/>
 		</Entity>
 		<Entity uid="19522">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="748.4408" z="988.47498"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22232"/>
 		</Entity>
 		<Entity uid="19523">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="193.23523" z="799.29163"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38866"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
@@ -12475,25 +12475,25 @@
 			<Actor seed="46224"/>
 		</Entity>
 		<Entity uid="2261">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="604.98487" z="355.77158"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10160"/>
 		</Entity>
 		<Entity uid="2262">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="616.19556" z="357.8249"/>
 			<Orientation y="1.78675"/>
 			<Actor seed="30348"/>
 		</Entity>
 		<Entity uid="2263">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="632.52112" z="360.53354"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="44962"/>
 		</Entity>
 		<Entity uid="2264">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="628.16437" z="360.93775"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61372"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
@@ -54938,227 +54938,227 @@
 			<Orientation y="-1.99212"/>
 		</Entity>
 		<Entity uid="13262">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="696.32953" z="295.60627"/>
 			<Orientation y="-2.69378"/>
 		</Entity>
 		<Entity uid="13263">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="927.74128" z="446.0359"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13264">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="908.48926" z="293.73951"/>
 			<Orientation y="-2.60282"/>
 		</Entity>
 		<Entity uid="13265">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1134.60315" z="748.61548"/>
 			<Orientation y="-2.18152"/>
 		</Entity>
 		<Entity uid="13266">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="487.59937" z="856.65601"/>
 			<Orientation y="-2.10409"/>
 		</Entity>
 		<Entity uid="13267">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="274.01008" z="758.54078"/>
 			<Orientation y="-2.4994"/>
 		</Entity>
 		<Entity uid="13268">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="189.31629" z="546.30408"/>
 			<Orientation y="2.01264"/>
 		</Entity>
 		<Entity uid="13269">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="720.35615" z="646.73914"/>
 			<Orientation y="0.0146"/>
 		</Entity>
 		<Entity uid="13270">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="653.80225" z="789.08777"/>
 			<Orientation y="-2.69845"/>
 		</Entity>
 		<Entity uid="13271">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="337.94474" z="524.47852"/>
 			<Orientation y="0.33201"/>
 		</Entity>
 		<Entity uid="13272">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="429.78382" z="856.28931"/>
 			<Orientation y="-0.01017"/>
 		</Entity>
 		<Entity uid="13273">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="710.15137" z="133.8661"/>
 			<Orientation y="2.80594"/>
 		</Entity>
 		<Entity uid="13274">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="897.46613" z="128.45203"/>
 			<Orientation y="0.8498"/>
 		</Entity>
 		<Entity uid="13275">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1177.3147" z="419.30799"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="13276">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1348.58863" z="526.448"/>
 			<Orientation y="-2.61908"/>
 		</Entity>
 		<Entity uid="13277">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1178.21241" z="198.41187"/>
 			<Orientation y="0.76915"/>
 		</Entity>
 		<Entity uid="13278">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1485.67872" z="782.6952"/>
 			<Orientation y="-2.17814"/>
 		</Entity>
 		<Entity uid="13279">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="568.8523" z="1111.49952"/>
 			<Orientation y="-2.51151"/>
 		</Entity>
 		<Entity uid="13280">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="547.14393" z="915.04249"/>
 			<Orientation y="1.06782"/>
 		</Entity>
 		<Entity uid="13281">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1076.40613" z="1285.70813"/>
 			<Orientation y="1.05222"/>
 		</Entity>
 		<Entity uid="13282">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1535.99842" z="1513.42261"/>
 			<Orientation y="-2.77793"/>
 		</Entity>
 		<Entity uid="13283">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1288.76075" z="731.58484"/>
 			<Orientation y="0.39112"/>
 		</Entity>
 		<Entity uid="13284">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1226.61255" z="1013.09314"/>
 			<Orientation y="-2.53434"/>
 		</Entity>
 		<Entity uid="13285">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1045.39136" z="779.73902"/>
 			<Orientation y="1.02344"/>
 		</Entity>
 		<Entity uid="13286">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="370.76072" z="957.85364"/>
 			<Orientation y="-2.31751"/>
 		</Entity>
 		<Entity uid="13287">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="134.11628" z="866.30335"/>
 			<Orientation y="1.51865"/>
 		</Entity>
 		<Entity uid="13288">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="325.39377" z="1045.34131"/>
 			<Orientation y="3.12813"/>
 		</Entity>
 		<Entity uid="13289">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="317.49692" z="1064.03687"/>
 			<Orientation y="-0.01264"/>
 		</Entity>
 		<Entity uid="13290">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="724.2508" z="1189.55921"/>
 			<Orientation y="0.48333"/>
 		</Entity>
 		<Entity uid="13291">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="958.03394" z="1305.1565"/>
 			<Orientation y="1.53597"/>
 		</Entity>
 		<Entity uid="13292">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1215.72059" z="1260.34998"/>
 			<Orientation y="-2.64992"/>
 		</Entity>
 		<Entity uid="13293">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="601.60975" z="1470.80152"/>
 			<Orientation y="-2.43316"/>
 		</Entity>
 		<Entity uid="13294">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="392.4636" z="1405.28052"/>
 			<Orientation y="0.8776"/>
 		</Entity>
 		<Entity uid="13295">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="691.12433" z="1312.69288"/>
 			<Orientation y="-3.13631"/>
 		</Entity>
 		<Entity uid="13296">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="894.43879" z="1122.01197"/>
 			<Orientation y="3.11684"/>
 		</Entity>
 		<Entity uid="13297">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="646.25422" z="750.11536"/>
 			<Orientation y="1.74152"/>
 		</Entity>
 		<Entity uid="13298">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="645.34272" z="573.0586"/>
 			<Orientation y="0.18154"/>
 		</Entity>
 		<Entity uid="13299">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="146.59876" z="747.16456"/>
 			<Orientation y="-2.55515"/>
 		</Entity>
 		<Entity uid="13300">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="153.88935" z="550.97022"/>
 			<Orientation y="0.74558"/>
 		</Entity>
 		<Entity uid="13301">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="213.0091" z="455.64832"/>
 			<Orientation y="1.21761"/>
 		</Entity>
 		<Entity uid="13302">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1341.27417" z="885.19043"/>
 			<Orientation y="-2.30236"/>
 		</Entity>
 		<Entity uid="13303">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1252.4834" z="646.74927"/>
 			<Orientation y="-1.7862"/>
 		</Entity>
 		<Entity uid="13304">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="475.44086" z="1116.07496"/>
 			<Orientation y="0.6563"/>
 		</Entity>
 		<Entity uid="13305">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="851.0752" z="1277.43226"/>
 			<Orientation y="-2.66353"/>
 		</Entity>
 		<Entity uid="13306">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1077.88953" z="1306.34925"/>
 			<Orientation y="0.73983"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml
@@ -321,49 +321,49 @@
 			<Actor seed="50696"/>
 		</Entity>
 		<Entity uid="70">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="696.18345" z="1494.89098"/>
 			<Orientation y="3.18877"/>
 			<Actor seed="11422"/>
 		</Entity>
 		<Entity uid="71">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="418.9631" z="884.98777"/>
 			<Orientation y="-1.42623"/>
 			<Actor seed="25040"/>
 		</Entity>
 		<Entity uid="72">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="19.15204" z="579.65772"/>
 			<Orientation y="3.4815"/>
 			<Actor seed="53133"/>
 		</Entity>
 		<Entity uid="73">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="227.37497" z="134.92775"/>
 			<Orientation y="-2.96787"/>
 			<Actor seed="18661"/>
 		</Entity>
 		<Entity uid="74">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="547.96021" z="118.0655"/>
 			<Orientation y="-1.59255"/>
 			<Actor seed="7646"/>
 		</Entity>
 		<Entity uid="75">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="512.53405" z="36.65102"/>
 			<Orientation y="-0.05776"/>
 			<Actor seed="3046"/>
 		</Entity>
 		<Entity uid="76">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="659.99451" z="441.54113"/>
 			<Orientation y="-2.81742"/>
 			<Actor seed="32277"/>
 		</Entity>
 		<Entity uid="77">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="606.27358" z="536.9547"/>
 			<Orientation y="-2.83875"/>
 			<Actor seed="43718"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
@@ -24063,13 +24063,13 @@
 			<Actor seed="16088"/>
 		</Entity>
 		<Entity uid="4671">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="292.55887" z="530.07081"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35666"/>
 		</Entity>
 		<Entity uid="4672">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="762.435" z="500.01465"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34280"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
@@ -10166,87 +10166,87 @@
 			<Orientation y="0.4223"/>
 		</Entity>
 		<Entity uid="1736">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="523.54249" z="424.62156"/>
 			<Orientation y="0.62061"/>
 		</Entity>
 		<Entity uid="1737">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="379.61631" z="223.39605"/>
 			<Orientation y="1.13436"/>
 		</Entity>
 		<Entity uid="1738">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="793.59852" z="310.6344"/>
 			<Orientation y="-2.09174"/>
 		</Entity>
 		<Entity uid="1739">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="641.97175" z="88.27167"/>
 			<Orientation y="-1.5028"/>
 		</Entity>
 		<Entity uid="1740">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="538.87006" z="28.58443"/>
 			<Orientation y="1.16785"/>
 		</Entity>
 		<Entity uid="1741">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="867.36292" z="241.28814"/>
 			<Orientation y="-1.54503"/>
 		</Entity>
 		<Entity uid="1742">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="845.46143" z="464.706"/>
 			<Orientation y="-2.42547"/>
 		</Entity>
 		<Entity uid="1743">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="654.74488" z="779.6214"/>
 			<Orientation y="-2.23296"/>
 		</Entity>
 		<Entity uid="1744">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="209.53144" z="737.86243"/>
 			<Orientation y="2.4328"/>
 		</Entity>
 		<Entity uid="1745">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="302.3954" z="893.67078"/>
 			<Orientation y="-2.88427"/>
 		</Entity>
 		<Entity uid="1746">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="514.1543" z="748.46833"/>
 			<Orientation y="0.55507"/>
 		</Entity>
 		<Entity uid="1747">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="806.1255" z="797.956"/>
 			<Orientation y="1.71062"/>
 		</Entity>
 		<Entity uid="1748">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="902.3888" z="638.84913"/>
 			<Orientation y="-2.0746"/>
 		</Entity>
 		<Entity uid="1749">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="589.41077" z="457.48633"/>
 			<Orientation y="1.35555"/>
 		</Entity>
 		<Entity uid="1750">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="119.89446" z="418.31775"/>
 			<Orientation y="2.80268"/>
 		</Entity>
 		<Entity uid="1751">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="149.24576" z="274.25864"/>
 			<Orientation y="0.45722"/>
 		</Entity>
 		<Entity uid="1752">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="318.62406" z="307.58884"/>
 			<Orientation y="-1.64686"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
@@ -13271,13 +13271,13 @@
 			<Actor seed="5034"/>
 		</Entity>
 		<Entity uid="2780">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="437.01233" z="471.51185"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24980"/>
 		</Entity>
 		<Entity uid="2781">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="562.11481" z="348.57026"/>
 			<Orientation y="-0.37162"/>
 			<Actor seed="58354"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml
@@ -11681,112 +11681,112 @@
 			<Orientation y="0.39264"/>
 		</Entity>
 		<Entity uid="2166">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="426.30127" z="583.8188"/>
 			<Orientation y="-1.55883"/>
 		</Entity>
 		<Entity uid="2167">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="660.63746" z="538.2381"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2168">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="755.30854" z="505.00995"/>
 			<Orientation y="-1.42986"/>
 		</Entity>
 		<Entity uid="2169">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="732.22382" z="568.49268"/>
 			<Orientation y="1.33223"/>
 		</Entity>
 		<Entity uid="2170">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="847.41456" z="742.3343"/>
 			<Orientation y="1.97518"/>
 		</Entity>
 		<Entity uid="2171">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="953.13495" z="684.29072"/>
 			<Orientation y="-3.03298"/>
 		</Entity>
 		<Entity uid="2172">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="930.71558" z="635.80384"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2173">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="948.00696" z="307.41364"/>
 			<Orientation y="-1.93163"/>
 		</Entity>
 		<Entity uid="2174">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="716.35071" z="248.55715"/>
 			<Orientation y="-1.73191"/>
 		</Entity>
 		<Entity uid="2175">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="618.79303" z="214.76871"/>
 			<Orientation y="2.55027"/>
 		</Entity>
 		<Entity uid="2176">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="923.04627" z="159.29337"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2177">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="254.18992" z="736.1811"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2178">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="204.86643" z="577.05549"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2179">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="691.57221" z="1018.42072"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2180">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1145.2732" z="676.27918"/>
 			<Orientation y="-2.18067"/>
 		</Entity>
 		<Entity uid="2181">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1000.91871" z="286.922"/>
 			<Orientation y="0.85544"/>
 		</Entity>
 		<Entity uid="2182">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="401.4448" z="961.5074"/>
 			<Orientation y="-0.58985"/>
 		</Entity>
 		<Entity uid="2183">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="546.57593" z="311.7812"/>
 			<Orientation y="-1.25005"/>
 		</Entity>
 		<Entity uid="2184">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="739.92432" z="86.89032"/>
 			<Orientation y="0.73412"/>
 		</Entity>
 		<Entity uid="2185">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="873.33484" z="245.77051"/>
 			<Orientation y="-1.8997"/>
 		</Entity>
 		<Entity uid="2186">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="117.22913" z="639.93848"/>
 			<Orientation y="-0.9431"/>
 		</Entity>
 		<Entity uid="2187">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1170.0022" z="633.01069"/>
 			<Orientation y="0.9429"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml
@@ -9899,92 +9899,92 @@
 			<Orientation y="0.39264"/>
 		</Entity>
 		<Entity uid="2166">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="426.30127" z="583.8188"/>
 			<Orientation y="-1.55883"/>
 		</Entity>
 		<Entity uid="2167">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="660.63746" z="538.2381"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2168">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="755.30854" z="505.00995"/>
 			<Orientation y="-1.42986"/>
 		</Entity>
 		<Entity uid="2169">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="732.22382" z="568.49268"/>
 			<Orientation y="1.33223"/>
 		</Entity>
 		<Entity uid="2170">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="847.41456" z="742.3343"/>
 			<Orientation y="1.97518"/>
 		</Entity>
 		<Entity uid="2171">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="953.13495" z="684.29072"/>
 			<Orientation y="-3.03298"/>
 		</Entity>
 		<Entity uid="2172">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="930.71558" z="635.80384"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2173">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="948.00696" z="307.41364"/>
 			<Orientation y="-1.93163"/>
 		</Entity>
 		<Entity uid="2174">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="716.35071" z="248.55715"/>
 			<Orientation y="-1.73191"/>
 		</Entity>
 		<Entity uid="2175">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="618.79303" z="214.76871"/>
 			<Orientation y="2.55027"/>
 		</Entity>
 		<Entity uid="2176">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="923.04627" z="159.29337"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2178">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="204.86643" z="577.05549"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2180">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1145.2732" z="676.27918"/>
 			<Orientation y="-2.18067"/>
 		</Entity>
 		<Entity uid="2181">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1000.91871" z="286.922"/>
 			<Orientation y="0.85544"/>
 		</Entity>
 		<Entity uid="2183">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="546.57593" z="311.7812"/>
 			<Orientation y="-1.25005"/>
 		</Entity>
 		<Entity uid="2184">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="739.92432" z="86.89032"/>
 			<Orientation y="0.73412"/>
 		</Entity>
 		<Entity uid="2185">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="873.33484" z="245.77051"/>
 			<Orientation y="-1.8997"/>
 		</Entity>
 		<Entity uid="2187">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1170.0022" z="633.01069"/>
 			<Orientation y="0.9429"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml
@@ -5907,19 +5907,19 @@
 			<Actor seed="460"/>
 		</Entity>
 		<Entity uid="876">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="0" z="0"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13194"/>
 		</Entity>
 		<Entity uid="877">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="0" z="0"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23234"/>
 		</Entity>
 		<Entity uid="878">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="0" z="0"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15042"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml
@@ -8851,37 +8851,37 @@
 			<Actor seed="8508"/>
 		</Entity>
 		<Entity uid="1583">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="581.92334" z="144.93937"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56594"/>
 		</Entity>
 		<Entity uid="1584">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="349.58762" z="380.84467"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="924"/>
 		</Entity>
 		<Entity uid="1585">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="130.42093" z="591.90394"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="22814"/>
 		</Entity>
 		<Entity uid="1586">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="434.83613" z="789.04517"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="30742"/>
 		</Entity>
 		<Entity uid="1587">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="743.73475" z="555.41565"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52248"/>
 		</Entity>
 		<Entity uid="1588">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="785.18104" z="820.63917"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3892"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml
@@ -28376,102 +28376,102 @@
 			<Orientation y="0.44756"/>
 		</Entity>
 		<Entity uid="5226">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="597.63965" z="538.68653"/>
 			<Orientation y="0.6941"/>
 		</Entity>
 		<Entity uid="5227">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="894.85981" z="522.63282"/>
 			<Orientation y="-2.36567"/>
 		</Entity>
 		<Entity uid="5228">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="644.44483" z="216.11921"/>
 			<Orientation y="0.81014"/>
 		</Entity>
 		<Entity uid="5229">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="828.75934" z="177.29914"/>
 			<Orientation y="-1.86248"/>
 		</Entity>
 		<Entity uid="5230">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="423.22172" z="182.48862"/>
 			<Orientation y="0.6419"/>
 		</Entity>
 		<Entity uid="5231">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="550.67267" z="125.60291"/>
 			<Orientation y="-0.14254"/>
 		</Entity>
 		<Entity uid="5232">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="272.95914" z="335.41828"/>
 			<Orientation y="-2.56302"/>
 		</Entity>
 		<Entity uid="5233">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="137.70841" z="366.78541"/>
 			<Orientation y="0.11402"/>
 		</Entity>
 		<Entity uid="5234">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="180.08704" z="742.24018"/>
 			<Orientation y="-2.87021"/>
 		</Entity>
 		<Entity uid="5235">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="380.26154" z="594.12378"/>
 			<Orientation y="0.4949"/>
 		</Entity>
 		<Entity uid="5236">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="490.82276" z="890.2912"/>
 			<Orientation y="-2.8482"/>
 		</Entity>
 		<Entity uid="5237">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="399.5589" z="428.07258"/>
 			<Orientation y="1.00261"/>
 		</Entity>
 		<Entity uid="5238">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="575.20655" z="382.89325"/>
 			<Orientation y="-2.18548"/>
 		</Entity>
 		<Entity uid="5239">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="265.89252" z="130.17753"/>
 			<Orientation y="0.90963"/>
 		</Entity>
 		<Entity uid="5240">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="420.36158" z="24.78501"/>
 			<Orientation y="0.63662"/>
 		</Entity>
 		<Entity uid="5241">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="642.93726" z="272.71287"/>
 			<Orientation y="0.54744"/>
 		</Entity>
 		<Entity uid="5242">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="817.87055" z="586.04822"/>
 			<Orientation y="-2.27012"/>
 		</Entity>
 		<Entity uid="5243">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="587.27088" z="792.71436"/>
 			<Orientation y="-2.8173"/>
 		</Entity>
 		<Entity uid="5244">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="784.49769" z="813.53724"/>
 			<Orientation y="-2.5755"/>
 		</Entity>
 		<Entity uid="5245">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="583.71314" z="230.48917"/>
 			<Orientation y="0.23797"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml
@@ -16641,97 +16641,97 @@
 			<Actor seed="294"/>
 		</Entity>
 		<Entity uid="2782">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="520.47474" z="846.412"/>
 			<Orientation y="-2.31501"/>
 			<Actor seed="32346"/>
 		</Entity>
 		<Entity uid="2783">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="289.01539" z="506.46808"/>
 			<Orientation y="0.56624"/>
 			<Actor seed="4078"/>
 		</Entity>
 		<Entity uid="2784">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="390.33167" z="155.60651"/>
 			<Orientation y="-1.26845"/>
 			<Actor seed="15690"/>
 		</Entity>
 		<Entity uid="2785">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="595.24451" z="186.08112"/>
 			<Orientation y="-2.11434"/>
 			<Actor seed="41804"/>
 		</Entity>
 		<Entity uid="2786">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="797.68665" z="174.37781"/>
 			<Orientation y="-0.34803"/>
 			<Actor seed="27118"/>
 		</Entity>
 		<Entity uid="2787">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1105.7046" z="374.80329"/>
 			<Orientation y="-2.19982"/>
 			<Actor seed="25462"/>
 		</Entity>
 		<Entity uid="2788">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="974.64661" z="566.021"/>
 			<Orientation y="0.57406"/>
 			<Actor seed="26744"/>
 		</Entity>
 		<Entity uid="2789">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="728.18531" z="769.45075"/>
 			<Orientation y="-2.63668"/>
 			<Actor seed="30470"/>
 		</Entity>
 		<Entity uid="2790">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="528.50104" z="334.25232"/>
 			<Orientation y="1.01278"/>
 			<Actor seed="39804"/>
 		</Entity>
 		<Entity uid="2791">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="775.19996" z="485.62006"/>
 			<Orientation y="-2.17688"/>
 			<Actor seed="49938"/>
 		</Entity>
 		<Entity uid="2792">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="330.80024" z="638.5381"/>
 			<Orientation y="-2.04899"/>
 			<Actor seed="32068"/>
 		</Entity>
 		<Entity uid="2793">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="125.63758" z="602.8545"/>
 			<Orientation y="1.22063"/>
 			<Actor seed="27706"/>
 		</Entity>
 		<Entity uid="2794">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="691.78125" z="68.85892"/>
 			<Orientation y="0.94733"/>
 			<Actor seed="46478"/>
 		</Entity>
 		<Entity uid="2795">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1200.58045" z="640.00031"/>
 			<Orientation y="-1.57081"/>
 			<Actor seed="51792"/>
 		</Entity>
 		<Entity uid="2796">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="580.69446" z="1138.219"/>
 			<Orientation y="-2.17466"/>
 			<Actor seed="40874"/>
 		</Entity>
 		<Entity uid="2797">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="542.2212" z="393.19013"/>
 			<Orientation y="1.22619"/>
 			<Actor seed="45856"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5.xml
@@ -29110,55 +29110,55 @@
 			<Actor seed="64120"/>
 		</Entity>
 		<Entity uid="5742">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="909.82361" z="880.56507"/>
 			<Orientation y="1.16146"/>
 			<Actor seed="5516"/>
 		</Entity>
 		<Entity uid="5743">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="886.34894" z="982.95307"/>
 			<Orientation y="-1.24946"/>
 			<Actor seed="37966"/>
 		</Entity>
 		<Entity uid="5744">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="776.04322" z="892.77247"/>
 			<Orientation y="-2.15664"/>
 			<Actor seed="12116"/>
 		</Entity>
 		<Entity uid="5745">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="744.33906" z="640.10145"/>
 			<Orientation y="0.44474"/>
 			<Actor seed="14526"/>
 		</Entity>
 		<Entity uid="5746">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="808.73426" z="511.1089"/>
 			<Orientation y="1.29931"/>
 			<Actor seed="44016"/>
 		</Entity>
 		<Entity uid="5747">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="780.22187" z="492.03367"/>
 			<Orientation y="-0.99076"/>
 			<Actor seed="51048"/>
 		</Entity>
 		<Entity uid="5748">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="618.88624" z="580.28821"/>
 			<Orientation y="0.19115"/>
 			<Actor seed="11194"/>
 		</Entity>
 		<Entity uid="5749">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="567.29938" z="622.21253"/>
 			<Orientation y="-0.91922"/>
 			<Actor seed="6382"/>
 		</Entity>
 		<Entity uid="5750">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="535.30195" z="400.61725"/>
 			<Orientation y="-2.50776"/>
 			<Actor seed="51118"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
@@ -26348,31 +26348,31 @@
 			<Actor seed="692"/>
 		</Entity>
 		<Entity uid="4444">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="288.51063" z="711.95606"/>
 			<Orientation y="-1.52898"/>
 			<Actor seed="22086"/>
 		</Entity>
 		<Entity uid="4445">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="717.72101" z="701.31135"/>
 			<Orientation y="-2.45971"/>
 			<Actor seed="62078"/>
 		</Entity>
 		<Entity uid="4446">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="648.70191" z="194.69637"/>
 			<Orientation y="-0.20112"/>
 			<Actor seed="9246"/>
 		</Entity>
 		<Entity uid="4447">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="211.55108" z="264.19639"/>
 			<Orientation y="1.22799"/>
 			<Actor seed="56018"/>
 		</Entity>
 		<Entity uid="4448">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="458.68644" z="473.15052"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14552"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
@@ -18561,43 +18561,43 @@
 			<Actor seed="31534"/>
 		</Entity>
 		<Entity uid="3176">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="179.44297" z="642.9021"/>
 			<Orientation y="-2.76778"/>
 			<Actor seed="13932"/>
 		</Entity>
 		<Entity uid="3177">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="543.52173" z="762.20643"/>
 			<Orientation y="0.87865"/>
 			<Actor seed="31808"/>
 		</Entity>
 		<Entity uid="3178">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="997.37311" z="745.61622"/>
 			<Orientation y="-1.98188"/>
 			<Actor seed="51272"/>
 		</Entity>
 		<Entity uid="3179">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="765.70923" z="331.21711"/>
 			<Orientation y="0.26198"/>
 			<Actor seed="59904"/>
 		</Entity>
 		<Entity uid="3180">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="577.32837" z="62.51563"/>
 			<Orientation y="-0.68693"/>
 			<Actor seed="55358"/>
 		</Entity>
 		<Entity uid="3181">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="958.89643" z="214.50417"/>
 			<Orientation y="1.01719"/>
 			<Actor seed="25786"/>
 		</Entity>
 		<Entity uid="3182">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="263.2952" z="239.1313"/>
 			<Orientation y="0.78438"/>
 			<Actor seed="17808"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml
@@ -9991,13 +9991,13 @@
 			<Actor seed="61722"/>
 		</Entity>
 		<Entity uid="1900">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="138.75724" z="443.41883"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60378"/>
 		</Entity>
 		<Entity uid="1901">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="592.30683" z="264.63221"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18358"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
@@ -40291,227 +40291,227 @@
 			<Actor seed="17740"/>
 		</Entity>
 		<Entity uid="7709">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1679.58936" z="606.24878"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7710">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1730.0553" z="698.0113"/>
 			<Orientation y="-2.25785"/>
 		</Entity>
 		<Entity uid="7711">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1871.28028" z="914.0063"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7712">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1967.0138" z="911.02784"/>
 			<Orientation y="-2.03156"/>
 		</Entity>
 		<Entity uid="7713">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1776.81434" z="1051.79212"/>
 			<Orientation y="0.17861"/>
 		</Entity>
 		<Entity uid="7714">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1671.66285" z="1205.10035"/>
 			<Orientation y="-1.58916"/>
 		</Entity>
 		<Entity uid="7715">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1562.46912" z="1264.24756"/>
 			<Orientation y="-0.44051"/>
 		</Entity>
 		<Entity uid="7716">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1420.31458" z="1395.49988"/>
 			<Orientation y="-3.04801"/>
 		</Entity>
 		<Entity uid="7717">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1350.3169" z="1308.86658"/>
 			<Orientation y="-2.85717"/>
 		</Entity>
 		<Entity uid="7718">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1277.49085" z="1203.36487"/>
 			<Orientation y="-0.27326"/>
 		</Entity>
 		<Entity uid="7719">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1049.172" z="1371.85572"/>
 			<Orientation y="-0.47991"/>
 		</Entity>
 		<Entity uid="7720">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="972.00428" z="1446.44459"/>
 			<Orientation y="-2.65632"/>
 		</Entity>
 		<Entity uid="7721">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="889.17566" z="1477.56824"/>
 			<Orientation y="0.0608"/>
 		</Entity>
 		<Entity uid="7722">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="677.63056" z="1471.71009"/>
 			<Orientation y="-2.5686"/>
 		</Entity>
 		<Entity uid="7723">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="569.86701" z="1324.07154"/>
 			<Orientation y="0.76578"/>
 		</Entity>
 		<Entity uid="7724">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="681.85389" z="1075.2522"/>
 			<Orientation y="3.03502"/>
 		</Entity>
 		<Entity uid="7725">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="482.70127" z="906.84174"/>
 			<Orientation y="-1.42531"/>
 		</Entity>
 		<Entity uid="7726">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="76.03254" z="780.41797"/>
 			<Orientation y="1.63967"/>
 		</Entity>
 		<Entity uid="7727">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="349.35123" z="736.00562"/>
 			<Orientation y="2.21804"/>
 		</Entity>
 		<Entity uid="7728">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="715.25574" z="648.54554"/>
 			<Orientation y="2.18746"/>
 		</Entity>
 		<Entity uid="7729">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="777.00074" z="349.3754"/>
 			<Orientation y="-2.81403"/>
 		</Entity>
 		<Entity uid="7730">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="533.27137" z="71.29061"/>
 			<Orientation y="1.16312"/>
 		</Entity>
 		<Entity uid="7731">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="683.9441" z="133.56919"/>
 			<Orientation y="1.14844"/>
 		</Entity>
 		<Entity uid="7732">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="841.36823" z="198.08909"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7733">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="961.15381" z="301.66675"/>
 			<Orientation y="-3.06917"/>
 		</Entity>
 		<Entity uid="7734">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1057.99622" z="333.27521"/>
 			<Orientation y="2.18015"/>
 		</Entity>
 		<Entity uid="7735">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1058.11902" z="482.89264"/>
 			<Orientation y="-0.15848"/>
 		</Entity>
 		<Entity uid="7736">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="964.3105" z="708.27588"/>
 			<Orientation y="3.03006"/>
 		</Entity>
 		<Entity uid="7737">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="969.39551" z="954.69214"/>
 			<Orientation y="1.00394"/>
 		</Entity>
 		<Entity uid="7738">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1080.63111" z="900.35895"/>
 			<Orientation y="-2.44333"/>
 		</Entity>
 		<Entity uid="7739">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1186.18445" z="714.02088"/>
 			<Orientation y="-2.74753"/>
 		</Entity>
 		<Entity uid="7740">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1200.94642" z="571.6327"/>
 			<Orientation y="1.9609"/>
 		</Entity>
 		<Entity uid="7741">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1300.23475" z="408.74552"/>
 			<Orientation y="-2.24178"/>
 		</Entity>
 		<Entity uid="7742">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1418.12623" z="174.21647"/>
 			<Orientation y="1.508"/>
 		</Entity>
 		<Entity uid="7743">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1537.8672" z="149.89051"/>
 			<Orientation y="-2.11463"/>
 		</Entity>
 		<Entity uid="7744">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1691.00196" z="374.19501"/>
 			<Orientation y="-2.33561"/>
 		</Entity>
 		<Entity uid="7745">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1596.99805" z="475.5196"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7746">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1449.90552" z="607.1714"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7747">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1361.59449" z="790.10138"/>
 			<Orientation y="-2.65677"/>
 		</Entity>
 		<Entity uid="7748">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1433.0005" z="1600.86304"/>
 			<Orientation y="0.64939"/>
 		</Entity>
 		<Entity uid="7749">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1654.04712" z="1803.91419"/>
 			<Orientation y="-2.37711"/>
 		</Entity>
 		<Entity uid="7750">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1809.04871" z="1633.12378"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7751">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1846.77771" z="1430.71827"/>
 			<Orientation y="-2.76876"/>
 		</Entity>
 		<Entity uid="7752">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1830.08863" z="1111.32679"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="7753">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1980.73182" z="1174.70069"/>
 			<Orientation y="-2.15816"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
@@ -6536,25 +6536,25 @@
 			<Actor seed="13772"/>
 		</Entity>
 		<Entity uid="1054">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="864.06214" z="186.94004"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45464"/>
 		</Entity>
 		<Entity uid="1055">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="433.3426" z="717.537"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57276"/>
 		</Entity>
 		<Entity uid="1056">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1194.1233" z="610.97236"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27498"/>
 		</Entity>
 		<Entity uid="1057">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="893.39026" z="1270.00416"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35352"/>
@@ -15751,19 +15751,19 @@
 			<Actor seed="40024"/>
 		</Entity>
 		<Entity uid="2548">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1113.75599" z="511.10056"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62110"/>
 		</Entity>
 		<Entity uid="2549">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="779.78357" z="443.19904"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38608"/>
 		</Entity>
 		<Entity uid="2550">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="924.77692" z="269.45005"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32446"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
@@ -59081,31 +59081,31 @@
 			<Actor seed="44376"/>
 		</Entity>
 		<Entity uid="16836">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1237.61683" z="664.19062"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48862"/>
 		</Entity>
 		<Entity uid="16837">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1040.24415" z="917.87616"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38952"/>
 		</Entity>
 		<Entity uid="16838">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="855.42957" z="1300.61866"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45806"/>
 		</Entity>
 		<Entity uid="16839">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="1256.03711" z="1473.36646"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54426"/>
 		</Entity>
 		<Entity uid="16840">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="874.65534" z="1662.10279"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26612"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
@@ -4363,25 +4363,25 @@
 			<Actor seed="20238"/>
 		</Entity>
 		<Entity uid="698">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="477.39478" z="939.68824"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1700"/>
 		</Entity>
 		<Entity uid="699">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="483.18305" z="948.86194"/>
 			<Orientation y="-0.61664"/>
 			<Actor seed="33916"/>
 		</Entity>
 		<Entity uid="700">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="326.2645" z="924.02356"/>
 			<Orientation y="-2.51478"/>
 			<Actor seed="58586"/>
 		</Entity>
 		<Entity uid="701">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="315.36084" z="915.51954"/>
 			<Orientation y="1.54581"/>
 			<Actor seed="5234"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml
@@ -15221,37 +15221,37 @@
 			<Actor seed="52160"/>
 		</Entity>
 		<Entity uid="3158">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="155.68656" z="267.00702"/>
 			<Orientation y="0.34656"/>
 			<Actor seed="34840"/>
 		</Entity>
 		<Entity uid="3159">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="476.87262" z="418.82758"/>
 			<Orientation y="-2.61167"/>
 			<Actor seed="31322"/>
 		</Entity>
 		<Entity uid="3160">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="685.4928" z="399.17487"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39144"/>
 		</Entity>
 		<Entity uid="3161">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="532.8559" z="65.3036"/>
 			<Orientation y="0.27488"/>
 			<Actor seed="10912"/>
 		</Entity>
 		<Entity uid="3162">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="265.26914" z="639.87586"/>
 			<Orientation y="-2.50437"/>
 			<Actor seed="50472"/>
 		</Entity>
 		<Entity uid="3163">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="532.91858" z="562.22327"/>
 			<Orientation y="0.67539"/>
 			<Actor seed="16092"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
@@ -8806,167 +8806,167 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1777">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="355.82044" z="670.18165"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1778">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="414.18622" z="311.24091"/>
 			<Orientation y="-2.07085"/>
 		</Entity>
 		<Entity uid="1779">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="167.40461" z="286.98804"/>
 			<Orientation y="1.15082"/>
 		</Entity>
 		<Entity uid="1780">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="273.39106" z="360.95337"/>
 			<Orientation y="1.60595"/>
 		</Entity>
 		<Entity uid="1781">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="564.98292" z="343.4029"/>
 			<Orientation y="2.10343"/>
 		</Entity>
 		<Entity uid="1782">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="707.13727" z="254.62037"/>
 			<Orientation y="-1.91092"/>
 		</Entity>
 		<Entity uid="1783">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="648.91932" z="253.67896"/>
 			<Orientation y="1.07366"/>
 		</Entity>
 		<Entity uid="1784">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="901.10401" z="417.25947"/>
 			<Orientation y="0.29087"/>
 		</Entity>
 		<Entity uid="1785">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="909.32032" z="488.3733"/>
 			<Orientation y="-0.71526"/>
 		</Entity>
 		<Entity uid="1786">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="844.60328" z="532.13843"/>
 			<Orientation y="-2.77071"/>
 		</Entity>
 		<Entity uid="1787">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="824.79725" z="393.48755"/>
 			<Orientation y="2.76131"/>
 		</Entity>
 		<Entity uid="1788">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="867.7146" z="505.7754"/>
 			<Orientation y="0.00425"/>
 		</Entity>
 		<Entity uid="1789">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="863.54969" z="654.0619"/>
 			<Orientation y="-0.54583"/>
 		</Entity>
 		<Entity uid="1790">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="784.50208" z="847.18738"/>
 			<Orientation y="-0.96763"/>
 		</Entity>
 		<Entity uid="1791">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="538.57953" z="852.15467"/>
 			<Orientation y="-2.31388"/>
 		</Entity>
 		<Entity uid="1792">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="357.2331" z="847.21229"/>
 			<Orientation y="-1.97764"/>
 		</Entity>
 		<Entity uid="1793">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="168.26758" z="670.52723"/>
 			<Orientation y="-3.02778"/>
 		</Entity>
 		<Entity uid="1794">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="51.82218" z="503.27448"/>
 			<Orientation y="0.18841"/>
 		</Entity>
 		<Entity uid="1795">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="153.0268" z="271.96781"/>
 			<Orientation y="2.92237"/>
 		</Entity>
 		<Entity uid="1796">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="130.60553" z="437.77326"/>
 			<Orientation y="-1.22066"/>
 		</Entity>
 		<Entity uid="1797">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="413.10358" z="129.14554"/>
 			<Orientation y="1.28092"/>
 		</Entity>
 		<Entity uid="1798">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="708.04542" z="81.10065"/>
 			<Orientation y="-1.6886"/>
 		</Entity>
 		<Entity uid="1799">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="539.27149" z="23.4581"/>
 			<Orientation y="0.88202"/>
 		</Entity>
 		<Entity uid="1800">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="663.55188" z="137.21387"/>
 			<Orientation y="0.7728"/>
 		</Entity>
 		<Entity uid="1801">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="896.13227" z="302.04517"/>
 			<Orientation y="-2.35221"/>
 		</Entity>
 		<Entity uid="1802">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="771.09351" z="189.79883"/>
 			<Orientation y="0.78957"/>
 		</Entity>
 		<Entity uid="1803">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="906.7519" z="236.17872"/>
 			<Orientation y="-1.00248"/>
 		</Entity>
 		<Entity uid="1804">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="530.36176" z="465.83515"/>
 			<Orientation y="0.69794"/>
 		</Entity>
 		<Entity uid="1805">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="644.49817" z="351.19916"/>
 			<Orientation y="-1.54133"/>
 		</Entity>
 		<Entity uid="1806">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="489.48795" z="293.04834"/>
 			<Orientation y="1.0215"/>
 		</Entity>
 		<Entity uid="1807">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="486.72724" z="308.39966"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1808">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="929.46943" z="370.66993"/>
 			<Orientation y="-0.8961"/>
 		</Entity>
 		<Entity uid="1809">
-			<Template>gaia/fauna_hawk</Template>
+			<Template>birds/buzzard</Template>
 			<Position x="842.51069" z="340.90424"/>
 			<Orientation y="-0.84313"/>
 		</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/birds/buzzard.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/birds/buzzard.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/birds/buzzard.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_bird">
+  <VisualActor>
+    <Actor>fauna/hawk.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hawk.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hawk.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hawk.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_bird">
-  <VisualActor>
-    <Actor>fauna/hawk.xml</Actor>
-  </VisualActor>
-</Entity>