diff --git a/LoadFolders.xml b/LoadFolders.xml
index 023dfe9b5c..2d1c1b1b59 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -126,7 +126,7 @@
 		<li IfModActive="ATK.DevilstrandAnimals">ModPatches/Devilstrand Animals</li>
 		<li IfModActive="GarbageDayIsHereToStay.DevilstrandColourBundle.GDIHTSDSCB">ModPatches/Devilstrand Colour Bundle</li>
 		<li IfModActive="spincrus.dinosauria">ModPatches/Dinosauria</li>
-    <li IfModActive="AmethystTheOtter.DiverseMechanoidWarProcedure">ModPatches/Diverse Mechanoid War Procedure</li>
+		<li IfModActive="AmethystTheOtter.DiverseMechanoidWarProcedure">ModPatches/Diverse Mechanoid War Procedure</li>
 		<li IfModActive="BotchJob.divineorder">ModPatches/Divine Order</li>
 		<li IfModActive="Mlie.DoomFactions">ModPatches/Doom Factions</li>
 		<li IfModActive="onyxae.dragonsdescent">ModPatches/Dragons Descent</li>
diff --git a/ModPatches/Diverse Mechanoid War Procedure/Defs/Ammo.xml b/ModPatches/Diverse Mechanoid War Procedure/Defs/Ammo.xml
index 538b9721d9..a5cdedb804 100644
--- a/ModPatches/Diverse Mechanoid War Procedure/Defs/Ammo.xml	
+++ b/ModPatches/Diverse Mechanoid War Procedure/Defs/Ammo.xml	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="70mmMechanoidGrenadeBase">
 		<defName>Ammo_70mmMechanoidGrenade_Tox</defName>
 		<label>70mm mechanoid grenade (Tox)</label>
diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/Ammo/70mmToxAmmo.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/Ammo/70mmToxAmmo.xml
index 6e91253f31..138f8d25a7 100644
--- a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/Ammo/70mmToxAmmo.xml	
+++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/Ammo/70mmToxAmmo.xml	
@@ -10,5 +10,4 @@
 		</value>
 	</Operation>
 
-	
 </Patch>
diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/HediffDefs/MechanoidHediffs.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/HediffDefs/MechanoidHediffs.xml
index 190df461a8..c11db2d388 100644
--- a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/HediffDefs/MechanoidHediffs.xml	
+++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/HediffDefs/MechanoidHediffs.xml	
@@ -21,4 +21,5 @@
             <ArmorRating_Sharp>3</ArmorRating_Sharp>
         </value>
     </Operation>
+
 </Patch>
diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml
index 94946f702c..2e7a934ae6 100644
--- a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml	
+++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverce Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml	
@@ -1,7 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<!-- autopistol stats -->
+	<!-- Melee Tools -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Gun_SlugPistol"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>	
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_MiniNeedleGun" or
+			defName="Gun_ChargeLanceRifle" or
+			defName="Gun_BeamRifle"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="Gun_ToxCannon" or
+			defName="Gun_EMPCannon" or
+			defName="Gun_MechanoidAutocannon"
+			]/tools</xpath>
+		<value>
+			<tools>
+			<li Class="CombatExtended.ToolCE">
+				<label>barrel</label>
+				<capacities>
+				<li>Blunt</li>
+				</capacities>
+				<power>10</power>
+				<cooldownTime>2.44</cooldownTime>
+				<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+			</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Autopistol Stats -->
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Gun_SlugPistol</defName>
 		<statBases>
@@ -35,25 +121,7 @@
 		</weaponTags>
 	</Operation>
 	
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Gun_SlugPistol"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>barrel</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>6</power>
-					<cooldownTime>2.0</cooldownTime>
-					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-				</li>
-			</tools>
-		</value>
-	</Operation>	
-	
-	<!-- same as alpha mechs -->
+	<!-- Same as Alpha Mechs -->
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Gun_MiniNeedleGun</defName>
@@ -88,47 +156,8 @@
 			<li>NoSwitch</li>
 		</weaponTags>
 	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Gun_MiniNeedleGun"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>stock</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>8</power>
-					<cooldownTime>1.55</cooldownTime>
-					<chanceFactor>1.5</chanceFactor>
-					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>barrel</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>2.02</cooldownTime>
-					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>muzzle</label>
-					<capacities>
-						<li>Poke</li>
-					</capacities>
-					<power>8</power>
-					<cooldownTime>1.55</cooldownTime>
-					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-				</li>
-			</tools>
-		</value>
-	</Operation>
 	
-	<!-- charge rifle stats -->
+	<!-- Charge Rifle Stats -->
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Gun_ChargeLanceRifle</defName>
@@ -167,25 +196,9 @@
 			<li>NoSwitch</li>
 		</weaponTags>
 	</Operation>
-	
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Gun_ChargeLanceRifle"]/tools</xpath>
-		<value>
-			<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>barrel</label>
-				<capacities>
-				<li>Blunt</li>
-				</capacities>
-				<power>10</power>
-				<cooldownTime>2.44</cooldownTime>
-				<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-			</li>
-			</tools>
-		</value>
-	</Operation>
-	
+
+	<!-- EMP Cannon -->
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Gun_EMPCannon</defName>
 		<statBases>
@@ -228,6 +241,8 @@
 		</weaponTags>
 	</Operation>
 	
+	<!-- Tox Cannon -->
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Gun_ToxCannon</defName>
 		<statBases>
@@ -270,42 +285,8 @@
 		</weaponTags>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Gun_EMPCannon"]/tools</xpath>
-		<value>
-			<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>barrel</label>
-				<capacities>
-				<li>Blunt</li>
-				</capacities>
-				<power>10</power>
-				<cooldownTime>2.44</cooldownTime>
-				<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-			</li>
-			</tools>
-		</value>
-	</Operation>
-	
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Gun_ToxCannon"]/tools</xpath>
-		<value>
-			<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>barrel</label>
-				<capacities>
-				<li>Blunt</li>
-				</capacities>
-				<power>10</power>
-				<cooldownTime>2.44</cooldownTime>
-				<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-			</li>
-			</tools>
-		</value>
-	</Operation>
-	
+	<!-- Mech Autocannon -->
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
         <defName>Gun_MechanoidAutocannon</defName>
         <statBases>
@@ -344,43 +325,8 @@
             <li>NoSwitch</li>
         </weaponTags>
     </Operation>
-	
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Gun_MechanoidAutocannon"]/tools</xpath>
-		<value>
-			<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>barrel</label>
-				<capacities>
-				<li>Blunt</li>
-				</capacities>
-				<power>10</power>
-				<cooldownTime>2.44</cooldownTime>
-				<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-				<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-			</li>
-			</tools>
-		</value>
-	</Operation>
-	
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Gun_BeamRifle"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>barrel</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>10</power>
-					<cooldownTime>2.44</cooldownTime>
-					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-	
+
+	<!-- Beam Rifle -->	
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Gun_BeamRifle"]/statBases/RangedWeapon_Cooldown</xpath>
 		<value>
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 541342a17d..67fda99b99 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -176,6 +176,7 @@ Det's Xenotypes - Boglegs   |
 Devilstrand Animals |
 Devilstrand Colour Bundle   |
 Dinosauria |
+Diverse Mechanoid War Procedure |
 Divine Order |
 DOOM - Faction (Continued) |
 DMWands |