diff --git a/Defs/Ammo/Medieval/MusketBall.xml b/Defs/Ammo/Medieval/MusketBall.xml
new file mode 100644
index 0000000000..e86a1b994a
--- /dev/null
+++ b/Defs/Ammo/Medieval/MusketBall.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoMusketBall</defName>
+		<label>Musket ball</label>
+		<parent>AmmoRifles</parent>
+    <iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
+	</ThingCategoryDef>
+	
+	<!-- ==================== AmmoSet ========================== -->
+
+	<!-- High Velocity -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_FastMusketBall</defName>
+		<label>Musket Ball</label>
+		<ammoTypes>
+			<Ammo_MusketBall>Bullet_FastMusketBall</Ammo_MusketBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- Low Velocity -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_SlowMusketBall</defName>
+		<label>Musket Ball</label>
+		<ammoTypes>
+			<Ammo_MusketBall>Bullet_SlowMusketBall</Ammo_MusketBall>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+	
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="MusketBallBase" ParentName="SmallAmmoBase" Abstract="True">
+		<description>A paper cartridge sealed with wax containing a round projectile and black powder, fired by early, smoothbore firearms.</description>
+		<statBases>
+		<Mass>0.12</Mass>
+		<Bulk>0.14</Bulk>
+		</statBases>
+		<tradeTags>
+		  <li>CE_AutoEnableTrade</li>
+		  <li>CE_AutoEnableCrafting_FueledSmithy</li>
+		  <li>CE_AutoEnableCrafting_ElectricSmithy</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoMusketBall</li>
+		</thingCategories>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="MusketBallBase">
+		<defName>Ammo_MusketBall</defName>
+		<label>Musket ball</label>
+		<graphicData>
+			<texPath>Things/Ammo/Neolithic/SlingBullet/Steel</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.5</MarketValue>
+		</statBases>
+		<ammoClass>FullMetalJacket</ammoClass>
+	</ThingDef>
+	
+	<!-- ================== Projectile Base ================== -->
+	
+	<ThingDef Name="MusketBallBullet" ParentName="BaseBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile>
+			<damageDef>Bullet</damageDef>
+			<dropsCasings>false</dropsCasings>
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles (High Velocity) ================== -->
+
+	<ThingDef ParentName="MusketBallBullet">
+		<defName>Bullet_FastMusketBall</defName>
+		<label>lead ball</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>60</speed>	
+			<damageAmountBase>20</damageAmountBase>		
+			<armorPenetrationSharp>6.7</armorPenetrationSharp>
+			<armorPenetrationBlunt>28.8</armorPenetrationBlunt>				
+		</projectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles (Low Velocity) ================== -->
+
+	<ThingDef ParentName="MusketBallBullet">
+		<defName>Bullet_SlowMusketBall</defName>
+		<label>lead ball</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>80</speed>	
+			<damageAmountBase>17</damageAmountBase>		
+			<armorPenetrationSharp>5.3</armorPenetrationSharp>
+			<armorPenetrationBlunt>20</armorPenetrationBlunt>				
+		</projectile>
+	</ThingDef>
+  
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_MusketBall</defName>
+		<label>make lead ball x500</label>
+		<description>Craft 500 lead balls.</description>
+		<jobString>Making lead balls.</jobString>
+    	<workAmount>6800</workAmount>		
+		<ingredients>
+			<li>
+			<filter>
+				<thingDefs>
+					<li>Steel</li>
+				</thingDefs>
+			</filter>
+			<count>68</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_MusketBall>500</Ammo_MusketBall>
+		</products>
+	</RecipeDef>
+	
+</Defs>
\ No newline at end of file
diff --git a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml
index 61cbf627cc..1bd0f43ea5 100644
--- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml	
+++ b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml	
@@ -3,7 +3,7 @@
 
   <Operation Class="PatchOperationFindMod">
     <mods>
-      <li>Vanilla Weapons Expanded</li>
+      <li>Vanilla Factions Expanded - Medieval</li>
     </mods>
 
     <match Class="PatchOperationSequence">
diff --git a/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml b/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml
index cad3cd8a58..cffa599714 100644
--- a/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml	
+++ b/Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml	
@@ -60,17 +60,19 @@
                 <soundAmbient>RocketPropelledLoop_Small</soundAmbient>
               </projectile>
               <comps>
-			  <li Class="CombatExtended.CompProperties_ExplosiveCE">
-				<damageAmountBase>50</damageAmountBase>
-				<explosiveDamageType>VWE_Shock</explosiveDamageType>
-				<explosiveRadius>4.5</explosiveRadius>
-				<explosionSound>MortarBomb_Explode</explosionSound>
-                <fragments>
-                  <Fragment_Large>5</Fragment_Large>
-                  <Fragment_Small>50</Fragment_Small>
-                </fragments>
-                <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>				
-			  </li>			  
+                <li Class="CombatExtended.CompProperties_ExplosiveCE">
+                  <damageAmountBase>50</damageAmountBase>
+                  <explosiveDamageType>VWE_Shock</explosiveDamageType>
+                  <explosiveRadius>4.5</explosiveRadius>
+                  <explosionSound>MortarBomb_Explode</explosionSound>
+                  <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                </li>
+                <li Class="CombatExtended.CompProperties_Fragments">
+                  <fragments>
+                    <Fragment_Large>5</Fragment_Large>
+                    <Fragment_Small>50</Fragment_Small>
+                  </fragments>
+                </li>
               </comps>
             </ThingDef>
           </value>
diff --git a/Patches/Vanilla Weapons Expanded/Ammo/CompoundArrow.txt b/Patches/Vanilla Weapons Expanded/Ammo/CompoundArrow.txt
deleted file mode 100644
index e8d06fd9b5..0000000000
--- a/Patches/Vanilla Weapons Expanded/Ammo/CompoundArrow.txt	
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Vanilla Weapons Expanded</li>
-		</mods>>
-
-		<match Class="PatchOperationSequence">
-			<operations>
-			</operations>
-		</match>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml b/Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml
deleted file mode 100644
index 0d6821e170..0000000000
--- a/Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml	
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-
-  <Operation Class="PatchOperationFindMod">
-    <mods>
-      <li>Vanilla Weapons Expanded</li>
-    </mods>
-
-    <match Class="PatchOperationSequence">
-      <operations>
-
-        <!-- === Ammo Category / Thing Category / Ammo Def === -->
-        <li Class="PatchOperationAdd">
-          <xpath>Defs</xpath>
-
-          <value>
-            <CombatExtended.AmmoCategoryDef>
-              <defName>LeadBall</defName>
-              <label>lead ball</label>
-              <description>A loose fitting metal ball. Fairly innacurate due to poor aerodynamics, but inflicts large wounds due to the hitting power and large diameter of the projectile.</description>
-            </CombatExtended.AmmoCategoryDef>
-
-            <ThingCategoryDef>
-              <defName>AmmoVWELeadBall</defName>
-              <label>lead ball</label>
-              <parent>AmmoNeolithic</parent>
-              <iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
-            </ThingCategoryDef>
-
-            <CombatExtended.AmmoSetDef>
-              <defName>AmmoSet_VWE_LeadBall</defName>
-              <label>lead ball</label>
-              <ammoTypes>
-                <Ammo_VWE_LeadBall>Bullet_VWE_LeadBall</Ammo_VWE_LeadBall>
-              </ammoTypes>
-            </CombatExtended.AmmoSetDef>
-          </value>
-        </li>
-
-        <!-- === Ammo === -->
-        <li Class="PatchOperationAdd">
-          <xpath>Defs</xpath>
-
-          <value>
-            <ThingDef Class="CombatExtended.AmmoDef" ParentName="NeolithicAmmoBase">
-              <defName>Ammo_VWE_LeadBall</defName>
-              <label>lead ball</label>
-              <description>Projectile traditionally fired from smooth-bore muskets and flintlock pistols.</description>
-              <ammoClass>LeadBall</ammoClass>
-              <graphicData>
-                <texPath>Things/Ammo/Neolithic/SlingBullet/Steel</texPath>
-                <graphicClass>Graphic_StackCount</graphicClass>
-              </graphicData>
-              <statBases>
-                <Mass>0.03</Mass>
-                <Bulk>0.06</Bulk>
-              </statBases>
-              <thingCategories>
-                <li>AmmoVWELeadBall</li>
-              </thingCategories>
-              <stackLimit>1000</stackLimit>
-              <tradeTags>
-                <li>CE_AutoEnableTrade</li>
-                <li>CE_AutoEnableCrafting_FueledSmithy</li>
-                <li>CE_AutoEnableCrafting_ElectricSmithy</li>
-                <li>CE_AutoEnableCrafting_CraftingSpot</li>
-              </tradeTags>
-            </ThingDef>
-          </value>
-        </li>
-
-        <!-- === Projectile === -->
-        <li Class="PatchOperationAdd">
-          <xpath>Defs</xpath>
-
-          <value>
-            <ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
-              <defName>Bullet_VWE_LeadBall</defName>
-              <label>lead ball</label>
-              <graphicData>
-                <texPath>Things/Projectile/Bullet_Musket</texPath>
-                <graphicClass>Graphic_Single</graphicClass>
-              </graphicData>
-              <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                <damageDef>Bullet</damageDef>
-                <speed>72</speed>
-                <damageAmountBase>20</damageAmountBase>
-                <armorPenetrationSharp>7.2</armorPenetrationSharp>
-                <armorPenetrationBlunt>37.8</armorPenetrationBlunt>
-                <flyOverhead>false</flyOverhead>
-              </projectile>
-            </ThingDef>
-          </value>
-        </li>
-
-        <!-- === Recipe === -->
-        <li Class="PatchOperationAdd">
-          <xpath>Defs</xpath>
-
-          <value>
-            <RecipeDef ParentName="AmmoRecipeBase">
-              <defName>MakeAmmo_VWE_LeadBall</defName>
-              <label>make lead balls x100</label>
-              <description>Craft 100 lead balls.</description>
-              <jobString>Making lead balls.</jobString>
-              <ingredients>
-                <li>
-                  <filter>
-                    <thingDefs>
-                      <li>Steel</li>
-                    </thingDefs>
-                  </filter>
-                  <count>20</count>
-                </li>
-              </ingredients>
-              <fixedIngredientFilter>
-                <thingDefs>
-                  <li>Steel</li>
-                </thingDefs>
-              </fixedIngredientFilter>
-              <products>
-                <Ammo_VWE_LeadBall>500</Ammo_VWE_LeadBall>
-              </products>
-              <workAmount>2000</workAmount>
-              <recipeUsers>
-                <li>FueledSmithy</li>
-                <li>ElectricSmithy</li>
-              </recipeUsers>
-            </RecipeDef>
-          </value>
-        </li>
-
-      </operations>
-    </match>
-  </Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml b/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml
index dc34016137..4cc443622c 100644
--- a/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml	
+++ b/Patches/Vanilla Weapons Expanded/Ammo/Whip.xml	
@@ -8,70 +8,21 @@
 
     <match Class="PatchOperationSequence">
       <operations>
-
-        <!-- === Ammo Set === -->
-        <li Class="PatchOperationAdd">
-          <xpath>Defs</xpath>
-
-          <value>
-            <CombatExtended.AmmoSetDef>
-              <defName>AmmoSet_VWE_Whip</defName>
-              <label>whip</label>
-              <ammoTypes>
-                <Ammo_VWE_Whip>Projectile_VWE_Whip</Ammo_VWE_Whip>
-              </ammoTypes>
-            </CombatExtended.AmmoSetDef>
-          </value>
-        </li>
-
-        <!-- === Ammo === -->
-        <li Class="PatchOperationAdd">
-          <xpath>Defs</xpath>
-
-          <value>
-            <ThingDef Class="CombatExtended.AmmoDef" Name="VWEWhipBase" ParentName="SmallAmmoBase" Abstract="True">
-              <description>.</description>
-
-              <statBases>
-                <Mass>0.01</Mass>
-                <Bulk>0.02</Bulk>
-              </statBases>
-            </ThingDef>
-
-            <ThingDef Class="CombatExtended.AmmoDef" ParentName="VWEWhipBase">
-              <defName>Ammo_VWE_Whip</defName>
-              <label>whip slash</label>
-
-              <graphicData>
-                <texPath>Things/Ammo/Neolithic/SlingBullet/Steel</texPath>
-                <graphicClass>Graphic_StackCount</graphicClass>
-              </graphicData>
-            </ThingDef>
-          </value>
-        </li>
-
         <!-- === Projectile === -->
         <li Class="PatchOperationAdd">
           <xpath>Defs</xpath>
 
           <value>
-            <ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet" Name="VWEWhipProj" Abstract="true">
+            <ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
+              <defName>Bullet_VWE_Whip</defName>
+              <thingClass>CombatExtended.BulletCE</thingClass>
+              <label>whip slash</label>
               <graphicData>
                 <texPath>Things/Projectile/WhipSlash</texPath>
                 <graphicClass>Graphic_Single</graphicClass>
               </graphicData>
-
               <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                <damageDef>RangedStab</damageDef>
                 <speed>80</speed>
-              </projectile>
-            </ThingDef>
-
-            <ThingDef Class="CombatExtended.AmmoDef" ParentName="VWEWhipProj">
-              <defName>Projectile_VWE_Whip</defName>
-              <label>whip slash</label>
-
-              <projectile Class="CombatExtended.ProjectilePropertiesCE">
                 <damageDef>RangedStab</damageDef>
                 <damageAmountBase>14</damageAmountBase>
               </projectile>
diff --git a/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml b/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml
index d06000dc06..83b7cac4b4 100644
--- a/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml	
+++ b/Patches/Vanilla Weapons Expanded/Industrial_Grenades.xml	
@@ -10,7 +10,7 @@
         <modName>Vanilla Weapons Expanded</modName>
       </li>
 
-      <!-- === Remove Flashbang / Smoke as they"re redundant === -->
+      <!-- === Remove Flashbang / Smoke as they're redundant === -->
       <li Class="PatchOperationRemove">
         <xpath>
           /Defs/ThingDef[
diff --git a/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml b/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml
index 205f395263..f212714b5c 100644
--- a/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml	
+++ b/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml	
@@ -239,6 +239,54 @@
 					</weaponTags>
 				</li>
 
+				<!-- ========== Sawed-Off Shotgun ========== -->
+
+				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+					<defName>VWE_SawedOffShotgun</defName>
+
+					<statBases>
+					<Mass>1.85</Mass>
+					<RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+					<ShotSpread>0.17</ShotSpread>
+					<SwayFactor>2.20</SwayFactor>
+					<Bulk>4.75</Bulk>
+					<SightsEfficiency>0.7</SightsEfficiency>
+					<WorkToMake>9500</WorkToMake>
+					</statBases>
+
+					<costList>
+					<Steel>30</Steel>
+					<ComponentIndustrial>3</ComponentIndustrial>
+					</costList>
+
+					<Properties>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_12Gauge_Buck</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<range>14</range>
+					<soundCast>Shot_Shotgun</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					</Properties>
+
+					<AmmoUser>
+					<magazineSize>2</magazineSize>
+					<reloadOneAtATime>true</reloadOneAtATime>
+					<reloadTime>1.7</reloadTime>
+					<ammoSet>AmmoSet_12Gauge</ammoSet>
+					</AmmoUser>
+
+					<FireModes>
+					<aiAimMode>Snapshot</aiAimMode>
+					</FireModes>
+					
+					<weaponTags>
+					<li>Gun</li>
+					</weaponTags>
+					<researchPrerequisite>Gunsmithing</researchPrerequisite>
+				</li>
+
 				<!-- === Hand Cannon === -->
 				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 					<defName>VWE_Gun_HandCannon</defName>
diff --git a/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml b/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml
index dd2dd34ec5..5ddeb19aed 100644
--- a/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml	
+++ b/Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml	
@@ -175,7 +175,7 @@
           <Properties>
             <verbClass>CombatExtended.Verb_ShootCE</verbClass>
             <hasStandardCommand>True</hasStandardCommand>
-            <defaultProjectile>Bullet_VWE_LeadBall</defaultProjectile>
+            <defaultProjectile>Bullet_SlowMusketBall</defaultProjectile>
             <warmupTime>1.66</warmupTime>
             <range>12</range>
             <soundCast>VWE_Shot_Musket</soundCast>
@@ -186,7 +186,7 @@
           <AmmoUser>
             <magazineSize>1</magazineSize>
             <reloadTime>6.5</reloadTime>
-            <ammoSet>AmmoSet_VWE_LeadBall</ammoSet>
+            <ammoSet>AmmoSet_SlowMusketBall</ammoSet>
           </AmmoUser>
 
           <FireModes>
@@ -201,7 +201,7 @@
 
         <!-- === Musket === -->
         <!-- 
-          - VWE uses a custom verb with to trigger smoke effects after the gun fires, this causes trouble with CE and just overriding it doesn"t work.
+          - VWE uses a custom verb with to trigger smoke effects after the gun fires, this causes trouble with CE and just overriding it doesn't work.
           - Has to be replaced in vanilla too 
         -->
         <li Class="PatchOperationReplace">
@@ -234,7 +234,7 @@
           <Properties>
             <verbClass>CombatExtended.Verb_ShootCE</verbClass>
             <hasStandardCommand>True</hasStandardCommand>
-            <defaultProjectile>Bullet_VWE_LeadBall</defaultProjectile>
+            <defaultProjectile>Bullet_FastMusketBall</defaultProjectile>
             <warmupTime>2.5</warmupTime>
             <range>45</range>
             <soundCast>VWE_Shot_Musket</soundCast>
@@ -245,7 +245,7 @@
           <AmmoUser>
             <magazineSize>1</magazineSize>
             <reloadTime>10</reloadTime>
-            <ammoSet>AmmoSet_VWE_LeadBall</ammoSet>
+            <ammoSet>AmmoSet_FastMusketBall</ammoSet>
           </AmmoUser>
 
           <FireModes>
@@ -277,18 +277,43 @@
         </li>
 
         <!-- Weapon -->
+        <li Class="PatchOperationAttributeSet">
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
+          <attribute>ParentName</attribute>
+          <value>BaseWeapon</value>
+        </li>
+
+        <li Class="PatchOperationRemove">
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]/recipeMaker</xpath>
+        </li>
+
+        <li Class="PatchOperationRemove">
+          <xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/costStuffCount</xpath>
+        </li>
+
+        <li Class="PatchOperationRemove">
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]/stuffCategories</xpath>
+        </li>
+
         <li Class="PatchOperationAdd">
-          <xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]/graphicData</xpath>
+          <value>
+            <color>(105,105,105)</color>
+          </value>
+        </li>
+
+        <li Class="PatchOperationAdd">
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
 
           <value>
             <thingClass>CombatExtended.AmmoThing</thingClass>
-            <stackLimit>50</stackLimit>
+            <stackLimit>75</stackLimit>
             <resourceReadoutPriority>First</resourceReadoutPriority>
           </value>
         </li>
 
         <li Class="PatchOperationAttributeSet">
-          <xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
 
           <attribute>Class</attribute>
           <value>CombatExtended.AmmoDef</value>
@@ -298,10 +323,9 @@
           <defName>VWE_Throwing_Knives</defName>
 
           <statBases>
-            <WorkToMake>4600</WorkToMake>
-            <SightsEfficiency>0.7</SightsEfficiency>
-            <Bulk>1</Bulk>
-            <Mass>1</Mass>
+            <SightsEfficiency>1</SightsEfficiency>
+            <Bulk>0.35</Bulk>
+            <Mass>0.15</Mass>
             <RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
           </statBases>
 
@@ -311,8 +335,9 @@
             <hasStandardCommand>True</hasStandardCommand>
             <defaultProjectile>VWE_FlyingBlade</defaultProjectile>
             <warmupTime>1</warmupTime>
-            <range>15</range>
+            <range>10</range>
             <soundCast>ThrowGrenade</soundCast>
+             <ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
           </Properties>
         </li>
 
@@ -390,7 +415,7 @@
           <Properties>
             <verbClass>CombatExtended.Verb_ShootCE</verbClass>
             <hasStandardCommand>True</hasStandardCommand>
-            <defaultProjectile>Projectile_VWE_Whip</defaultProjectile>
+            <defaultProjectile>Bullet_VWE_Whip</defaultProjectile>
             <warmupTime>1</warmupTime>
             <range>15</range>
             <soundCast>VWE_Shot_Whip</soundCast>
diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Melee.txt b/Patches/Vanilla Weapons Expanded/Neolithic_Melee.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml b/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml
new file mode 100644
index 0000000000..10449acae2
--- /dev/null
+++ b/Patches/Vanilla Weapons Expanded/Neolithic_Melee.xml	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Vanilla Weapons Expanded</li>
+    </mods>
+
+    <match Class="PatchOperationSequence">
+      <operations>
+
+	<!-- ========== Axe ========== -->
+
+      <li Class="PatchOperationReplace">
+        <xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/tools</xpath>
+        <value>
+          <tools>
+            <li Class="CombatExtended.ToolCE">
+              <label>handle</label>
+              <capacities>
+                <li>Poke</li>
+              </capacities>
+              <power>3</power>
+              <cooldownTime>1.59</cooldownTime>
+              <chanceFactor>0.10</chanceFactor>
+              <armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+              <linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+            </li>
+            <li Class="CombatExtended.ToolCE">
+              <label>edge</label>
+              <capacities>
+                <li>Cut</li>
+              </capacities>
+              <power>17</power>
+              <cooldownTime>3.52</cooldownTime>
+              <chanceFactor>0.30</chanceFactor>
+              <armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+              <armorPenetrationSharp>0.68</armorPenetrationSharp>
+              <linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+            </li>
+          </tools>
+        </value>
+      </li>
+
+      <li Class="PatchOperationAdd">
+        <xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/statBases</xpath>
+        <value>
+              <Bulk>4</Bulk>
+              <MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+        </value>
+      </li>
+
+      <li Class="PatchOperationAdd">
+        <xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/equippedStatOffsets</xpath>
+        <value>
+            <MeleeCritChance>0.10</MeleeCritChance>
+            <MeleeParryChance>0.15</MeleeParryChance>
+            <MeleeDodgeChance>0.20</MeleeDodgeChance>	
+        </value>	
+      </li>
+
+      <li Class="PatchOperationAdd">
+        <xpath>Defs/ThingDef[defName="VWE_MeleeWeapon_Axe"]/weaponTags</xpath>
+        <value>
+          <li>CE_OneHandedWeapon</li>
+        </value>
+      </li>
+
+      </operations>
+    </match>
+  </Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.txt b/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml b/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml
new file mode 100644
index 0000000000..79c2d92826
--- /dev/null
+++ b/Patches/Vanilla Weapons Expanded/Neolithic_Ranged.xml	
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Vanilla Weapons Expanded</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+
+        <!-- === Long Bow === -->
+        <!-- Weapon -->
+        <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+            <defName>VWE_Bow_Long</defName>
+            <statBases>
+            <SightsEfficiency>0.7</SightsEfficiency>
+            <ShotSpread>1</ShotSpread>
+            <SwayFactor>2</SwayFactor>
+            <Bulk>5.50</Bulk>
+            <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+            </statBases>
+            <costList>
+            <WoodLog>65</WoodLog>
+            </costList>
+            <Properties>
+            <verbClass>CombatExtended.Verb_ShootCE</verbClass>
+            <hasStandardCommand>true</hasStandardCommand>
+            <defaultProjectile>Projectile_GreatArrow_Stone</defaultProjectile>
+            <warmupTime>1.5</warmupTime>
+            <range>37</range>
+            <soundCast>Bow_Large</soundCast>
+            </Properties>
+            <AmmoUser>
+            <ammoSet>AmmoSet_GreatArrow</ammoSet>
+            </AmmoUser>
+            <FireModes />
+            <weaponTags>
+            <li>NeolithicRangedBasic</li>
+            <li>NeolithicRangedHeavy</li>            
+            <li>CE_Bow</li>
+            </weaponTags>
+            <researchPrerequisite>VWE_Longbow</researchPrerequisite>
+            <AllowWithRunAndGun>false</AllowWithRunAndGun>
+        </li>
+
+        <li Class="PatchOperationReplace">
+            <xpath>Defs/ThingDef[defName="VWE_Bow_Long"]/tools</xpath>
+            <value>
+            <tools>
+                <li Class="CombatExtended.ToolCE">
+                    <capacities>
+                        <li>Blunt</li>
+                    </capacities>
+                    <power>7</power>
+                    <cooldownTime>1.6</cooldownTime>
+                <armorPenetrationBlunt>0.65</armorPenetrationBlunt>
+                </li>
+            </tools>
+            </value>
+        </li>
+
+        <!-- === Throwing Rock === -->
+        <!-- Projectile -->
+
+        <li Class="PatchOperationReplace">
+          <xpath>/Defs/ThingDef[defName="VWE_Rock"]/projectile</xpath>
+
+          <value>
+            <projectile Class="CombatExtended.ProjectilePropertiesCE">
+              <damageDef>Blunt</damageDef>
+              <damageAmountBase>15</damageAmountBase>
+              <armorPenetrationBlunt>3.12</armorPenetrationBlunt>
+              <dropsCasings>false</dropsCasings>
+              <flyOverhead>false</flyOverhead>
+            </projectile>
+          </value>
+        </li>
+
+        <!-- Weapon -->
+
+        <li Class="PatchOperationAttributeSet">
+          <xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
+          <attribute>ParentName</attribute>
+          <value>BaseWeapon</value>
+        </li>
+
+        <li Class="PatchOperationRemove">
+          <xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/recipeMaker</xpath>
+        </li>
+
+        <li Class="PatchOperationRemove">
+          <xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/destroyOnDrop</xpath>
+        </li>
+
+        <li Class="PatchOperationRemove">
+          <xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/costStuffCount</xpath>
+        </li>
+
+        <li Class="PatchOperationRemove">
+          <xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/stuffCategories</xpath>
+        </li>
+
+        <li Class="PatchOperationAdd">
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
+
+          <value>
+            <thingClass>CombatExtended.AmmoThing</thingClass>
+            <stackLimit>75</stackLimit>
+            <resourceReadoutPriority>First</resourceReadoutPriority>
+          </value>
+        </li>
+
+        <li Class="PatchOperationAdd">
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Rocks"]/graphicData</xpath>
+          <value>
+            <color>(158,153,135)</color>
+          </value>
+        </li>
+
+        <li Class="PatchOperationAttributeSet">
+          <xpath>/Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
+
+          <attribute>Class</attribute>
+          <value>CombatExtended.AmmoDef</value>
+        </li>
+
+        <li Class="PatchOperationSequence">
+          <success>Always</success>
+
+          <operations>
+            <li Class="PatchOperationTest">
+              <xpath>/Defs/ThingDef[defName="VWE_Throwing_Rocks"]/comps</xpath>
+              <success>Invert</success>
+            </li>
+
+            <li Class="PatchOperationAdd">
+              <xpath>/Defs/ThingDef[defName="VWE_Throwing_Rocks"]</xpath>
+              <value>
+                <comps />
+              </value>
+            </li>
+          </operations>
+        </li>
+
+        <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+          <defName>VWE_Throwing_Rocks</defName>
+
+          <statBases>
+            <Mass>0.5</Mass>
+            <Bulk>0.25</Bulk>
+            <MarketValue>0.09</MarketValue>
+            <SightsEfficiency>1</SightsEfficiency>
+            <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+          </statBases>
+
+          <Properties>
+            <label>throw rock</label>
+            <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+            <hasStandardCommand>true</hasStandardCommand>
+            <defaultProjectile>VWE_Rock</defaultProjectile>
+            <range>10</range>
+            <warmupTime>1.8</warmupTime>
+            <soundCast>ThrowGrenade</soundCast>
+            <noiseRadius>4</noiseRadius>
+            <ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
+          </Properties>
+
+          <weaponTags>
+            <li>CE_OneHandedWeapon</li>
+          </weaponTags>
+        </li>
+
+        <li Class="PatchOperationReplace">
+            <xpath>Defs/ThingDef[defName="VWE_Throwing_Rocks"]/tools</xpath>
+            <value>
+            <tools>
+                <li Class="CombatExtended.ToolCE">
+                    <capacities>
+                        <li>Blunt</li>
+                    </capacities>
+                    <power>2</power>
+                    <cooldownTime>1.5</cooldownTime>
+                <armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+                </li>
+            </tools>
+            </value>
+        </li>
+
+        <li Class="PatchOperationAdd">
+            <xpath>Defs</xpath>
+            <value>
+
+            <RecipeDef ParentName="AmmoRecipeNeolithicBase">
+              <defName>MakeThrowingRocks</defName>
+              <label>make throwing rocks x10</label>
+              <description>Craft 10 throwing rocks.</description>
+              <jobString>Making throwing rocks.</jobString>
+              <workAmount>1200</workAmount>
+              <ingredients>
+                <li>
+                  <filter>
+                  <stuffCategoriesToAllow>
+                    <li>Stony</li>
+                  </stuffCategoriesToAllow>
+                  </filter>
+                  <count>1</count>
+                </li>
+              </ingredients>
+              <fixedIngredientFilter>
+                <stuffCategoriesToAllow>
+                    <li>Stony</li>
+                </stuffCategoriesToAllow>
+              </fixedIngredientFilter>
+              <recipeUsers>
+                <li>CraftingSpot</li>
+              </recipeUsers>            
+              <products>
+                <VWE_Throwing_Rocks>10</VWE_Throwing_Rocks>
+              </products>
+            </RecipeDef>
+
+            </value>
+        </li>
+
+      </operations>
+    </match>
+  </Operation>
+
+</Patch>
\ No newline at end of file