Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_flamethrower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_flamethrower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_flamethrower.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_siege">
+  <Attack>
+    <Ranged>
+      <AttackName>Fire</AttackName>
+      <Damage>
+        <Fire>100</Fire>
+      </Damage>
+      <MaxRange>15</MaxRange>
+      <MinRange>10</MinRange>
+      <PrepareTime>2000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+      <Projectile>
+        <Speed>10</Speed>
+        <Spread>2</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <RangeOverlay>
+        <LineTexture>outline_border.png</LineTexture>
+        <LineTextureMask>outline_border_mask.png</LineTextureMask>
+        <LineThickness>0.175</LineThickness>
+      </RangeOverlay>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>30</BuildTime>
+    <Resources>
+      <wood>300</wood>
+      <metal>150</metal>
+    </Resources>
+  </Cost>
+  <DeathDamage>
+    <Shape>Circular</Shape>
+    <Range>20</Range>
+    <FriendlyFire>true</FriendlyFire>
+    <Damage>
+      <Fire>600</Fire>
+    </Damage>
+  </DeathDamage>
+  <Health>
+    <Max>300</Max>
+  </Health>
+  <Identity>
+    <GenericName>Flamethrower</GenericName>
+  </Identity>
+  <Loot>
+    <xp>150</xp>
+    <wood>60</wood>
+    <metal>30</metal>
+  </Loot>
+  <Vision>
+    <Range>60</Range>
+  </Vision>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -1,61 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_siege">
-  <Attack>
-    <Ranged>
-      <AttackName>Fire</AttackName>
-      <Damage>
-        <Fire>100</Fire>
-      </Damage>
-      <MaxRange>15</MaxRange>
-      <MinRange>10</MinRange>
-      <PrepareTime>2000</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Projectile>
-        <Speed>10</Speed>
-        <Spread>2</Spread>
-        <Gravity>9.81</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <RangeOverlay>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.175</LineThickness>
-      </RangeOverlay>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <wood>300</wood>
-      <metal>150</metal>
-    </Resources>
-  </Cost>
-  <DeathDamage>
-    <Shape>Circular</Shape>
-    <Range>20</Range>
-    <FriendlyFire>true</FriendlyFire>
-    <Damage>
-      <Fire>600</Fire>
-    </Damage>
-  </DeathDamage>
+<Entity parent="template_unit_siege_flamethrower">
   <Footprint replace="">
     <Square width="6.0" depth="20.0"/>
     <Height>4.5</Height>
   </Footprint>
-  <Health>
-    <Max>300</Max>
-  </Health>
   <Identity>
     <GenericName>Fire Raiser</GenericName>
     <SpecificName>Pyrobolos</SpecificName>
     <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
-  <Loot>
-    <xp>150</xp>
-    <wood>60</wood>
-    <metal>30</metal>
-  </Loot>
   <Selectable>
     <Overlay>
       <Texture>
@@ -64,9 +17,6 @@
       </Texture>
     </Overlay>
   </Selectable>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/thebans/siege_fireraiser.xml</Actor>
   </VisualActor>