diff --git a/1.5/1.5/Assemblies/DragonianMix.dll b/1.5/1.5/Assemblies/DragonianMix.dll
index b2f3d7b..2dca590 100644
Binary files a/1.5/1.5/Assemblies/DragonianMix.dll and b/1.5/1.5/Assemblies/DragonianMix.dll differ
diff --git a/1.5/1.5/Assemblies/DragonianMix.pdb b/1.5/1.5/Assemblies/DragonianMix.pdb
index d4d27f8..be25b9d 100644
Binary files a/1.5/1.5/Assemblies/DragonianMix.pdb and b/1.5/1.5/Assemblies/DragonianMix.pdb differ
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
index 30e79ec..f3e0d7b 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
@@ -366,7 +366,7 @@
 			</skillRequirements>
 		</recipeMaker>
 		<weaponTags>
-			<li>DR_BattleStaff_Ranged</li>
+			<li>DR_BattleStaff_Air</li>
 		</weaponTags>
 		<thingCategories>
 			<li>WeaponsRanged</li>
diff --git a/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml b/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml
index 96db9dc..8922143 100644
--- a/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml
+++ b/1.5/Ano1.5/Defs/ThingDefs/DRM_Weapon_ano.xml
@@ -1,136 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-  <DragonianMix.ExpandableProjectileDef ParentName="BaseBullet">
-    <defName>DRM_Bullet_BattleStaff_FlareSpewer</defName>
-    <label>Flare Spewer shot</label>
-    <thingClass>DragonianMix.FlamethrowProjectile</thingClass>
-    <graphicData>
-      <texPath>Dragonian/Projectile/Proj_HeavyFlamer</texPath>
-      <texPathFadeOut>Dragonian/Projectile/Proj_HeavyFlamerFadeOut</texPathFadeOut>
-      <shaderType>MoteGlow</shaderType>
-    </graphicData>
-    <projectile>
-      <damageDef>DRM_Flame</damageDef>
-      <speed>50</speed>
-      <damageAmountBase>5</damageAmountBase>
-    </projectile>
-
-    <drawOffscreen>true</drawOffscreen>
-    <lifeTimeDuration>100</lifeTimeDuration>
-    <widthScaleFactor>0.75</widthScaleFactor>
-    <heightScaleFactor>1</heightScaleFactor>
-    <startingPositionOffset>(0, 0, -1)</startingPositionOffset>
-    <totalSizeScale>1.15</totalSizeScale>
-    <tickFrameRate>2</tickFrameRate>
-    <finalTickFrameRate>5</finalTickFrameRate>
-    <tickDamageRate>20</tickDamageRate>
-    <dealsDamageOnce>true</dealsDamageOnce>
-    <minDistanceToAffect>2</minDistanceToAffect>
-  </DragonianMix.ExpandableProjectileDef>
-
-  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-    <defName>DR_BattleStaff_Flare_B</defName>
-    <label>Dragonian Flare Staff B</label>
-    <description>A Staff for Dragonian.Can Spray Fire shoot.</description>
-    <graphicData>
-      <texPath>Dragonian/Things/Weapon/staff</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>CutoutComplex</shaderType>
-    </graphicData>
-    <uiIconScale>1</uiIconScale>
-    <techLevel>Medieval</techLevel>
-    <statBases>
-      <WorkToMake>12000</WorkToMake>
-      <Mass>15</Mass>
-      <AccuracyTouch>0.60</AccuracyTouch>
-      <AccuracyShort>0.70</AccuracyShort>
-      <AccuracyMedium>0.65</AccuracyMedium>
-      <AccuracyLong>0.55</AccuracyLong>
-      <RangedWeapon_Cooldown>1.70</RangedWeapon_Cooldown>
-    </statBases>
-    <equippedAngleOffset>45</equippedAngleOffset>
-    <costStuffCount>80</costStuffCount>
-    <stuffCategories>
-      <li>Metallic</li>
-    </stuffCategories>
-    <costList>
-      <WoolDragonian>40</WoolDragonian>
-      <Steel>40</Steel>
-      <ComponentIndustrial>5</ComponentIndustrial>
-    </costList>
-    <recipeMaker>
-      <skillRequirements>
-        <Crafting>10</Crafting>
-      </skillRequirements>
-    </recipeMaker>
-    <weaponTags>
-      <li>DR_BattleStaff_Ranged</li>
-    </weaponTags>
-    <thingCategories>
-      <li>WeaponsRanged</li>
-    </thingCategories>
-    <weaponClasses>
-      <li>Ranged</li>
-    </weaponClasses>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>DRM_Bullet_BattleStaff_FlareSpewer</defaultProjectile>
-        <ai_AvoidFriendlyFireRadius>5.9</ai_AvoidFriendlyFireRadius>
-        <warmupTime>1.25</warmupTime>
-        <range>22.9</range>
-        <burstShotCount>1</burstShotCount>
-        <soundCast>Flamethrower_Firing_Resolve</soundCast>
-        <soundCastTail>GunTail_Light</soundCastTail>
-        <muzzleFlashScale>50</muzzleFlashScale>
-        <minRange>5.9</minRange>
-        <targetParams>
-          <canTargetLocations>true</canTargetLocations>
-        </targetParams>
-        <targetable>true</targetable>
-        <rangedFireRulepack>Combat_RangedFlamethrower</rangedFireRulepack>
-      </li>
-    </verbs>
-    <tools>
-      <li>
-        <label>handle</label>
-        <capacities>
-          <li>Poke</li>
-        </capacities>
-        <power>8</power>
-        <cooldownTime>2</cooldownTime>
-      </li>
-      <li>
-        <label>physical-magic</label>
-        <capacities>
-          <li>Blunt</li>
-          <li>Demolish</li>
-        </capacities>
-        <power>15</power>
-        <extraMeleeDamages>
-          <li>
-            <def>DRM_Flame</def>
-            <amount>30</amount>
-            <chance>1</chance>
-          </li>
-          <li>
-            <def>Stun</def>
-            <amount>1.5</amount>
-            <chance>0.25</chance>
-          </li>
-        </extraMeleeDamages>
-        <cooldownTime>5.2</cooldownTime>
-      </li>
-    </tools>
-    <equippedStatOffsets>
-      <PsychicSensitivityOffset MayRequire="Ludeon.Rimworld.Royalty">0.50</PsychicSensitivityOffset>
-      <PsychicEntropyRecoveryRate MayRequire="Ludeon.Rimworld.Royalty">0.083</PsychicEntropyRecoveryRate>
-    </equippedStatOffsets>
-    <meleeHitSound>DRHammerSound</meleeHitSound>
-  </ThingDef>
-
   <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
     <defName>DR_BattleStaff_Flare</defName>
     <label>Dragonian Flare Staff</label>
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerA.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerA.png
deleted file mode 100644
index f73f0bb..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerA.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerB.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerB.png
deleted file mode 100644
index 74a7a96..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerB.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerC.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerC.png
deleted file mode 100644
index 43f60f8..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerC.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerD.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerD.png
deleted file mode 100644
index 0dd1f22..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerD.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerE.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerE.png
deleted file mode 100644
index b5db94f..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerE.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerF.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerF.png
deleted file mode 100644
index 9a43560..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerF.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerG.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerG.png
deleted file mode 100644
index d576c79..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerG.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerH.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerH.png
deleted file mode 100644
index f1384d0..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerH.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerI.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerI.png
deleted file mode 100644
index 462c1b1..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerI.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerJ.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerJ.png
deleted file mode 100644
index 9e90fbb..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerJ.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerK.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerK.png
deleted file mode 100644
index 4db17c8..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerK.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerL.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerL.png
deleted file mode 100644
index cd3e1fc..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerL.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerM.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerM.png
deleted file mode 100644
index 3316917..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerM.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerN.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerN.png
deleted file mode 100644
index 899100d..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerN.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerO.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerO.png
deleted file mode 100644
index db0e67b..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamer/Proj_HeavyFlamerO.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerP.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerP.png
deleted file mode 100644
index e92517a..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerP.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerR.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerR.png
deleted file mode 100644
index 6adc4bf..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerR.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerS.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerS.png
deleted file mode 100644
index 1f1c2a9..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerS.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerT.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerT.png
deleted file mode 100644
index 6b4d740..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerT.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerU.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerU.png
deleted file mode 100644
index d146f66..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerU.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerW.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerW.png
deleted file mode 100644
index ebdf0cd..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerW.png and /dev/null differ
diff --git a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerX.png b/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerX.png
deleted file mode 100644
index 266c61e..0000000
Binary files a/Content/Textures/Dragonian/Projectile/Proj_HeavyFlamerFadeOut/Proj_HeavyFlamerX.png and /dev/null differ