diff --git a/LoadFolders.xml b/LoadFolders.xml
index ff792a1133..22af59cba2 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -244,7 +244,7 @@
 		<li IfModActive="Mlie.JinRohKerberosPanzerCopArmor">ModPatches/Jin-Roh Kerberos Panzer Cop Armor</li>
 		<li IfModActive="K4G.Core">ModPatches/K4G Empires of Old - Core</li>
 		<li IfModActive="K4G.Guild">ModPatches/K4G Empires of Old - Engineers Institute</li>
-		<li IfModActive="K4G.K4G.Fellowship">ModPatches/K4G Empires of Old - The Alekeepers</li>
+		<li IfModActive="K4G.Fellowship">ModPatches/K4G Empires of Old - The Alekeepers</li>		
 		<li IfModActive="K4G.Sultanate">ModPatches/K4G Empires of Old - The Faceless Sultainate</li>
 		<li IfModActive="K4G.Legion">ModPatches/K4G Empires of Old - The Polluted Legion</li>
 		<li IfModActive="K4G.Dynasty">ModPatches/K4G Empires of Old - The Rising Sun</li>
diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml
index 07b0e9f5a7..3628f6c0c9 100644
--- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml	
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml	
@@ -4,8 +4,8 @@
 	<!-- Thawb, Kimono -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[
-		@Name="K4GThawb" or
-		@Name="K4GKimono"
+			@Name="K4GThawb" or
+			@Name="K4GKimono"
 		]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
 			<Bulk>1.5</Bulk>
@@ -14,14 +14,31 @@
 		</value>
 	</Operation>
 
+	<!-- Tattered Rags -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_TatteredRags"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>0.5</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
 	<!-- Headgear -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[
-		@Name="K4GTurban" or
-		@Name="K4GHeadScarf" or
-		defName="K4G_Apparel_TricornHat" or
-		defName="K4G_Apparel_ConeHat" or
-		defName="K4G_Apparel_HoodedMask"
+			@Name="K4GTurban" or
+			@Name="K4GHeadScarf" or
+			@Name="K4GUshanka" or
+			defName="K4G_Apparel_TricornHat" or
+			defName="K4G_Apparel_ConeHat" or
+			defName="K4G_Apparel_HoodedMask" or
+			defName="K4G_Apparel_Fedora" or
+			defName="K4G_Apparel_Flatcap" or
+			defName="K4G_Apparel_WinterHood" or
+			defName="K4G_Apparel_Balaclava" or
+			defName="K4G_Apparel_PatrolCap" or
+			defName="K4G_Apparel_BaseballCap" or
+			defName="K4G_Apparel_SheriffHat"
 		]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
 			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
@@ -50,9 +67,9 @@
 	<!-- Goggled & Advanced Outlander Helmet -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[
-		defName="K4G_Apparel_AdvancedOutlanderHelmet" or
-		defName="K4G_Apparel_GoggledHelmet" or
-		defName="K4G_Apparel_LegionaryHelmet"
+			@Name="LegionaryHelmet" or
+			defName="K4G_Apparel_AdvancedOutlanderHelmet" or
+			defName="K4G_Apparel_GoggledHelmet"
 		]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
 			<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
@@ -63,15 +80,61 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[
-		defName="K4G_Apparel_AdvancedOutlanderHelmet" or
-		defName="K4G_Apparel_GoggledHelmet" or
-		defName="K4G_Apparel_LegionaryHelmet"					
+			@Name="LegionaryHelmet"	or
+			defName="K4G_Apparel_AdvancedOutlanderHelmet" or
+			defName="K4G_Apparel_GoggledHelmet"
 		]/stuffCategories/li[.="Metallic"]</xpath>
 		<value>
 			<li>Steeled</li>
 		</value>
 	</Operation>
 
+	<!-- Riot Helmet -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_RiotHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>5</Bulk>
+			<WornBulk>2.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_RiotHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.50</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.50</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+							<li>Jaw</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Workman/Mining Helmet == -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WorkmanHelmet" or defName="K4G_Apparel_MiningHelmet"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>1.2</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
 	<!-- Flak Mask -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Sharp </xpath>
@@ -104,10 +167,25 @@
 		</value>
 	</Operation>
 
-	<!-- Advanced Flak Vest -->
+	<!-- Service Parka -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_ServiceParka"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>4</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_ServiceParka"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>5</WornBulk>
+		</value>
+	</Operation>
 
+	<!-- Advanced Flak Vest -->
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp </xpath>
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
 			<ArmorRating_Sharp>6</ArmorRating_Sharp>
 			<Bulk>5</Bulk>
@@ -116,7 +194,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt </xpath>
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
 			<ArmorRating_Blunt>8</ArmorRating_Blunt>
 		</value>
@@ -154,9 +232,8 @@
 	</Operation>
 
 	<!-- Goggles -->
-
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="K4G_Apparel_Goggles"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_Goggles" or defName="K4G_Apparel_SnowGoggles"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
 			<StuffEffectMultiplierArmor>0.5</StuffEffectMultiplierArmor>
 			<Bulk>0.5</Bulk>
@@ -174,4 +251,51 @@
 		</value>
 	</Operation>
 
+	<!-- Military Medal, Eyepatch -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_MilitaryMedal" or @Name="Eyepatch"]/statBases</xpath>
+		<value>
+			<Bulk>0.15</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Scarf -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_Scarf"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Welding Mask -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_WeldingMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>1</WornBulk>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Beer Helmet -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_BeerHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<Bulk>4</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml
index afee66c76e..073ecb02c3 100644
--- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml	
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml	
@@ -9,7 +9,6 @@
 		<operations>
 
 		<!-- Dynasty Crown -->
-
 		<li Class="PatchOperationReplace">
 			<xpath>Defs/ThingDef[defName="K4G_Apparel_DynastyCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
 			<value>
@@ -17,6 +16,68 @@
 			</value>
 		</li>				
 
+		<!-- Headgear -->
+		<li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="K4G_Apparel_GarrisonCap" or defName="K4G_Apparel_PeakedCap"]/statBases/StuffEffectMultiplierArmor</xpath>
+			<value>
+				<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+				<Bulk>1</Bulk>
+				<WornBulk>0</WornBulk>
+			</value>
+		</li>
+
+		<!-- Prestige Advanced Flak Vest -->
+		<li Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="K4G_Apparel_PrestigeAdvancedFlakVest"]/statBases</xpath>
+			<value>
+				<Bulk>5</Bulk>
+				<WornBulk>3.5</WornBulk>						
+			</value>
+		</li>
+
+		<li Class="PatchOperationAddModExtension">
+			<xpath>Defs/ThingDef[defName="K4G_Apparel_PrestigeAdvancedFlakVest"]</xpath>
+			<value>
+				<li Class="CombatExtended.PartialArmorExt">
+					<stats>
+						<li>
+							<ArmorRating_Sharp>0.60</ArmorRating_Sharp>
+							<parts>
+								<li>Neck</li>
+								<li>Shoulder</li>
+							</parts>
+						</li>
+						<li>
+							<ArmorRating_Blunt>0.60</ArmorRating_Blunt>
+							<parts>
+								<li>Neck</li>
+								<li>Shoulder</li>
+							</parts>
+						</li>
+					</stats>
+				</li>
+			</value>
+		</li>
+
+		<!-- Military Uniform -->
+		<li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="K4G_Apparel_MilitaryUniform"]/statBases/StuffEffectMultiplierArmor</xpath>
+			<value>
+				<Bulk>5</Bulk>
+				<WornBulk>1</WornBulk>
+				<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			</value>
+		</li>
+
+		<!-- Monocle -->
+		<li Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="K4G_Apparel_Monocle"]/statBases</xpath>
+			<value>
+				<Bulk>0.15</Bulk>
+				<WornBulk>0</WornBulk>
+			</value>
+		</li>
+
 		</operations>
 	</match>
 </Operation>
diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml
deleted file mode 100644
index f366528813..0000000000
--- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml	
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- === Sabre === -->
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/statBases</xpath>
-	<value>
-		<Bulk>3.5</Bulk>
-		<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]</xpath>
-	<value>
-		<equippedStatOffsets>
-			<MeleeCritChance>0.2</MeleeCritChance>
-			<MeleeParryChance>0.35</MeleeParryChance>
-			<MeleeDodgeChance>0.2</MeleeDodgeChance>
-		</equippedStatOffsets>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/weaponTags</xpath>
-	<value>
-		<li>CE_OneHandedWeapon</li>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationReplace">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/tools</xpath>
-	<value>
-		<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>handle</label>
-				<capacities>
-					<li>Poke</li>
-				</capacities>
-				<power>2</power>
-				<cooldownTime>1.44</cooldownTime>
-				<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>point</label>
-				<capacities>
-					<li>Stab</li>
-				</capacities>
-				<power>27</power>
-				<cooldownTime>1.44</cooldownTime>
-				<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.48</armorPenetrationSharp>
-				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>edge</label>
-				<capacities>
-					<li>Cut</li>
-				</capacities>
-				<power>20</power>
-				<cooldownTime>1.34</cooldownTime>
-				<chanceFactor>1.33</chanceFactor>
-				<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.43</armorPenetrationSharp>
-				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-			</li>
-		</tools>
-	</value>
-</Operation>
-
-<!-- === Katanna === -->
-
-<Operation Class="PatchOperationReplace">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/tools</xpath>
-	<value>
-		<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>handle</label>
-				<capacities>
-					<li>Poke</li>
-				</capacities>
-				<power>2</power>
-				<cooldownTime>1.42</cooldownTime>
-				<chanceFactor>0.15</chanceFactor>
-				<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>point</label>
-				<capacities>
-					<li>Stab</li>
-				</capacities>
-				<power>13</power>
-				<cooldownTime>1.42</cooldownTime>
-				<chanceFactor>1</chanceFactor>
-				<armorPenetrationSharp>1.34</armorPenetrationSharp>
-				<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>edge</label>
-				<capacities>
-					<li>Cut</li>
-				</capacities>
-				<power>28</power>
-				<cooldownTime>0.88</cooldownTime>
-				<chanceFactor>1</chanceFactor>
-				<armorPenetrationSharp>1.3</armorPenetrationSharp>
-				<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-			</li>
-		</tools>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/statBases</xpath>
-	<value>
-		<Bulk>8</Bulk>
-		<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]</xpath>
-	<value>
-		<equippedStatOffsets>
-			<MeleeCritChance>0.95</MeleeCritChance>
-			<MeleeParryChance>0.54</MeleeParryChance>
-			<MeleeDodgeChance>0.33</MeleeDodgeChance>
-		</equippedStatOffsets>
-	</value>
-</Operation>
-
-<!-- === Cleaver === -->
-
-<Operation Class="PatchOperationReplace">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/tools</xpath>
-	<value>
-		<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>handle</label>
-				<capacities>
-					<li>Poke</li>
-				</capacities>
-				<power>4</power>
-				<cooldownTime>1.83</cooldownTime>
-				<chanceFactor>0.15</chanceFactor>
-				<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>point</label>
-				<capacities>
-					<li>Stab</li>
-				</capacities>
-				<power>30</power>
-				<cooldownTime>1.89</cooldownTime>
-				<chanceFactor>1</chanceFactor>
-				<armorPenetrationSharp>0.84</armorPenetrationSharp>
-				<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>edge</label>
-				<capacities>
-					<li>Cut</li>
-				</capacities>
-				<power>44</power>
-				<cooldownTime>1.75</cooldownTime>
-				<chanceFactor>1</chanceFactor>
-				<armorPenetrationSharp>0.3</armorPenetrationSharp>
-				<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-			</li>
-		</tools>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/statBases</xpath>
-	<value>
-		<Bulk>11</Bulk>
-		<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]</xpath>
-	<value>
-		<equippedStatOffsets>
-			<MeleeCritChance>0.50</MeleeCritChance>
-			<MeleeParryChance>0.4</MeleeParryChance>
-			<MeleeDodgeChance>0.27</MeleeDodgeChance>
-		</equippedStatOffsets>
-	</value>
-</Operation>
-
-<!-- === Scimitar === -->
-
-<Operation Class="PatchOperationReplace">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/tools</xpath>
-	<value>
-		<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>handle</label>
-				<capacities>
-					<li>Poke</li>
-				</capacities>
-				<power>2</power>
-				<cooldownTime>1.54</cooldownTime>
-				<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-				<chanceFactor>0.15</chanceFactor>
-				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>point</label>
-				<capacities>
-					<li>Stab</li>
-				</capacities>
-				<power>23</power>
-				<cooldownTime>1.54</cooldownTime>
-				<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.31</armorPenetrationSharp>
-				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>edge</label>
-				<capacities>
-					<li>Cut</li>
-				</capacities>
-				<power>28</power>
-				<cooldownTime>1.25</cooldownTime>
-				<armorPenetrationBlunt>1.782</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.8</armorPenetrationSharp>
-				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-			</li>
-		</tools>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/statBases</xpath>
-	<value>
-		<Bulk>4</Bulk>
-		<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]</xpath>
-	<value>
-		<equippedStatOffsets>
-			<MeleeCritChance>0.24</MeleeCritChance>
-			<MeleeParryChance>0.38</MeleeParryChance>
-			<MeleeDodgeChance>0.28</MeleeDodgeChance>
-		</equippedStatOffsets>
-	</value>
-</Operation>
-
-<!-- === Glaive === -->
-
-<Operation Class="PatchOperationReplace">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/tools</xpath>
-	<value>
-		<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>shaft</label>
-				<capacities>
-					<li>Blunt</li>
-				</capacities>
-				<power>6</power>
-				<cooldownTime>1.16</cooldownTime>
-				<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>edge</label>
-				<capacities>
-					<li>Cut</li>
-				</capacities>
-				<power>47</power>
-				<cooldownTime>1.74</cooldownTime>
-				<chanceFactor>1.165</chanceFactor>
-				<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
-				<armorPenetrationSharp>1.62</armorPenetrationSharp>
-				<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>point</label>
-				<capacities>
-					<li>Stab</li>
-				</capacities>
-				<power>40</power>
-				<cooldownTime>1.16</cooldownTime>
-				<chanceFactor>1.165</chanceFactor>
-				<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-				<armorPenetrationSharp>2.03</armorPenetrationSharp>
-				<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
-			</li>
-		</tools>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/statBases</xpath>
-	<value>
-		<Bulk>10</Bulk>
-		<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]</xpath>
-	<value>
-		<equippedStatOffsets>
-			<MeleeCritChance>0.22</MeleeCritChance>
-			<MeleeParryChance>1.33</MeleeParryChance>
-			<MeleeDodgeChance>0.57</MeleeDodgeChance>
-		</equippedStatOffsets>
-	</value>
-</Operation>
-
-<!-- === Baton === -->
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/statBases</xpath>
-	<value>
-		<Bulk>2.75</Bulk>
-		<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]</xpath>
-	<value>
-		<equippedStatOffsets>
-			<MeleeCritChance>0.17</MeleeCritChance>
-			<MeleeParryChance>0.9</MeleeParryChance>
-			<MeleeDodgeChance>0.3</MeleeDodgeChance>
-		</equippedStatOffsets>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationAdd">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/weaponTags</xpath>
-	<value>
-		<li>CE_Sidearm_Melee</li>
-		<li>CE_OneHandedWeapon</li>
-	</value>
-</Operation>
-
-<Operation Class="PatchOperationReplace">
-	<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/tools</xpath>
-	<value>
-		<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>handle</label>
-				<capacities>
-					<li>Poke</li>
-				</capacities>
-				<power>2</power>
-				<chanceFactor>0.33</chanceFactor>
-				<cooldownTime>1.59</cooldownTime>
-				<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>head</label>
-				<capacities>
-					<li>Blunt</li>
-				</capacities>
-				<power>9</power>
-				<cooldownTime>1.68</cooldownTime>
-				<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
-			</li>
-		</tools>
-	</value>
-</Operation>
-</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml
new file mode 100644
index 0000000000..d64e042a9a
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml	
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Shock Prod -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>zapper</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>5</power>
+					<extraMeleeDamages>
+					<li>
+						<def>Flame</def>
+						<amount>1</amount>
+						<chance>0.2</chance>
+					</li>
+					<li>
+						<def>Stun</def>
+						<amount>1</amount>
+					</li>
+					<li>
+						<def>EMP</def>
+						<amount>1</amount>
+						<chance>0.4</chance>
+					</li>
+					</extraMeleeDamages>
+					<cooldownTime>1.68</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/statBases</xpath>
+		<value>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.9</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Broken Bottle -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_ShatteredBottle"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bottle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationBlunt>0.430</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.8</cooldownTime>
+					<armorPenetrationSharp>0.175</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.255</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_ShatteredBottle"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<!-- Blow Torch -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Blowtorch"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>chemfuel tank</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.59</cooldownTime>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>pipe</label>
+					<labelUsedInLogging>false</labelUsedInLogging>
+					<capacities>
+						<li>Blunt</li>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.02</cooldownTime>
+					<extraMeleeDamages>
+					<li>
+						<def>Flame</def>
+						<amount>1</amount>
+						<chance>1</chance>
+					</li>
+					</extraMeleeDamages>					
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+				</li>				
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Blowtorch"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml
new file mode 100644
index 0000000000..639a578fce
--- /dev/null
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml	
@@ -0,0 +1,805 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Sabre === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>0.35</MeleeParryChance>
+				<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>27</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.425</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.48</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>1.34</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.956</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.43</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Katanna === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.42</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>13</power>
+					<cooldownTime>1.42</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.34</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>0.88</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>1.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.936</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.27</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.95</MeleeCritChance>
+				<MeleeParryChance>0.54</MeleeParryChance>
+				<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Cleaver === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.83</cooldownTime>
+					<chanceFactor>0.15</chanceFactor>
+					<armorPenetrationBlunt>1.1</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>30</power>
+					<cooldownTime>1.89</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>0.84</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.25</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>44</power>
+					<cooldownTime>1.75</cooldownTime>
+					<chanceFactor>1</chanceFactor>
+					<armorPenetrationSharp>0.3</armorPenetrationSharp>
+					<armorPenetrationBlunt>4.05</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/statBases</xpath>
+		<value>
+			<Bulk>11</Bulk>
+			<MeleeCounterParryBonus>0.35</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.50</MeleeCritChance>
+				<MeleeParryChance>0.4</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Scimitar === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<chanceFactor>0.15</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>23</power>
+					<cooldownTime>1.54</cooldownTime>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.31</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>28</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationBlunt>1.782</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.8</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.38</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.24</MeleeCritChance>
+				<MeleeParryChance>0.38</MeleeParryChance>
+				<MeleeDodgeChance>0.28</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Glaive === -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>1.16</cooldownTime>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>1.74</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>8.1</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.62</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>40</power>
+					<cooldownTime>1.16</cooldownTime>
+					<chanceFactor>1.165</chanceFactor>
+					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.03</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<MeleeCounterParryBonus>0.89</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.22</MeleeCritChance>
+				<MeleeParryChance>1.33</MeleeParryChance>
+				<MeleeDodgeChance>0.57</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- === Baton === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/statBases</xpath>
+		<value>
+			<Bulk>2.75</Bulk>
+			<MeleeCounterParryBonus>0.9</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.17</MeleeCritChance>
+				<MeleeParryChance>0.9</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.59</cooldownTime>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>9</power>
+					<cooldownTime>1.68</cooldownTime>
+					<armorPenetrationBlunt>3.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Quarterstaff === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>1.76</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>1.54</MeleeParryChance>
+			<MeleeDodgeChance>0.83</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.21</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>2.24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>1.26</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Noble Cane === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>1.85</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.33</MeleeCritChance>
+			<MeleeParryChance>1.38</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>0.325</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Pickaxe === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/statBases</xpath>
+		<value>
+			<Bulk>8</Bulk>
+			<MeleeCounterParryBonus>0.22</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeParryChance>0.22</MeleeParryChance>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>2.0</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>19</power>
+					<cooldownTime>2.3</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.3</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>8.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.72</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>				
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Shovel === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.56</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.22</MeleeCritChance>
+			<MeleeParryChance>0.20</MeleeParryChance>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<chanceFactor>0.33</chanceFactor>
+					<cooldownTime>1.44</cooldownTime>
+					<armorPenetrationBlunt>0.375</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>1.24</cooldownTime>
+					<armorPenetrationSharp>0.17</armorPenetrationSharp>
+					<armorPenetrationBlunt>0.844</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Branding Iron === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"]/statBases</xpath>
+		<value>
+			<Bulk>3.5</Bulk>
+			<MeleeCounterParryBonus>1.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.33</MeleeCritChance>
+				<MeleeParryChance>1.22</MeleeParryChance>
+				<MeleeDodgeChance>0.3</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>brand</label>
+					<labelUsedInLogging>false</labelUsedInLogging>					
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<extraMeleeDamages>
+					<li>
+						<def>Flame</def>
+						<amount>5</amount>
+					</li>
+					</extraMeleeDamages>					
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<chanceFactor>1.33</chanceFactor>
+					<armorPenetrationBlunt>0.55</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.35</cooldownTime>
+					<armorPenetrationBlunt>0.325</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Pitchfork === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>1</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.44</MeleeCritChance>
+			<MeleeParryChance>1.33</MeleeParryChance>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.8</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>17</power>
+					<cooldownTime>1.3</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.25</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Rock === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Rock"]/statBases</xpath>
+		<value>
+			<Bulk>0.25</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_Rock"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>cutting edge</label>				
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>0.075</armorPenetrationSharp>					
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Poke</li>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+				</li>				
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- === Ice Axe === -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/statBases</xpath>
+		<value>
+			<Bulk>4.5</Bulk>
+			<MeleeCounterParryBonus>0.33</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>0.19</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
+			<MeleeDodgeChance>0.3</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>shaft</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.46</cooldownTime>
+					<chanceFactor>0.05</chanceFactor>
+					<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Shaft</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+						<li>Cut</li>	
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.83</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>0.648</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.29</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>spike</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>11</power>
+					<cooldownTime>1.22</cooldownTime>
+					<chanceFactor>0.95</chanceFactor>
+					<armorPenetrationBlunt>0.648</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.29</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>				
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml
index fdb8b97f9f..b39049b411 100644
--- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml	
+++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
+
 	<!-- ========== Tools ========== -->
 
 	<Operation Class="PatchOperationReplace">
@@ -8,7 +9,9 @@
 		defName="K4G_Gun_Bolter" or
 		defName="K4G_Gun_AdvancedAutopistol" or
 		defName="K4G_Gun_PrecisionPistol" or
-		defName="K4G_Gun_ComradePistol"
+		defName="K4G_Gun_ComradePistol" or
+		defName="K4G_Gun_Shortbarrel" or
+		defName="K4G_Gun_Nailgun"
 		]/tools</xpath>
 		<value>
 			<tools>
@@ -45,8 +48,8 @@
 		defName="K4G_Gun_HeavyShotgun" or
 		defName="K4G_Gun_LightSMG" or
 		defName="K4G_Gun_AdvancedSMG" or
-		defName="K4G_Gun_CompactRifle" or
-		defName="K4G_Gun_BattleRifle"
+		defName="K4G_Gun_BattleRifle" or
+		defName="K4G_Gun_DrumRifle"
 		]/tools</xpath>
 		<value>
 			<tools>
@@ -85,6 +88,12 @@
 		</value>
 	</Operation>
 
+	<!-- ========== Remove Brawler ========== -->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="K4G_Gun_Brawler"]</xpath>
+	</Operation>
+
 	<!-- ========== Snubgun ========== -->
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -507,35 +516,109 @@
 		</FireModes>
 	</Operation>
 
-	<!-- ========== Compact Rifle (M4A1) ========== -->
+	<!-- ========== Batttle Rifle (G3A2) ========== -->
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
-		<defName>K4G_Gun_CompactRifle</defName>
+		<defName>K4G_Gun_BattleRifle</defName>
 		<statBases>
-			<Mass>2.90</Mass>
-			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-			<SightsEfficiency>1.00</SightsEfficiency>
-			<ShotSpread>0.1</ShotSpread>
-			<SwayFactor>1.13</SwayFactor>
-			<Bulk>7.56</Bulk>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>0.08</ShotSpread>
+			<SwayFactor>1.46</SwayFactor>
+			<Bulk>10.5</Bulk>
+			<Mass>4.50</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.58</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_556x45mmNATO_FMJ</defaultProjectile>
+			<hasStandardCommand>True</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<recoilAmount>2.00</recoilAmount>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
 			<warmupTime>1.1</warmupTime>
 			<range>55</range>
-			<burstShotCount>6</burstShotCount>
-			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
 			<soundCast>Shot_AssaultRifle</soundCast>
 			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<!-- ========== Comrade Pistol (Makarov) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_ComradePistol</defName>
+		<statBases>
+			<Mass>0.73</Mass>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.70</SightsEfficiency>
+			<ShotSpread>0.18</ShotSpread>
+			<SwayFactor>0.78</SwayFactor>
+			<Bulk>1.62</Bulk>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_9x18mmMakarov_FMJ</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
 		</Properties>
 		<AmmoUser>
-			<magazineSize>30</magazineSize>
+			<magazineSize>8</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_9x18mmMakarov</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_Pistol</li>
+			<li>CE_Sidearm</li>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Shortbarrel (Cut-down G3) ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_Shortbarrel</defName>
+		<statBases>
+			<Mass>2.95</Mass>
+			<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.7</SightsEfficiency>
+			<ShotSpread>0.14</ShotSpread>
+			<SwayFactor>3.00</SwayFactor>
+			<Bulk>6.05</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>2.43</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
+			<warmupTime>1.1</warmupTime>
+			<range>55</range>
+			<burstShotCount>6</burstShotCount>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<soundCast>Shot_HeavySMG</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>20</magazineSize>
 			<reloadTime>4</reloadTime>
-			<ammoSet>AmmoSet_556x45mmNATO</ammoSet>
+			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
 		</AmmoUser>
 		<FireModes>
 			<aiUseBurstMode>TRUE</aiUseBurstMode>
@@ -544,33 +627,33 @@
 		</FireModes>
 	</Operation>
 
-	<!-- ========== Batttle Rifle (G3A2) ========== -->
+	<!-- ========== Drum Rifle (HK21) ========== -->
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
-		<defName>K4G_Gun_BattleRifle</defName>
+		<defName>K4G_Gun_DrumRifle</defName>
 		<statBases>
 			<SightsEfficiency>1</SightsEfficiency>
 			<ShotSpread>0.08</ShotSpread>
-			<SwayFactor>1.46</SwayFactor>
-			<Bulk>10.5</Bulk>
-			<Mass>4.50</Mass>
-			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SwayFactor>1.81</SwayFactor>
+			<Bulk>10.21</Bulk>
+			<Mass>7.92</Mass>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>True</hasStandardCommand>
 			<defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-			<recoilAmount>2.00</recoilAmount>
+			<recoilAmount>1.42</recoilAmount>
 			<burstShotCount>6</burstShotCount>
-			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
 			<warmupTime>1.1</warmupTime>
-			<range>57</range>
+			<range>55</range>
 			<soundCast>Shot_AssaultRifle</soundCast>
 			<soundCastTail>GunTail_Medium</soundCastTail>
 			<muzzleFlashScale>12</muzzleFlashScale>
 		</Properties>
 		<AmmoUser>
-			<magazineSize>20</magazineSize>
+			<magazineSize>50</magazineSize>
 			<reloadTime>4</reloadTime>
 			<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
 		</AmmoUser>
@@ -579,6 +662,49 @@
 			<aiAimMode>AimedShot</aiAimMode>
 			<aimedBurstShotCount>3</aimedBurstShotCount>
 		</FireModes>
+		<weaponTags>
+			<li>CE_AI_LMG</li>
+			<li>Bipod_LMG</li>
+		</weaponTags>		
+	</Operation>
+
+	<!-- ========== Nailgun ========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>K4G_Gun_Nailgun</defName>
+		<statBases>
+			<Mass>1.80</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+			<SightsEfficiency>0.5</SightsEfficiency>
+			<ShotSpread>0.16</ShotSpread>
+			<SwayFactor>1.07</SwayFactor>
+			<Bulk>2.50</Bulk>
+		</statBases>
+		<Properties>
+			<recoilAmount>0.24</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_Nail</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>12</range>
+			<burstShotCount>10</burstShotCount>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			<soundCast>Shot_Autopistol</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>60</magazineSize>
+			<reloadTime>4.6</reloadTime>
+			<ammoSet>AmmoSet_Nail</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aiUseBurstMode>FALSE</aiUseBurstMode>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_OneHandedWeapon</li>
+		</weaponTags>
 	</Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml b/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml
index b0b66e7fbe..28bad7559b 100644
--- a/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml	
+++ b/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml	
@@ -14,4 +14,11 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="K4G_Fellowship_Monk"]/weaponMoney</xpath>
+		<value>
+			<weaponMoney>6~500</weaponMoney>
+		</value>
+	</Operation>
+
 </Patch>
\ No newline at end of file